From a8938c83bab994d44b594362598ccab958e7525e Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Thu, 16 Nov 2023 09:14:38 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20Kotlin=202.0.0-Beta4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-nia-catalog/dependencies/releaseRuntimeClasspath.txt | 4 ++-- app/dependencies/prodReleaseRuntimeClasspath.txt | 4 ++-- gradle/libs.versions.toml | 6 +++--- settings.gradle.kts | 9 +++++++++ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt index c3f83d734..62dc41a68 100644 --- a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt +++ b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt @@ -91,10 +91,10 @@ io.coil-kt:coil-compose-base:2.5.0 io.coil-kt:coil-compose:2.5.0 io.coil-kt:coil:2.5.0 javax.inject:javax.inject:1 -org.jetbrains.kotlin:kotlin-stdlib-common:1.9.21 +org.jetbrains.kotlin:kotlin-stdlib-common:2.0.0-Beta4 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 -org.jetbrains.kotlin:kotlin-stdlib:1.9.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.0-Beta4 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt index eaeff771a..76980d1c9 100644 --- a/app/dependencies/prodReleaseRuntimeClasspath.txt +++ b/app/dependencies/prodReleaseRuntimeClasspath.txt @@ -186,10 +186,10 @@ io.github.aakira:napier-android:1.4.1 io.github.aakira:napier:1.4.1 javax.inject:javax.inject:1 org.checkerframework:checker-qual:3.12.0 -org.jetbrains.kotlin:kotlin-stdlib-common:1.9.21 +org.jetbrains.kotlin:kotlin-stdlib-common:2.0.0-Beta4 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 -org.jetbrains.kotlin:kotlin-stdlib:1.9.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.0-Beta4 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7e0380cab..7f559f5d1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ androidxActivity = "1.8.0" androidxAppCompat = "1.6.1" androidxBrowser = "1.6.0" androidxComposeBom = "2023.10.01" -androidxComposeCompiler = "1.5.7" +androidxComposeCompiler = "1.5.11-dev-k2.0.0-Beta4-21f5e479a96" androidxComposeRuntimeTracing = "1.0.0-beta01" androidxCore = "1.12.0" androidxCoreSplashscreen = "1.0.1" @@ -40,11 +40,11 @@ hilt = "2.50" hiltExt = "1.1.0" jacoco = "0.8.7" junit4 = "4.13.2" -kotlin = "1.9.21" +kotlin = "2.0.0-Beta4" kotlinxCoroutines = "1.7.3" kotlinxDatetime = "0.5.0" kotlinxSerializationJson = "1.6.0" -ksp = "1.9.21-1.0.16" +ksp = "2.0.0-Beta4-1.0.17" okhttp = "4.12.0" protobuf = "3.25.2" protobufPlugin = "0.9.4" diff --git a/settings.gradle.kts b/settings.gradle.kts index fa043c955..5fd8bae1b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -28,6 +28,15 @@ dependencyResolutionManagement { repositories { google() mavenCentral() + + // Pre-release artifacts of compose-compiler + // https://androidx.dev/storage/compose-compiler/repository + maven("https://androidx.dev/storage/compose-compiler/repository/") { + name = "compose-compiler-dev" + content { + includeGroup("androidx.compose.compiler") + } + } } } rootProject.name = "nowinandroid"