From 1d6ec57bf1b2ea5831fd6c446f1f6ad96e21bc24 Mon Sep 17 00:00:00 2001 From: Russell Date: Sun, 1 Oct 2023 22:35:02 -0400 Subject: [PATCH] 1.9.20-Beta2 --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Versions.kt | 2 +- sample/app-android/build.gradle.kts | 8 +++++++- sample/app-desktop/build.gradle.kts | 10 ++++++++++ sample/build.gradle.kts | 4 ++-- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 65a48a46..79a894e3 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -15,7 +15,7 @@ */ plugins { - kotlin("jvm") version "1.9.10" + kotlin("jvm") version "1.9.20-Beta2" } repositories { diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 3f0caef2..134eba72 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -31,7 +31,7 @@ object Versions { const val coroutines = "1.7.3" const val junit = "4.13.2" const val robolectric = "4.10.3" - const val serializationPlugin = "1.9.10" + const val serializationPlugin = "1.9.20-Beta2" const val serializationRuntime = "1.6.0" const val turbine = "1.0.0" } diff --git a/sample/app-android/build.gradle.kts b/sample/app-android/build.gradle.kts index 25f1d10d..1ad6d426 100644 --- a/sample/app-android/build.gradle.kts +++ b/sample/app-android/build.gradle.kts @@ -14,6 +14,12 @@ * limitations under the License. */ +buildscript { + repositories { + maven(url = "https://androidx.dev/storage/compose-compiler/repository/") + } +} + plugins { id("com.android.application") kotlin("android") @@ -51,7 +57,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = "1.5.3" + kotlinCompilerExtensionVersion = "1.5.4-dev-k1.9.20-Beta2-ac5f960bdaf" } } diff --git a/sample/app-desktop/build.gradle.kts b/sample/app-desktop/build.gradle.kts index 7254055f..5681dc51 100644 --- a/sample/app-desktop/build.gradle.kts +++ b/sample/app-desktop/build.gradle.kts @@ -16,6 +16,12 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat * limitations under the License. */ +buildscript { + repositories { + maven(url = "https://androidx.dev/storage/compose-compiler/repository/") + } +} + plugins { kotlin("jvm") id("org.jetbrains.compose") version "1.5.2" @@ -29,6 +35,10 @@ dependencies { testImplementation(compose.desktop.uiTestJUnit4) } +compose { + kotlinCompilerPlugin.set("1.5.4-dev-k1.9.20-Beta2-ac5f960bdaf") +} + compose.desktop { application { mainClass = "com.russhwolf.settings.example.jvm.MainKt" diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index bc441504..4b627087 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -15,8 +15,8 @@ */ plugins { - kotlin("multiplatform") version "1.9.10" apply false - kotlin("android") version "1.9.10" apply false + kotlin("multiplatform") version "1.9.20-Beta2" apply false + kotlin("android") version "1.9.20-Beta2" apply false id("com.android.library") version "8.1.2" apply false id("com.android.application") version "8.1.2" apply false }