Update ktlint and gradle plugin.

2025-12-20 19:18:37 +00:00 · 2023-06-23 13:09:24 -04:00
parent 65255121de
commit c17d62aeab
69 changed files with 447 additions and 176 deletions
--- a/build-logic/plugins/build.gradle.kts
+++ b/build-logic/plugins/build.gradle.kts
@@ -1,34 +1,34 @@
 plugins {
-    `kotlin-dsl`
-    id("groovy-gradle-plugin")
-    id("org.jlleitschuh.gradle.ktlint") version "11.1.0"
+  `kotlin-dsl`
+  id("groovy-gradle-plugin")
+  id("org.jlleitschuh.gradle.ktlint") version "11.4.2"
 }

 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+  sourceCompatibility = JavaVersion.VERSION_11
+  targetCompatibility = JavaVersion.VERSION_11
 }

 kotlinDslPluginOptions {
-    jvmTarget.set("11")
+  jvmTarget.set("11")
 }

 dependencies {
-    implementation(libs.kotlin.gradle.plugin)
-    implementation(libs.android.library)
-    implementation(libs.android.application)
-    implementation(project(":tools"))
-    implementation(libs.ktlint)
+  implementation(libs.kotlin.gradle.plugin)
+  implementation(libs.android.library)
+  implementation(libs.android.application)
+  implementation(project(":tools"))
+  implementation(libs.ktlint)

-    // These allow us to reference the dependency catalog inside of our compiled plugins
-    implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
-    implementation(files(testLibs.javaClass.superclass.protectionDomain.codeSource.location))
+  // These allow us to reference the dependency catalog inside of our compiled plugins
+  implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
+  implementation(files(testLibs.javaClass.superclass.protectionDomain.codeSource.location))
 }

 ktlint {
-    filter {
-        exclude { element ->
-            element.file.path.contains("/build/generated-sources")
-        }
+  filter {
+    exclude { element ->
+      element.file.path.contains("/build/generated-sources")
    }
+  }
 }
--- a/build-logic/plugins/src/main/java/ktlint.gradle.kts
+++ b/build-logic/plugins/src/main/java/ktlint.gradle.kts
@@ -1,8 +1,7 @@
 plugins {
-    id("org.jlleitschuh.gradle.ktlint")
+  id("org.jlleitschuh.gradle.ktlint")
 }

 ktlint {
-    // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507
-    version.set("0.47.1")
+  version.set("0.49.1")
 }
--- a/build-logic/plugins/src/main/java/signal-library.gradle.kts
+++ b/build-logic/plugins/src/main/java/signal-library.gradle.kts
@@ -15,59 +15,59 @@ val signalMinSdkVersion: Int by extra
 val signalJavaVersion: JavaVersion by extra

 plugins {
-    id("com.android.library")
-    id("kotlin-android")
-    id("android-constants")
-    id("ktlint")
+  id("com.android.library")
+  id("kotlin-android")
+  id("android-constants")
+  id("ktlint")
 }

 android {
-    buildToolsVersion = signalBuildToolsVersion
-    compileSdkVersion = signalCompileSdkVersion
+  buildToolsVersion = signalBuildToolsVersion
+  compileSdkVersion = signalCompileSdkVersion

-    defaultConfig {
-        minSdk = signalMinSdkVersion
-        targetSdk = signalTargetSdkVersion
-        multiDexEnabled = true
-    }
+  defaultConfig {
+    minSdk = signalMinSdkVersion
+    targetSdk = signalTargetSdkVersion
+    multiDexEnabled = true
+  }

-    compileOptions {
-        isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = signalJavaVersion
-        targetCompatibility = signalJavaVersion
-    }
+  compileOptions {
+    isCoreLibraryDesugaringEnabled = true
+    sourceCompatibility = signalJavaVersion
+    targetCompatibility = signalJavaVersion
+  }

-    kotlinOptions {
-        jvmTarget = "11"
-    }
+  kotlinOptions {
+    jvmTarget = "11"
+  }

-    lint {
-        disable += "InvalidVectorPath"
-    }
+  lint {
+    disable += "InvalidVectorPath"
+  }
 }

 dependencies {
-    lintChecks(project(":lintchecks"))
+  lintChecks(project(":lintchecks"))

-    coreLibraryDesugaring(libs.android.tools.desugar)
+  coreLibraryDesugaring(libs.android.tools.desugar)

-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.fragment.ktx)
-    implementation(libs.androidx.annotation)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.rxjava3.rxandroid)
-    implementation(libs.rxjava3.rxjava)
-    implementation(libs.rxjava3.rxkotlin)
-    implementation(libs.androidx.multidex)
-    implementation(libs.kotlin.stdlib.jdk8)
+  implementation(libs.androidx.core.ktx)
+  implementation(libs.androidx.fragment.ktx)
+  implementation(libs.androidx.annotation)
+  implementation(libs.androidx.appcompat)
+  implementation(libs.rxjava3.rxandroid)
+  implementation(libs.rxjava3.rxjava)
+  implementation(libs.rxjava3.rxkotlin)
+  implementation(libs.androidx.multidex)
+  implementation(libs.kotlin.stdlib.jdk8)

