Update to Kotlin 1.9 (#63)

ansman · Jul 12, 2023 · 825ecab · 825ecab
1 parent 8270797
commit 825ecab
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/core/api/core.api b/core/api/core.api
@@ -51,6 +51,7 @@ public final class se/ansman/dagger/auto/BindGenericAs : java/lang/Enum {
 	public static final field Type Lse/ansman/dagger/auto/BindGenericAs;
 	public static final field TypeAndWildcard Lse/ansman/dagger/auto/BindGenericAs;
 	public static final field Wildcard Lse/ansman/dagger/auto/BindGenericAs;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Lse/ansman/dagger/auto/BindGenericAs;
 	public static fun values ()[Lse/ansman/dagger/auto/BindGenericAs;
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,11 +1,11 @@
 [versions]
-kotlin = "1.8.22"
+kotlin = "1.9.0"
 dokka = "1.8.20"
 compileTesting = "1.5.0"
 autoService = "1.1.1"
 incap = "1.0.0"
 dagger = "2.46.1"
-ksp = "1.8.22-1.0.11"
+ksp = "1.9.0-1.0.11"
 android-minSdk = "14"
 android-compileSdk = "33"
 androidx-test = "1.5.0"
@@ -29,7 +29,7 @@ dokka-allModulesPagePlugin = { module = "org.jetbrains.dokka:all-modules-page-pl
 
 okio = "com.squareup.okio:okio:3.3.0"
 
-android-gradlePlugin = "com.android.tools.build:gradle:8.1.0-beta04"
+android-gradlePlugin = "com.android.tools.build:gradle:8.1.0-rc01"
 androidx-startup = "androidx.startup:startup-runtime:1.1.1"
 androidx-test = { module = "androidx.test:core-ktx", version.ref = "androidx-test" }
 androidx-test-runner = "androidx.test:runner:1.5.2"

diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts
@@ -1,6 +1,5 @@
 @file:Suppress("UnstableApiUsage")
 
-import com.google.devtools.ksp.gradle.KspTaskJvm
 import org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask
 import org.jetbrains.kotlin.gradle.tasks.Kapt
 
@@ -28,6 +27,14 @@ android {
             dimension = "type"
         }
     }
+    sourceSets {
+        configureEach {
+            java.srcDir(buildDir.resolve("generated/ksp/$name/kotlin"))
+            if (name.startsWith("test")) {
+                java.srcDir(buildDir.resolve("generated/ksp/${name.removePrefix("test").replaceFirstChar(Char::lowercaseChar)}UnitTest/kotlin"))
+            }
+        }
+    }
 }
 
 androidComponents {
@@ -40,22 +47,17 @@ androidComponents {
     }
 }
 
-android.sourceSets.configureEach {
-    idea.module.sourceDirs.add(buildDir.resolve("generated/ksp/$name/kotlin"))
-}
-
 // This is needed because Dagger/Hilt doesn't support KSP yet so for our generated code to be
-// seen we need to make the output from KSP an input to KAPT
+// seen we need to make KAPT depend on KSP
+val variantUnitTestClassPaths = mutableMapOf<String, FileCollection>()
 afterEvaluate {
     tasks.withType<Kapt>().configureEach {
-        val ksp = tasks.findByName(name.replace("kapt", "ksp")) as KspTaskJvm?
-            ?: return@configureEach
-        kaptExternalClasspath.from(ksp.destination)
+        tasks.findByName(name.replace("kapt", "ksp"))
+            ?.let { dependsOn(it) }
     }
     tasks.withType<KaptGenerateStubsTask>().configureEach {
-        val ksp = tasks.findByName(name.replace("kaptGenerateStubs", "ksp")) as KspTaskJvm?
-            ?: return@configureEach
-        kaptClasspath.from(ksp.destination)
+        tasks.findByName(name.replace("kaptGenerateStubs", "ksp"))
+            ?.let { dependsOn(it) }
     }
 }