From 9ff340ebfad1c82fdbb581c9336962e80b64f2cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 07:59:38 +0000 Subject: [PATCH 1/6] --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.jetbrains.kotlin.android dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.jetbrains.kotlin.kapt dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.jetbrains.kotlin.plugin.parcelize dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- 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 b1083be3d85..72afe81cab1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,7 +32,7 @@ iconics = "5.4.0" jackson-module-kotlin = "2.13.5" javaVersion = "11" kotlinx-coroutines = "1.8.1" -kotlin = "1.9.24" +kotlin = "2.0.0" ksp = "1.9.24-1.0.20" ktlint = "12.1.1" lifecycle = "2.8.1" From 91de5165b4e2f78ed602579bd375bf4c0f6509f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joris=20Pelgr=C3=B6m?= Date: Thu, 23 May 2024 20:40:01 +0200 Subject: [PATCH 2/6] Bump ksp --- 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 72afe81cab1..f7247943074 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -33,7 +33,7 @@ jackson-module-kotlin = "2.13.5" javaVersion = "11" kotlinx-coroutines = "1.8.1" kotlin = "2.0.0" -ksp = "1.9.24-1.0.20" +ksp = "2.0.0-1.0.21" ktlint = "12.1.1" lifecycle = "2.8.1" material = "1.12.0" From 25b2b65cbd3d764e2e4a6e335e5a697479aab9e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joris=20Pelgr=C3=B6m?= Date: Sun, 2 Jun 2024 15:12:33 +0200 Subject: [PATCH 3/6] Use Jetbrains Compose compiler --- app/build.gradle.kts | 6 +----- automotive/build.gradle.kts | 6 +----- build.gradle.kts | 1 + gradle/libs.versions.toml | 2 +- wear/build.gradle.kts | 6 +----- 5 files changed, 5 insertions(+), 16 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d5cdffd61b1..b67eef49eb6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -8,6 +8,7 @@ plugins { alias(libs.plugins.firebase.appdistribution) alias(libs.plugins.google.services) alias(libs.plugins.hilt) + alias(libs.plugins.compose.compiler) } android { @@ -43,10 +44,6 @@ android { buildConfig = true } - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get() - } - kotlinOptions { jvmTarget = libs.versions.javaVersion.get() } @@ -168,7 +165,6 @@ dependencies { implementation(platform(libs.compose.bom)) implementation(libs.compose.animation) - implementation(libs.compose.compiler) implementation(libs.compose.foundation) implementation(libs.compose.material) implementation(libs.compose.material.icons.core) diff --git a/automotive/build.gradle.kts b/automotive/build.gradle.kts index 7b359a6e2c7..b803aadbb33 100644 --- a/automotive/build.gradle.kts +++ b/automotive/build.gradle.kts @@ -7,6 +7,7 @@ plugins { alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.google.services) alias(libs.plugins.hilt) + alias(libs.plugins.compose.compiler) } android { @@ -78,10 +79,6 @@ android { buildConfig = true } - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get() - } - kotlinOptions { jvmTarget = libs.versions.javaVersion.get() } @@ -197,7 +194,6 @@ dependencies { implementation(platform(libs.compose.bom)) implementation(libs.compose.animation) - implementation(libs.compose.compiler) implementation(libs.compose.foundation) implementation(libs.compose.material) implementation(libs.compose.material.icons.core) diff --git a/build.gradle.kts b/build.gradle.kts index f605475dbbf..814e0c8f8a6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,6 +11,7 @@ plugins { alias(libs.plugins.hilt).apply(false) alias(libs.plugins.kotlin.parcelize).apply(false) alias(libs.plugins.ksp).apply(false) + alias(libs.plugins.compose.compiler).apply(false) } allprojects { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f7247943074..4e9498728cd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -77,6 +77,7 @@ google-services = { id = "com.google.gms.google-services", version.ref = "google hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" } @@ -112,7 +113,6 @@ compose-material-icons-extended = { module = "androidx.compose.material:material compose-runtime = { module = "androidx.compose.runtime:runtime" } compose-ui = { module = "androidx.compose.ui:ui" } compose-uiTooling = { module = "androidx.compose.ui:ui-tooling" } -compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" } core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" } core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "core-splashscreen" } cronet-embedded = { module = "org.chromium.net:cronet-embedded", version.ref = "cronet-embedded" } diff --git a/wear/build.gradle.kts b/wear/build.gradle.kts index 322c4fe512d..12da17a7fbe 100644 --- a/wear/build.gradle.kts +++ b/wear/build.gradle.kts @@ -4,6 +4,7 @@ plugins { alias(libs.plugins.ksp) alias(libs.plugins.hilt) alias(libs.plugins.google.services) + alias(libs.plugins.compose.compiler) } android { @@ -27,10 +28,6 @@ android { buildConfig = true } - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get() - } - signingConfigs { create("release") { storeFile = file(System.getenv("KEYSTORE_PATH") ?: "release_keystore.keystore") @@ -101,7 +98,6 @@ dependencies { implementation(libs.activity.ktx) implementation(libs.activity.compose) - implementation(libs.compose.compiler) implementation(platform(libs.compose.bom)) implementation(libs.compose.foundation) implementation(libs.compose.material.icons.core) From 09d78f4e481512bfd0fbb187ce0ebb5ad66b8e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joris=20Pelgr=C3=B6m?= Date: Sun, 2 Jun 2024 15:28:50 +0200 Subject: [PATCH 4/6] Remove deprecated duplicate config --- build.gradle.kts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 814e0c8f8a6..2c12e574520 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,12 +16,6 @@ plugins { allprojects { apply(plugin = rootProject.libs.plugins.ktlint.get().pluginId) - - tasks.withType().configureEach { - kotlinOptions { - jvmTarget = libs.versions.javaVersion.get() - } - } } tasks.register("clean").configure { From db86d1ea8d67cf88c86e1e1dc7b4bd3dddd41a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joris=20Pelgr=C3=B6m?= Date: Sun, 2 Jun 2024 15:43:41 +0200 Subject: [PATCH 5/6] ktlint --- build.gradle.kts | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2c12e574520..3f5e2342acc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - plugins { alias(libs.plugins.ktlint) From 7cafef0ca0285bec98bcf521887e1225aa033b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joris=20Pelgr=C3=B6m?= Date: Sun, 2 Jun 2024 19:30:14 +0200 Subject: [PATCH 6/6] Remove old Compose compiler version --- gradle/libs.versions.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4e9498728cd..83d03bcdebe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,6 @@ car-versions = "1.4.0-rc02" changeLog = "3.5" community-material-typeface = "7.0.96.0-kotlin" compose-bom = "2024.05.00" -compose-compiler = "1.5.14" constraintlayout = "2.1.4" coreKtx = "1.13.1" core-splashscreen = "1.1.0-rc01"