From 68f201980a5c45bb2c14aecafde4831edff40d1e Mon Sep 17 00:00:00 2001 From: tarsin Date: Thu, 25 May 2023 16:14:35 +0800 Subject: [PATCH] Upgrade Kotlin 1.9.0-Beta --- app/build.gradle.kts | 8 +++++++- build.gradle.kts | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5b4792289..23ab824c6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,3 +1,5 @@ +import com.google.devtools.ksp.gradle.KspTaskJvm +import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 import java.io.ByteArrayOutputStream import java.time.Instant import java.time.ZoneOffset @@ -150,7 +152,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = "1.4.7" + kotlinCompilerExtensionVersion = "1.4.7-dev-k1.9.0-Beta-bb7dc8b44eb" } namespace = "com.hippo.ehviewer" @@ -241,3 +243,7 @@ ksp { arg("room.schemaLocation", "$projectDir/schemas") arg("room.generateKotlin", "true") } + +tasks.withType().configureEach { + compilerOptions.jvmTarget.set(JVM_17) +} diff --git a/build.gradle.kts b/build.gradle.kts index 76a9fedfe..cfa5a244e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,8 @@ plugins { id("com.android.application") version "8.1.0-beta03" apply false - kotlin("android") version "1.8.21" apply false - kotlin("plugin.serialization") version "1.8.21" apply false - id("com.google.devtools.ksp") version "1.8.21-1.0.11" apply false + kotlin("android") version "1.9.0-Beta" apply false + kotlin("plugin.serialization") version "1.9.0-Beta" apply false + id("com.google.devtools.ksp") version "1.9.0-Beta-1.0.11" apply false } allprojects {