Migrate to kotlin 2

also migrated ksp and room to versions supporting k2

Author: LZRS

.gitignore

@@ -94,3 +94,6 @@ site/
 # (which is slightly confusing, but helps mkdocs to validate links)
 # so we ignore that here, as it's a built artifact that should not be committed
 docs/use/api/*/**
+
+# Kotlin 2.0
+.kotlin/

buildSrc/build.gradle.kts

@@ -11,7 +11,7 @@ repositories {
 dependencies {
   implementation("com.diffplug.spotless:spotless-plugin-gradle:6.22.0")
 
-  implementation("com.android.tools.build:gradle:8.5.0")
+  implementation("com.android.tools.build:gradle:8.9.2")
 
   implementation("app.cash.licensee:licensee-gradle-plugin:1.8.0")
   implementation("com.osacky.flank.gradle:fladle:0.17.4")

buildSrc/src/main/kotlin/Plugins.kt

@@ -36,17 +36,18 @@ object Plugins {
   const val androidGradlePlugin = "com.android.tools.build:gradle:${Versions.androidGradlePlugin}"
   const val benchmarkGradlePlugin =
     "androidx.benchmark:benchmark-gradle-plugin:${Versions.benchmarkPlugin}"
-  const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
+  const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
   const val navSafeArgsGradlePlugin = "androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0"
   const val rulerGradlePlugin = "com.spotify.ruler:ruler-gradle-plugin:1.2.1"
   const val flankGradlePlugin = "com.osacky.flank.gradle:fladle:0.17.4"
   const val kspGradlePlugin =
     "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:${Versions.kspPlugin}"
 
   object Versions {
-    const val androidGradlePlugin = "8.5.0"
+    const val androidGradlePlugin = "8.9.2"
     const val benchmarkPlugin = "1.3.4"
     const val dokka = "1.9.20"
-    const val kspPlugin = "1.9.22-1.0.18"
+    const val kspPlugin = "2.1.20-2.0.1"
+    const val kotlin = "2.1.20"
   }
 }

engine/src/main/java/com/google/android/fhir/db/impl/SQLCipherSupportHelper.kt

@@ -74,7 +74,8 @@ internal class SQLCipherSupportHelper(
       }
     }
 
-  override val databaseName = standardHelper.databaseName
+  override val databaseName
+    get() = standardHelper.databaseName
 
   override fun setWriteAheadLoggingEnabled(enabled: Boolean) {
     standardHelper.setWriteAheadLoggingEnabled(enabled)
@@ -119,7 +120,8 @@ internal class SQLCipherSupportHelper(
     throw lastException ?: DatabaseEncryptionException(Exception(), UNKNOWN)
   }
 
-  override val readableDatabase = writableDatabase
+  override val readableDatabase
+    get() = writableDatabase
 
   override fun close() {
     standardHelper.close()

gradle/libs.versions.toml

@@ -18,8 +18,8 @@ androidx-lifecycle = "2.6.1"
 androidx-navigation = "2.6.0"
 androidx-profilerinstaller = "1.4.1"
 androidx-recyclerview = "1.3.2"
-androidx-room = "2.5.2"
-androidx-sqlite = "2.3.1"
+androidx-room = "2.7.1"
+androidx-sqlite = "2.5.0"
 androidx-test-core = "1.6.1"
 androidx-test-ext-junit = "1.1.5"
 androidx-test-rules = "1.5.0"
@@ -28,8 +28,7 @@ androidx-tracing = "1.3.0"
 androidx-work = "2.8.1"
 glide = "4.16.0"
 junit = "4.13.2"
-kotlin-stdlib = "1.9.22"
-kotlin-test = "1.9.22"
+kotlin = "2.1.20"
 kotlinx-coroutines = "1.8.1"
 logback-android = "3.0.0"
 material = "1.9.0"
@@ -78,8 +77,8 @@ androidx-work-runtime = { module = "androidx.work:work-runtime-ktx", version.ref
 androidx-work-testing = { module = "androidx.work:work-testing", version.ref = "androidx-work" }
 glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
 junit = { module = "junit:junit", version.ref = "junit" }
-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-stdlib" }
-kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin-test" }
+kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
+kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-playservices = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "kotlinx-coroutines" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists