diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts index 64cb7c9d9..af92af14f 100644 --- a/compose/build.gradle.kts +++ b/compose/build.gradle.kts @@ -94,9 +94,20 @@ subprojects { // IntelliJ refuses to sort imports correctly. // This is a known issue: https://github.com/pinterest/ktlint/issues/527 "import-ordering", - // Ktlint doesn't know how to handle nullary annotations on function types, e.g. - // @Composable () -> Unit. - "paren-spacing" + + // We had to disable the indent and parameter-list-wrapping rules, because they lead to + // false positives even in the most recent KtLint version. We created tickets: + // + // https://github.com/pinterest/ktlint/issues/963 + // https://github.com/pinterest/ktlint/issues/964 + // https://github.com/pinterest/ktlint/issues/965 + // + // We can't revert the KtLint version, because they only work with Kotlin 1.3 and would + // block Kotlin 1.4. We rather have a newer Kotlin version than a proper indent. The + // indent rule needs to be disabled globally due to another bug: + // https://github.com/pinterest/ktlint/issues/967 + "indent", + "parameter-list-wrapping" ) ) } diff --git a/compose/buildSrc/src/main/java/Dependencies.kt b/compose/buildSrc/src/main/java/Dependencies.kt index d75d85f1d..5094e8d59 100644 --- a/compose/buildSrc/src/main/java/Dependencies.kt +++ b/compose/buildSrc/src/main/java/Dependencies.kt @@ -30,7 +30,7 @@ object Versions { @Suppress("unused") object Dependencies { - const val android_gradle_plugin = "com.android.tools.build:gradle:7.0.0-alpha10" + const val android_gradle_plugin = "com.android.tools.build:gradle:7.1.0-alpha01" object AndroidX { const val appcompat = "androidx.appcompat:appcompat:1.3.0-beta01" @@ -57,8 +57,8 @@ object Dependencies { } const val dokka = "org.jetbrains.dokka:dokka-gradle-plugin:0.10.0" - const val mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.11.1" - const val ktlint = "org.jlleitschuh.gradle:ktlint-gradle:9.2.0" + const val mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.13.0" + const val ktlint = "org.jlleitschuh.gradle:ktlint-gradle:10.0.0" object Test { object AndroidX { diff --git a/compose/gradle/wrapper/gradle-wrapper.properties b/compose/gradle/wrapper/gradle-wrapper.properties index 25d326531..3c4101c3e 100644 --- a/compose/gradle/wrapper/gradle-wrapper.properties +++ b/compose/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1c4bcc29e..3c4101c3e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/versions.properties b/versions.properties index 5e2c0fb78..6113f0448 100644 --- a/versions.properties +++ b/versions.properties @@ -37,7 +37,7 @@ version.junit.junit=4.13 version.kotlin=1.5.0 version.kotlinx.coroutines=1.4.2 version.kotlinx.serialization=1.2.0 -version.me.champeau.gradle..jmh-gradle-plugin=0.5.1 +version.me.champeau.gradle..jmh-gradle-plugin=0.5.3 version.moshi=1.12.0 version.okio=2.7.0 version.org.hamcrest..hamcrest-core=2.2 @@ -45,7 +45,7 @@ version.org.jetbrains..annotations=19.0.0 version.org.jetbrains.dokka..dokka-gradle-plugin=1.4.32 version.org.jetbrains.kotlin..kotlin-reflect=1.5.0 version.org.jetbrains.kotlinx..binary-compatibility-validator=0.5.0 -version.org.jlleitschuh.gradle..ktlint-gradle=9.4.1 +version.org.jlleitschuh.gradle..ktlint-gradle=10.0.0 version.org.openjdk.jmh..jmh-core=1.25.2 version.org.openjdk.jmh..jmh-generator-annprocess=1.25.2 version.radiography=2.3.0