Update to Kotlin 1.9.0
Updates Gradle plugin, dependency downloaders and versions to be compatible with 1.9.
Also upgrades dagger to 2.46.1 for Kotlin metadata compatibility and ksp to compatible release.
Change-Id: Id128815aef01fd6802f4ab3c88539102d9637421
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index ee4f326..06583d6 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -38,8 +38,8 @@
// Details: KT-46445 and https://github.com/gradle/gradle/issues/17052
"-Xsam-conversions=class"
]
- languageVersion = "1.5"
- apiVersion = "1.5"
+ languageVersion = "1.8"
+ apiVersion = "1.8"
}
}
}
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXMultiplatformExtension.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXMultiplatformExtension.kt
index b036cde..86d3217 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXMultiplatformExtension.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXMultiplatformExtension.kt
@@ -165,7 +165,7 @@
fun android(block: Action<KotlinAndroidTarget>? = null): KotlinAndroidTarget? {
requestedPlatforms.add(PlatformIdentifier.ANDROID)
return if (project.enableJvm()) {
- kotlinExtension.android { block?.execute(this) }
+ kotlinExtension.androidTarget { block?.execute(this) }
} else {
null
}
diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposePlugin.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposePlugin.kt
index f6bbcbe..afd9010 100644
--- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposePlugin.kt
+++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposePlugin.kt
@@ -213,7 +213,7 @@
companion object {
fun checkCompilerVersion(configuration: CompilerConfiguration): Boolean {
try {
- val KOTLIN_VERSION_EXPECTATION = "1.8.22"
+ val KOTLIN_VERSION_EXPECTATION = "1.9.0"
KotlinCompilerVersion.getVersion()?.let { version ->
val msgCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
val suppressKotlinVersionCheck = configuration.get(
diff --git a/development/importMaven/src/main/kotlin/androidx/build/importMaven/KonanPrebuiltsDownloader.kt b/development/importMaven/src/main/kotlin/androidx/build/importMaven/KonanPrebuiltsDownloader.kt
index 826e9f6..b7c05eb 100644
--- a/development/importMaven/src/main/kotlin/androidx/build/importMaven/KonanPrebuiltsDownloader.kt
+++ b/development/importMaven/src/main/kotlin/androidx/build/importMaven/KonanPrebuiltsDownloader.kt
@@ -30,7 +30,6 @@
import okio.Path
import org.apache.logging.log4j.kotlin.logger
import org.jetbrains.kotlin.gradle.utils.NativeCompilerDownloader
-import org.jetbrains.kotlin.konan.CompilerVersion.Companion.fromString
import org.jetbrains.kotlin.konan.properties.resolvablePropertyList
import org.jetbrains.kotlin.konan.properties.resolvablePropertyString
import org.jetbrains.kotlin.konan.target.Architecture
@@ -58,7 +57,7 @@
val project = ProjectService.createProject()
val compiler = NativeCompilerDownloader(
project = project,
- compilerVersion = fromString(compilerVersion)
+ compilerVersion = compilerVersion
)
// make sure we have the local compiler downloaded so we can find the konan.properties
compiler.downloadIfNeeded()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 28f0bff..f8e7303 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,26 +26,26 @@
byteBuddy = "1.12.10"
asm = "9.3"
cmake = "3.22.1"
-dagger = "2.44"
+dagger = "2.46.1"
dexmaker = "2.28.3"
dokka = "1.8.20-dev-214"
espresso = "3.6.0-alpha01"
espressoDevice = "1.0.0-alpha05"
grpc = "1.52.0"
guavaJre = "31.1-jre"
-hilt = "2.44"
+hilt = "2.46.1"
incap = "0.2"
jcodec = "0.2.5"
kotlin17 = "1.7.10"
kotlin18 = "1.8.22"
-kotlin19 = "1.9.0-Beta"
-kotlin = "1.8.22"
+kotlin19 = "1.9.0"
+kotlin = "1.9.0"
kotlinBenchmark = "0.4.8"
-kotlinNative = "1.8.22"
+kotlinNative = "1.9.0"
kotlinCompileTesting = "1.4.9"
kotlinCoroutines = "1.7.1"
kotlinSerialization = "1.3.3"
-ksp = "1.8.20-1.0.11"
+ksp = "1.9.0-1.0.11"
ktfmt = "0.44"
ktlint = "0.49.1"
leakcanary = "2.8.1"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 5591e63..cebea92 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -459,19 +459,19 @@
</trusted-keys>
</configuration>
<components>
- <component group="" name="kotlin-native-prebuilt-linux-x86_64" version="1.8.22">
- <artifact name="kotlin-native-prebuilt-linux-x86_64-1.8.22.tar.gz">
- <sha256 value="43106db0ad8fb292facae924c97591529de15b69a0426d0474ac3811820a05b5" origin="Hand-built using sha256sum kotlin-native-prebuilt-linux-x86_64-1.8.22.tar.gz" reason="Artifact is not signed"/>
+ <component group="" name="kotlin-native-prebuilt-linux-x86_64" version="1.9.0">
+ <artifact name="kotlin-native-prebuilt-linux-x86_64-1.9.0.tar.gz">
+ <sha256 value="31737a9739fc37208e1f532b7472c3fbbf0d753f3621c9dfc1d72a69d5bc35c0" origin="Hand-built using sha256sum kotlin-native-prebuilt-linux-x86_64-1.9.0.tar.gz" reason="Artifact is not signed"/>
</artifact>
</component>
- <component group="" name="kotlin-native-prebuilt-macos-aarch64" version="1.8.22">
- <artifact name="kotlin-native-prebuilt-macos-aarch64-1.8.22.tar.gz">
- <sha256 value="d693f7c70e491ee9fa1e9d7392192934fb1d504fab2a9c7e8dbe877af3228c7c" origin="Hand-built using sha256sum kotlin-native-prebuilt-macos-aarch64-1.8.22.tar.gz"/>
+ <component group="" name="kotlin-native-prebuilt-macos-aarch64" version="1.9.0">
+ <artifact name="kotlin-native-prebuilt-macos-aarch64-1.9.0.tar.gz">
+ <sha256 value="cbb700baef01980b9b9a6d499da7adff5c611dc61ed247efdf649a073c4dbb3c" origin="Hand-built using sha256sum kotlin-native-prebuilt-macos-aarch64-1.9.0.tar.gz"/>
</artifact>
</component>
- <component group="" name="kotlin-native-prebuilt-macos-x86_64" version="1.8.22">
- <artifact name="kotlin-native-prebuilt-macos-x86_64-1.8.22.tar.gz">
- <sha256 value="5d924f4278028352cb2bdbaa4b3fab967ab81c3fbea845bdb91cd583af5c9bcc" origin="Hand-built using sha256sum kotlin-native-prebuilt-macos-x86_64-1.8.22.tar.gz"/>
+ <component group="" name="kotlin-native-prebuilt-macos-x86_64" version="1.9.0">
+ <artifact name="kotlin-native-prebuilt-macos-x86_64-1.9.0.tar.gz">
+ <sha256 value="ab02e67bc82d986875941036e147179e2812502bd2d6a8d8b3c511a93a8dbd1d" origin="Hand-built using sha256sum kotlin-native-prebuilt-macos-x86_64-1.9.0.tar.gz"/>
</artifact>
</component>
<component group="aopalliance" name="aopalliance" version="1.0">
diff --git a/room/room-compiler-processing-testing/build.gradle b/room/room-compiler-processing-testing/build.gradle
index 506df13..43292a7 100644
--- a/room/room-compiler-processing-testing/build.gradle
+++ b/room/room-compiler-processing-testing/build.gradle
@@ -15,6 +15,7 @@
*/
import androidx.build.LibraryType
+import androidx.build.KotlinTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
@@ -75,6 +76,7 @@
androidx {
name = "Room XProcessor Testing"
type = LibraryType.ANNOTATION_PROCESSOR_UTILS
+ kotlinTarget = KotlinTarget.KOTLIN_1_9
inceptionYear = "2020"
description = "Testing helpers for Room XProcessing APIs"
}
