diff options
| -rw-r--r-- | .editorconfig | 23 | ||||
| -rw-r--r-- | build.gradle.kts | 7 | ||||
| -rw-r--r-- | buildSrc/src/main/java/Dependencies.kt | 12 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 |
4 files changed, 34 insertions, 12 deletions
diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..aa68b484 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,23 @@ +# https://editorconfig.org +root = true + +[*] +indent_style = space +indent_size = 4 + +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.{java,kt,kts,xml}] +indent_size = 4 +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 diff --git a/build.gradle.kts b/build.gradle.kts index bdb166aa..f0075550 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,8 +17,7 @@ buildscript { } plugins { - id("com.github.ben-manes.versions") version "0.29.0" - id("com.autonomousapps.dependency-analysis") version "0.56.0" + id("com.github.ben-manes.versions") version "0.30.0" } subprojects { @@ -60,7 +59,7 @@ subprojects { } tasks.wrapper { - gradleVersion = "6.6" + gradleVersion = "6.6.1" distributionType = Wrapper.DistributionType.ALL - distributionSha256Sum = "83fa7c3e5ab84c3c5c4a04fb16947338209efa9aab1f6bf09a5d0e3d2ed87742" + distributionSha256Sum = "11657af6356b7587bfb37287b5992e94a9686d5c8a0a1b60b87b9928a2decde5" } diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index c3816b7d..714d0e18 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -30,7 +30,7 @@ object Dependencies { const val autofill = "androidx.autofill:autofill:1.1.0-alpha02" const val appcompat = "androidx.appcompat:appcompat:1.3.0-alpha02" const val biometric = "androidx.biometric:biometric:1.1.0-alpha02" - const val constraint_layout = "androidx.constraintlayout:constraintlayout:2.0.0-rc1" + const val constraint_layout = "androidx.constraintlayout:constraintlayout:2.0.1" const val core_ktx = "androidx.core:core-ktx:1.5.0-alpha02" const val documentfile = "androidx.documentfile:documentfile:1.0.1" const val fragment_ktx = "androidx.fragment:fragment-ktx:1.3.0-alpha08" @@ -80,11 +80,11 @@ object Dependencies { object AndroidX { - const val runner = "androidx.test:runner:1.3.0-rc03" - const val rules = "androidx.test:rules:1.3.0-rc03" - const val junit = "androidx.test.ext:junit:1.1.2-rc03" - const val espresso_core = "androidx.test.espresso:espresso-core:3.3.0-rc03" - const val espresso_intents = "androidx.test.espresso:espresso-intents:3.3.0-rc03" + const val runner = "androidx.test:runner:1.3.0" + const val rules = "androidx.test:rules:1.3.0" + const val junit = "androidx.test.ext:junit:1.1.2" + const val espresso_core = "androidx.test.espresso:espresso-core:3.3.0" + const val espresso_intents = "androidx.test.espresso:espresso-intents:3.3.0" } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f927a7d4..0e422340 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=83fa7c3e5ab84c3c5c4a04fb16947338209efa9aab1f6bf09a5d0e3d2ed87742 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip +distributionSha256Sum=11657af6356b7587bfb37287b5992e94a9686d5c8a0a1b60b87b9928a2decde5 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists |