chore: upgrade kotlin to 1.9.23 (#2586)

wireapp · Apr 2, 2024 · 0996f33 · 0996f33
1 parent 409e685
commit 0996f33
Show file tree

Hide file tree

Showing 24 changed files with 2,758 additions and 592 deletions.
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
@@ -52,6 +52,7 @@ android {
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
+        isCoreLibraryDesugaringEnabled = true
     }
 
     kotlinOptions {
@@ -77,6 +78,6 @@ dependencies {
     implementation(project(":network"))
     implementation(project(":cryptography"))
     implementation(project(":logic"))
-
     implementation(libs.bundles.android)
+    coreLibraryDesugaring(libs.desugarJdkLibs)
 }
diff --git a/android/src/main/kotlin/com/wire/kalium/KaliumApplication.kt b/android/src/main/kotlin/com/wire/kalium/KaliumApplication.kt
@@ -20,13 +20,13 @@ package com.wire.kalium
 
 import android.app.Application
 import androidx.work.Configuration
+import com.wire.kalium.android.R
 import com.wire.kalium.logger.KaliumLogLevel
 import com.wire.kalium.logic.CoreLogger
 import com.wire.kalium.logic.CoreLogic
 import com.wire.kalium.logic.featureFlags.KaliumConfigs
 import com.wire.kalium.logic.sync.ForegroundNotificationDetailsProvider
 import com.wire.kalium.logic.sync.WrapperWorkerFactory
-import com.wire.kalium.android.R
 import java.io.File
 
 class KaliumApplication : Application(), Configuration.Provider {
@@ -48,14 +48,18 @@ class KaliumApplication : Application(), Configuration.Provider {
         )
     }
 
-    override fun getWorkManagerConfiguration(): Configuration {
-        val myWorkerFactory = WrapperWorkerFactory(coreLogic, object : ForegroundNotificationDetailsProvider {
-            override fun getSmallIconResId(): Int = R.drawable.ic_launcher_foreground
-        })
+    override val workManagerConfiguration: Configuration
+        get() {
+            val myWorkerFactory = WrapperWorkerFactory(
+                coreLogic,
+                object : ForegroundNotificationDetailsProvider {
+                    override fun getSmallIconResId(): Int = R.drawable.ic_launcher_foreground
+                }
+            )
 
-        return Configuration.Builder()
-            .setWorkerFactory(myWorkerFactory)
-            .build()
-    }
+            return Configuration.Builder()
+                .setWorkerFactory(myWorkerFactory)
+                .build()
+        }
 
 }
diff --git a/buildSrc/src/main/kotlin/com/wire/kalium/plugins/CommonAndroidConfig.kt b/buildSrc/src/main/kotlin/com/wire/kalium/plugins/CommonAndroidConfig.kt
@@ -20,11 +20,17 @@ package com.wire.kalium.plugins
 
 import com.android.build.gradle.LibraryExtension
 import org.gradle.api.JavaVersion
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
 
 private const val BASE_NAMESPACE = "com.wire.kalium"
 
 fun KotlinAndroidTarget.commmonKotlinAndroidTargetConfig() {
+    @OptIn(ExperimentalKotlinGradlePluginApi::class) // this is experimental API and will likely change in the future into more robust DSL
+    instrumentedTestVariant {
+        sourceSetTree.set(KotlinSourceSetTree.test)
+    }
     /** NO-OP. Nothing to do here for now **/
 }
 
@@ -52,6 +58,7 @@ fun LibraryExtension.commonAndroidLibConfig(
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
+        isCoreLibraryDesugaringEnabled = true
     }
 
     packaging {

diff --git a/buildSrc/src/main/kotlin/com/wire/kalium/plugins/Multiplatform.kt b/buildSrc/src/main/kotlin/com/wire/kalium/plugins/Multiplatform.kt
@@ -19,7 +19,7 @@
 package com.wire.kalium.plugins
 
 import org.gradle.api.Project
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.gradle.kotlin.dsl.dependencies
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
 /**
@@ -30,7 +30,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
  *
  * @see commonDokkaConfig
  */
-@OptIn(ExperimentalKotlinGradlePluginApi::class)
 fun Project.configureDefaultMultiplatform(
     enableApple: Boolean,
     enableJs: Boolean,
@@ -44,10 +43,15 @@ fun Project.configureDefaultMultiplatform(
         "No multiplatform extension found. Is the Kotlin Multiplatform plugin applied to this module?"
     }
     kotlinExtension.apply {
-        targetHierarchy.default()
+        applyDefaultHierarchyTemplate()
         jvm { commonJvmConfig(includeNativeInterop, enableIntegrationTests) }
 
-        androidTarget { commmonKotlinAndroidTargetConfig() }
+        androidTarget {
+            commmonKotlinAndroidTargetConfig()
+            dependencies {
+                add("coreLibraryDesugaring", library("desugarJdkLibs"))
+            }
+        }
 
         if (enableJs) {
             js { commonJsConfig(enableJsTests) }
@@ -64,8 +68,6 @@ fun Project.configureDefaultMultiplatform(
         }
 
     kotlinExtension.sourceSets.getByName("androidInstrumentedTest") {
-        // Add dependency to commonTest, as it isn't added by default anymore since Kotlin 1.9
-        dependsOn(kotlinExtension.sourceSets.getByName("commonTest"))
 
         dependencies {
             // Add common runner and rules to Android Instrumented Tests
@@ -75,6 +77,18 @@ fun Project.configureDefaultMultiplatform(
         }
     }
 
+    kotlinExtension.sourceSets.getByName("commonTest") {
+        dependencies {
+            implementation(library("kotlin.test"))
+        }
+    }
+
+    configurations.all {
+        resolutionStrategy {
+            force("org.jetbrains.kotlin:kotlin-test:${libs.findVersion("kotlin").get().requiredVersion}")
+        }
+    }
+
     kotlinExtension.sourceSets.all {
         languageSettings {
             // Most of the native code requires this opt-in

diff --git a/buildSrc/src/main/kotlin/scripts/detekt.gradle.kts b/buildSrc/src/main/kotlin/scripts/detekt.gradle.kts
@@ -30,7 +30,8 @@ dependencies {
     val detektVersion = libs.findVersion("detekt").get()
     detekt("io.gitlab.arturbosch.detekt:detekt-cli:$detektVersion")
     detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:$detektVersion")
-    detektPlugins("com.wire:detekt-rules:1.0.0-SNAPSHOT") {
+    detektPlugins("io.gitlab.arturbosch.detekt:detekt-rules-libraries:$detektVersion")
+    detektPlugins("com.wire:detekt-rules:1.0.0-1.23.6") {
         isChanging = true
     }
 }
@@ -39,8 +40,8 @@ detekt {
     buildUponDefaultConfig = true
     // activate all available (even unstable) rules.
     // allRules = false
-    config = files("$rootDir/detekt/detekt.yml")
-    source = files("$rootDir")
+    config.setFrom(files("$rootDir/detekt/detekt.yml"))
+    source.setFrom(files("$rootDir"))
     // a way of suppressing issues before introducing detekt
     baseline = file("$rootDir/detekt/baseline.xml")
 

diff --git a/calling/build.gradle.kts b/calling/build.gradle.kts
@@ -63,9 +63,7 @@ kotlin {
         }
 
         val commonTest by getting {
-            dependencies {
-                implementation(kotlin("test"))
-            }
+            dependencies { }
         }
     }
 }
diff --git a/cli/build.gradle.kts b/cli/build.gradle.kts
@@ -42,20 +42,21 @@ tasks.jar {
 }
 
 kotlin {
-    val jvmTarget = jvm() {
+    applyDefaultHierarchyTemplate()
+    val jvmTarget = jvm {
         commonJvmConfig(includeNativeInterop = false)
         tasks.named("run", JavaExec::class) {
             isIgnoreExitValue = true
             standardInput = System.`in`
             standardOutput = System.out
         }
     }
-    macosX64() {
+    macosX64 {
         binaries {
             executable()
         }
     }
-    macosArm64() {
+    macosArm64 {
         binaries {
             executable()
         }
@@ -77,26 +78,16 @@ kotlin {
             }
         }
         val jvmMain by getting {
-            dependsOn(commonMain)
-
              dependencies {
                  implementation(libs.ktor.okHttp)
                  implementation(libs.okhttp.loggingInterceptor)
              }
         }
-        val appleMain by creating {
-            dependsOn(commonMain)
-
+        val macosMain by getting {
             dependencies {
                 implementation(libs.ktor.iosHttp)
             }
         }
-        val macosX64Main by getting {
-            dependsOn(appleMain)
-        }
-        val macosArm64Main by getting {
-            dependsOn(appleMain)
-        }
 
         tasks.withType<JavaExec> {
             // code to make run task in kotlin multiplatform work
@@ -113,8 +104,3 @@ kotlin {
 }
 
 commonDokkaConfig()
-
-tasks.withType<Wrapper> {
-    gradleVersion = "7.3.1"
-    distributionType = Wrapper.DistributionType.BIN
-}
diff --git a/cryptography/build.gradle.kts b/cryptography/build.gradle.kts
@@ -32,19 +32,7 @@ kaliumLibrary {
     }
 }
 
-android {
-    compileOptions {
-        isCoreLibraryDesugaringEnabled = true
-    }
-}
-
 kotlin {
-    androidTarget {
-        dependencies {
-            coreLibraryDesugaring(libs.desugarJdkLibs)
-        }
-    }
-
     ios {
         binaries.all {
             linkerOpts("-framework", "Security")
@@ -71,7 +59,6 @@ kotlin {
         }
         val commonTest by getting {
             dependencies {
-                implementation(kotlin("test"))
                 implementation(libs.coroutines.test)
                 implementation(libs.okio.test)
             }