-    ktlintRuleset(libs.ktlint.twitter.compose)
+  ktlintRuleset(libs.ktlint.twitter.compose)

-    testImplementation(testLibs.junit.junit)
-    testImplementation(testLibs.mockito.core)
-    testImplementation(testLibs.mockito.android)
-    testImplementation(testLibs.mockito.kotlin)
-    testImplementation(testLibs.robolectric.robolectric)
-    testImplementation(testLibs.androidx.test.core)
-    testImplementation(testLibs.androidx.test.core.ktx)
+  testImplementation(testLibs.junit.junit)
+  testImplementation(testLibs.mockito.core)
+  testImplementation(testLibs.mockito.android)
+  testImplementation(testLibs.mockito.kotlin)
+  testImplementation(testLibs.robolectric.robolectric)
+  testImplementation(testLibs.androidx.test.core)
+  testImplementation(testLibs.androidx.test.core.ktx)
 }
--- a/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts
+++ b/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts
@@ -17,62 +17,62 @@ val signalMinSdkVersion: Int by extra
 val signalJavaVersion: JavaVersion by extra

 plugins {
-    id("com.android.application")
-    id("kotlin-android")
-    id("ktlint")
-    id("android-constants")
+  id("com.android.application")
+  id("kotlin-android")
+  id("ktlint")
+  id("android-constants")
 }

 android {
-    buildToolsVersion = signalBuildToolsVersion
-    compileSdkVersion = signalCompileSdkVersion
+  buildToolsVersion = signalBuildToolsVersion
+  compileSdkVersion = signalCompileSdkVersion

-    defaultConfig {
-        versionCode = 1
-        versionName = "1.0"
+  defaultConfig {
+    versionCode = 1
+    versionName = "1.0"

-        minSdk = signalMinSdkVersion
-        targetSdk = signalTargetSdkVersion
-        multiDexEnabled = true
-    }
+    minSdk = signalMinSdkVersion
+    targetSdk = signalTargetSdkVersion
+    multiDexEnabled = true
+  }

-    compileOptions {
-        isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = signalJavaVersion
-        targetCompatibility = signalJavaVersion
-    }
+  compileOptions {
+    isCoreLibraryDesugaringEnabled = true
+    sourceCompatibility = signalJavaVersion
+    targetCompatibility = signalJavaVersion
+  }

-    kotlinOptions {
-        jvmTarget = "11"
-    }
+  kotlinOptions {
+    jvmTarget = "11"
+  }
 }

 dependencies {
-    coreLibraryDesugaring(libs.android.tools.desugar)
+  coreLibraryDesugaring(libs.android.tools.desugar)

-    implementation(project(":core-util"))
+  implementation(project(":core-util"))

-    coreLibraryDesugaring(libs.android.tools.desugar)
+  coreLibraryDesugaring(libs.android.tools.desugar)

-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.fragment.ktx)
-    implementation(libs.androidx.annotation)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.rxjava3.rxandroid)
-    implementation(libs.rxjava3.rxjava)
-    implementation(libs.rxjava3.rxkotlin)
-    implementation(libs.androidx.multidex)
-    implementation(libs.material.material)
-    implementation(libs.androidx.constraintlayout)
-    implementation(libs.kotlin.stdlib.jdk8)
+  implementation(libs.androidx.core.ktx)
+  implementation(libs.androidx.fragment.ktx)
+  implementation(libs.androidx.annotation)
+  implementation(libs.androidx.appcompat)
+  implementation(libs.rxjava3.rxandroid)
+  implementation(libs.rxjava3.rxjava)
+  implementation(libs.rxjava3.rxkotlin)
+  implementation(libs.androidx.multidex)
+  implementation(libs.material.material)
+  implementation(libs.androidx.constraintlayout)
+  implementation(libs.kotlin.stdlib.jdk8)

-    ktlintRuleset(libs.ktlint.twitter.compose)
+  ktlintRuleset(libs.ktlint.twitter.compose)

-    testImplementation(testLibs.junit.junit)
-    testImplementation(testLibs.mockito.core)
-    testImplementation(testLibs.mockito.android)
-    testImplementation(testLibs.mockito.kotlin)
-    testImplementation(testLibs.robolectric.robolectric)
-    testImplementation(testLibs.androidx.test.core)
-    testImplementation(testLibs.androidx.test.core.ktx)
+  testImplementation(testLibs.junit.junit)
+  testImplementation(testLibs.mockito.core)
+  testImplementation(testLibs.mockito.android)
+  testImplementation(testLibs.mockito.kotlin)
+  testImplementation(testLibs.robolectric.robolectric)
+  testImplementation(testLibs.androidx.test.core)
+  testImplementation(testLibs.androidx.test.core.ktx)
 }