From 44554bb575c62733f576a472ad9a82dd0aabc0f3 Mon Sep 17 00:00:00 2001 From: "maarten.vercruysse" Date: Wed, 22 May 2024 18:40:02 +0200 Subject: [PATCH] chore(deps): update kotlin monorepo to v2 (major) --- app/benchmark-rules.pro | 1 + app/build.gradle.kts | 6 ++---- build.gradle.kts | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/benchmark-rules.pro b/app/benchmark-rules.pro index 5fa87d01a..b5245d9a8 100644 --- a/app/benchmark-rules.pro +++ b/app/benchmark-rules.pro @@ -4,3 +4,4 @@ # wrong symbols would be generated. The generated Baseline Profile will be properly applied when generated # without obfuscation and your app is being obfuscated. -dontobfuscate +-dontwarn org.slf4j.impl.StaticLoggerBinder \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 61c3d3c7f..4e0a17579 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -5,7 +5,8 @@ plugins { id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") id("androidx.baselineprofile") - kotlin("plugin.serialization") version "1.9.24" + id("org.jetbrains.kotlin.plugin.compose") version "2.0.0" + kotlin("plugin.serialization") version "2.0.0" } @@ -102,9 +103,6 @@ android { buildFeatures { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.14" - } } dependencies { diff --git a/build.gradle.kts b/build.gradle.kts index 47f24dff2..fdb0d4871 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,9 +3,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("com.android.application") version "8.4.1" apply false id("com.android.library") version "8.4.1" apply false - id("org.jetbrains.kotlin.android") version "1.9.24" apply false + id("org.jetbrains.kotlin.android") version "2.0.0" apply false id("org.jmailen.kotlinter") version "4.3.0" apply false - id("com.google.devtools.ksp") version "1.9.24-1.0.20" apply false + id("com.google.devtools.ksp") version "2.0.0-1.0.21" apply false id("com.android.test") version "8.4.1" apply false id("androidx.baselineprofile") version "1.2.4" apply false }