From b45ab814062a415059cdffab1c2e788cd2059eb5 Mon Sep 17 00:00:00 2001 From: Jan Skrasek Date: Tue, 21 May 2024 23:41:45 +0200 Subject: [PATCH 1/2] update to Kotlin 2.0.0 --- .idea/kotlinc.xml | 2 +- bottomsheet/build.gradle.kts | 5 +---- build.gradle.kts | 5 +++-- demo/build.gradle.kts | 5 +---- gradle/libs.versions.toml | 2 -- modalsheet/build.gradle.kts | 5 +---- 6 files changed, 7 insertions(+), 17 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index fe63bb6..6d0ee1c 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/bottomsheet/build.gradle.kts b/bottomsheet/build.gradle.kts index 3a7dd32..61f8d2f 100644 --- a/bottomsheet/build.gradle.kts +++ b/bottomsheet/build.gradle.kts @@ -3,6 +3,7 @@ plugins { id("com.android.library") id("org.jetbrains.kotlin.android") + id("org.jetbrains.kotlin.plugin.compose") id("org.jetbrains.kotlinx.binary-compatibility-validator") id("com.vanniktech.maven.publish") id("com.gradleup.nmcp") @@ -31,10 +32,6 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - composeOptions { - kotlinCompilerExtensionVersion = libs.compose.compiler.get().version - } - kotlinOptions { freeCompilerArgs = freeCompilerArgs.toMutableList().apply { add("-Xexplicit-api=strict") diff --git a/build.gradle.kts b/build.gradle.kts index 9993dbb..6184dd9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,8 +4,9 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile plugins { - id("org.jetbrains.kotlin.android") version "1.9.24" apply false - id("org.jetbrains.kotlin.plugin.serialization") version "1.9.24" apply false + id("org.jetbrains.kotlin.android") version "2.0.0" apply false + id("org.jetbrains.kotlin.plugin.serialization") version "2.0.0" apply false + id("org.jetbrains.kotlin.plugin.compose") version "2.0.0" apply false id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.14.0" apply false id("org.jmailen.kotlinter") version "4.3.0" apply false id("com.android.application") version "8.4.0" apply false diff --git a/demo/build.gradle.kts b/demo/build.gradle.kts index 15c5c86..56f846f 100644 --- a/demo/build.gradle.kts +++ b/demo/build.gradle.kts @@ -3,6 +3,7 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") + id("org.jetbrains.kotlin.plugin.compose") id("org.jetbrains.kotlin.plugin.serialization") id("org.jmailen.kotlinter") } @@ -30,10 +31,6 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - composeOptions { - kotlinCompilerExtensionVersion = libs.compose.compiler.get().version - } - buildFeatures { compose = true buildConfig = false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fc084c9..f6a6d1f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,8 +7,6 @@ minSdk = "21" kotlin-serialization = "org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3" appcompat = "androidx.appcompat:appcompat:1.6.1" -# compiler dependency is defined to help Renovabot update the version -compose-compiler = "androidx.compose.compiler:compiler:1.5.14" compose-material3 = "androidx.compose.material3:material3:1.3.0-beta01" navigation-compose = "androidx.navigation:navigation-compose:2.8.0-beta01" junit = { module = "junit:junit", version = "4.13.2" } diff --git a/modalsheet/build.gradle.kts b/modalsheet/build.gradle.kts index 58a3e5d..31ed78c 100644 --- a/modalsheet/build.gradle.kts +++ b/modalsheet/build.gradle.kts @@ -3,6 +3,7 @@ plugins { id("com.android.library") id("org.jetbrains.kotlin.android") + id("org.jetbrains.kotlin.plugin.compose") id("org.jetbrains.kotlinx.binary-compatibility-validator") id("com.vanniktech.maven.publish") id("com.gradleup.nmcp") @@ -31,10 +32,6 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - composeOptions { - kotlinCompilerExtensionVersion = libs.compose.compiler.get().version - } - kotlinOptions { freeCompilerArgs = freeCompilerArgs.toMutableList().apply { add("-Xexplicit-api=strict") From 8ff4cd0b86339d4dc88c6a4f191e3f1100806a9e Mon Sep 17 00:00:00 2001 From: Jan Skrasek Date: Tue, 21 May 2024 23:43:19 +0200 Subject: [PATCH 2/2] update to AGP 8.4.1 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6184dd9..6343d4d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ plugins { id("org.jetbrains.kotlin.plugin.compose") version "2.0.0" apply false id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.14.0" apply false id("org.jmailen.kotlinter") version "4.3.0" apply false - id("com.android.application") version "8.4.0" apply false + id("com.android.application") version "8.4.1" apply false id("com.vanniktech.maven.publish") version "0.28.0" apply false id("com.gradleup.nmcp") version "0.0.7" }