From 27c69cd87d9f44ae986650e15e9accc848bb91b4 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sat, 4 Feb 2023 11:05:07 +0000 Subject: [PATCH 1/4] Update Room to stable version Changelog: https://developer.android.com/jetpack/androidx/releases/room#2.5.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 828e38f12..a486150e8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -43,7 +43,7 @@ protobuf = "3.21.12" protobufPlugin = "0.8.19" retrofit = "2.9.0" retrofitKotlinxSerializationJson = "0.8.0" -room = "2.5.0-rc01" +room = "2.5.0" secrets = "2.0.1" turbine = "0.12.1" From b199de80043bdb47c8ef1811a912ab0b02c516ca Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sat, 4 Feb 2023 13:22:31 +0100 Subject: [PATCH 2/4] Update Kotlin stack to 1.8.0 - https://github.com/google/ksp/releases/tag/1.8.0-1.0.9 - https://github.com/JetBrains/kotlin/releases/tag/v1.8.0 - https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.4.0 --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 828e38f12..7ead748f7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ androidxActivity = "1.6.1" androidxAppCompat = "1.5.1" androidxBrowser = "1.4.0" androidxComposeBom = "2022.12.00" -androidxComposeCompiler = "1.4.0-alpha02" +androidxComposeCompiler = "1.4.0" androidxComposeRuntimeTracing = "1.0.0-alpha01" androidxCore = "1.9.0" androidxCoreSplashscreen = "1.0.0" @@ -32,11 +32,11 @@ hilt = "2.44.2" hiltExt = "1.0.0" jacoco = "0.8.7" junit4 = "4.13.2" -kotlin = "1.7.21" +kotlin = "1.8.0" kotlinxCoroutines = "1.6.4" kotlinxDatetime = "0.4.0" kotlinxSerializationJson = "1.4.1" -ksp = "1.7.21-1.0.8" +ksp = "1.8.0-1.0.9" lint = "30.3.1" okhttp = "4.10.0" protobuf = "3.21.12" From bc7f883486190dc8ec1d021c0e086d72085af916 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sat, 4 Feb 2023 18:56:19 +0100 Subject: [PATCH 4/4] Upgrade JVM source/target compatibility to 11 --- .../com/google/samples/apps/nowinandroid/KotlinAndroid.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt index 984993b2b..da0cab531 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt @@ -40,8 +40,8 @@ internal fun Project.configureKotlinAndroid( } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 isCoreLibraryDesugaringEnabled = true } @@ -59,8 +59,8 @@ internal fun Project.configureKotlinAndroid( "-opt-in=kotlin.Experimental", ) - // Set JVM target to 1.8 - jvmTarget = JavaVersion.VERSION_1_8.toString() + // Set JVM target to 11 + jvmTarget = JavaVersion.VERSION_11.toString() } }