Merge pull request #359 from NordicSemiconductor/migration/kotlin/2.3

Migration to Kotlin 2.3 for AGP 2.11

Author: philips77

build.gradle

@@ -31,7 +31,7 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'org.jetbrains.kotlin.android' version '2.2.20' apply false
+    id 'org.jetbrains.kotlin.android' version '2.3.0' apply false
     id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
 }
 

gradle.properties

@@ -33,4 +33,7 @@
 org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.configureondemand=true
-org.gradle.configuration-cache=true
+org.gradle.configuration-cache=true
+
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 androidGradlePlugin = "8.13.2"
-kotlin = "2.2.21" # When changes, update also kotlinAndroid.kt
-ksp = "2.3.3"
+kotlin = "2.3.0" # When changes, update also kotlinAndroid.kt
+ksp = "2.3.4"
 androidxActivity = "1.11.0" # Don't update
 androidxAnnotation = "1.9.1"
 androidxAppCompat = "1.7.1"
@@ -80,7 +80,7 @@ gson = "2.13.2"
 fasterxml = "2.13.5" # don't update
 
 # Plugin versions
-nordicPlugins = "2.11" # Freeze at 2.11. Version 2.12 increases minSdk to 23.
+nordicPlugins = "2.11.1" # Freeze at 2.11. Version 2.12 increases minSdk to 23.
 dokkaPlugin = "2.1.0"
 googleServicesPlugins = "4.4.2"
 firebaseCrashlyticsPlugins = "3.0.2"
@@ -170,15 +170,16 @@ firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics
 firebase-database = { group = "com.google.firebase", name = "firebase-database-ktx" }
 firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics-ktx" }
 hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
-hilt-ext-work = { group = "androidx.hilt", name = "hilt-work", version.ref = "hiltExt" }
-hilt-ext-compiler = { group = "androidx.hilt", name = "hilt-compiler", version.ref = "hiltExt" }
-hilt-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" }
+hilt-android-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" }
 hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "hilt" }
+hilt-ext-compiler = { group = "androidx.hilt", name = "hilt-compiler", version.ref = "hiltExt" }
+hilt-ext-work = { group = "androidx.hilt", name = "hilt-work", version.ref = "hiltExt" }
 junit4 = { group = "junit", name = "junit", version.ref = "junit4" }
 truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }
 kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
 kotlin-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
 kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
+kotlin-metadata-jvm = { group = "org.jetbrains.kotlin", name = "kotlin-metadata-jvm", version.ref = "kotlin" }
 kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
 kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }

plugins/src/main/kotlin/AndroidHiltConventionPlugin.kt

@@ -39,15 +39,21 @@ class AndroidHiltConventionPlugin : Plugin<Project> {
         with(target) {
             with(pluginManager) {
                 apply("no.nordicsemi.android.plugin.kotlin")
-                apply("org.jetbrains.kotlin.kapt")
+                apply("com.google.devtools.ksp")
                 apply("dagger.hilt.android.plugin")
             }
 
             dependencies {
                 add("implementation", libs.findLibrary("hilt.android").get())
-                add("kapt", libs.findLibrary("hilt.compiler").get())
-                add("kaptTest", libs.findLibrary("hilt.compiler").get())
-                add("kaptAndroidTest", libs.findLibrary("hilt.compiler").get())
+                add("ksp", libs.findLibrary("hilt.android.compiler").get())
+                add("kspTest", libs.findLibrary("hilt.android.compiler").get())
+                add("kspAndroidTest", libs.findLibrary("hilt.android.compiler").get())
+            }
+
+            // TODO: Remove when Dagger bumps Kotlin metadata dependency to 2.3.0
+            //  (see also https://github.com/google/dagger/issues/5059)
+            configurations.configureEach {
+                resolutionStrategy.force(libs.findLibrary("kotlin.metadata.jvm").get())
             }
         }
     }

plugins/src/main/kotlin/no/nordicsemi/android/buildlogic/KotlinAndroid.kt

@@ -86,11 +86,15 @@ private inline fun <reified T : KotlinBaseExtension> Project.configureKotlin() =
     }.apply {
         allWarningsAsErrors.set(warningsAsErrors.toBoolean())
 
-        languageVersion.set(KotlinVersion.KOTLIN_2_2)
-        apiVersion.set(KotlinVersion.KOTLIN_2_2)
+        languageVersion.set(KotlinVersion.KOTLIN_2_3)
+        apiVersion.set(KotlinVersion.KOTLIN_2_3)
         jvmTarget.set(JvmTarget.JVM_17)
         optIn.add("kotlin.RequiresOptIn")
         optIn.add("kotlinx.coroutines.ExperimentalCoroutinesApi")
         optIn.add("kotlinx.coroutines.FlowPreview")
+        // https://kotlinlang.org/docs/whatsnew23.html#explicit-backing-fields
+        freeCompilerArgs.add("-Xexplicit-backing-fields")
+        // https://kotlinlang.org/docs/whatsnew23.html#unused-return-value-checker
+        freeCompilerArgs.add("-Xreturn-value-checker=full")
     }
 }