msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-17 21:27:01 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions

Merge #108

Browse source 
108: Update AGP and cleanup formatting rules r=msfjarvis a=msfjarvis

bors r+
🤖

Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
bors[bot] 2021-02-14 12:27:14 +00:00 • committed by GitHub
commit ddafaa60eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

23
.editorconfig
View file

@ -1,23 +0,0 @@
# https://editorconfig.org
root = true
[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[*.{java,kt,kts,xml}]
indent_size = 2
ij_continuation_indent_size = 2
[*.{kt,kts}]
kotlin_imports_layout=ascii
ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
ij_kotlin_field_annotation_wrap = normal
[*.md]
trim_trailing_whitespace = false

12
.idea/codeStyles/Project.xml generated
View file

@ -3,10 +3,12 @@
<option name="LINE_SEPARATOR" value="&#10;" /> <option name="LINE_SEPARATOR" value="&#10;" />
<JetCodeStyleSettings> <JetCodeStyleSettings>
<option name="PACKAGES_TO_USE_STAR_IMPORTS"> <option name="PACKAGES_TO_USE_STAR_IMPORTS">
<value />
</option>
<option name="PACKAGES_IMPORT_LAYOUT">
<value> <value>
<package name="java.util" alias="false" withSubpackages="false" /> <package name="" alias="false" withSubpackages="true" />
<package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" /> <package name="" alias="true" withSubpackages="true" />
<package name="io.ktor" alias="false" withSubpackages="false" />
</value> </value>
</option> </option>
<option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="100" /> <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="100" />
@ -16,7 +18,9 @@
<codeStyleSettings language="XML"> <codeStyleSettings language="XML">
<option name="FORCE_REARRANGE_MODE" value="1" /> <option name="FORCE_REARRANGE_MODE" value="1" />
<indentOptions> <indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" /> <option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
</indentOptions> </indentOptions>
<arrangement> <arrangement>
<rules> <rules>

20
buildSrc/src/main/java/BaseProjectConfig.kt
View file

@ -38,7 +38,7 @@ internal fun Project.configureForAllProjects() {
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
jcenter() { jcenter {
content { content {
// Indirect dependencies // Indirect dependencies
// https://youtrack.jetbrains.com/issue/IDEA-261387 // https://youtrack.jetbrains.com/issue/IDEA-261387
@ -102,14 +102,16 @@ internal fun TestedExtension.configureCommonAndroidOptions() {
targetSdkVersion(30) targetSdkVersion(30)
} }
packagingOptions { packagingOptions.resources.excludes.addAll(
exclude("**/*.version") setOf(
exclude("**/*.txt") "**/*.version",
exclude("**/*.kotlin_module") "**/*.txt",
exclude("**/plugin.properties") "**/*.kotlin_module",
exclude("META-INF/AL2.0") "**/plugin.properties",
exclude("META-INF/LGPL2.1") "META-INF/AL2.0",
} "META-INF/LGPL2.1"
)
)
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_11

4
buildSrc/src/main/java/Dependencies.kt
View file

@ -6,8 +6,8 @@
private const val DAGGER_HILT_VERSION = "2.32-alpha" private const val DAGGER_HILT_VERSION = "2.32-alpha"
object Plugins { object Plugins {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha05" const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha06"
const val androidGradlePlugin_lintModel = "com.android.tools.lint:lint-model:30.0.0-alpha05" const val androidGradlePlugin_lintModel = "com.android.tools.lint:lint-model:30.0.0-alpha06"
const val daggerGradlePlugin = const val daggerGradlePlugin =
"com.google.dagger:hilt-android-gradle-plugin:${DAGGER_HILT_VERSION}" "com.google.dagger:hilt-android-gradle-plugin:${DAGGER_HILT_VERSION}"
const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30" const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30"

2
buildSrc/src/main/java/SigningConfig.kt
View file

@ -4,7 +4,7 @@
*/ */
import com.android.build.gradle.internal.dsl.BaseAppModuleExtension import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
import java.util.* import java.util.Properties
import org.gradle.api.Project import org.gradle.api.Project
private const val KEYSTORE_CONFIG_PATH = "keystore.properties" private const val KEYSTORE_CONFIG_PATH = "keystore.properties"

2
buildSrc/src/main/java/VersioningPlugin.kt
View file

@ -7,7 +7,7 @@
import com.android.build.gradle.internal.plugins.AppPlugin import com.android.build.gradle.internal.plugins.AppPlugin
import com.github.zafarkhaja.semver.Version import com.github.zafarkhaja.semver.Version
import java.io.OutputStream import java.io.OutputStream
import java.util.* import java.util.Properties
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project