summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinAndroidPlugin.kt12
-rw-r--r--gradle/libs.versions.toml4
2 files changed, 10 insertions, 6 deletions
diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinAndroidPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinAndroidPlugin.kt
index ead89705..221aefef 100644
--- a/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinAndroidPlugin.kt
+++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinAndroidPlugin.kt
@@ -30,10 +30,14 @@ class KotlinAndroidPlugin : Plugin<Project> {
val kotlinVersion = libs.versions.kotlin.get()
val matches = COMPOSE_COMPILER_VERSION_REGEX.find(composeCompilerVersion)
- if (matches != null) {
- val (compilerKotlinVersion) = matches.destructured
- if (compilerKotlinVersion != kotlinVersion) {
- project.tasks.withType<KotlinCompile>().configureEach {
+ project.tasks.withType<KotlinCompile>().configureEach {
+ compilerOptions.freeCompilerArgs.addAll(
+ "-P",
+ "plugin:androidx.compose.compiler.plugins.kotlin:featureFlag=StrongSkipping",
+ )
+ if (matches != null) {
+ val (compilerKotlinVersion) = matches.destructured
+ if (compilerKotlinVersion != kotlinVersion) {
compilerOptions.freeCompilerArgs.addAll(
"-P",
"plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=$kotlinVersion",
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index defd33d4..7114756d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,11 +3,11 @@ agp = "8.4.0"
androidxActivity = "1.9.0"
bouncycastle = "1.78.1"
# @keep used for kotlinCompilerExtensionVersion
-composeCompiler = "1.5.13"
+composeCompiler = "1.5.14-dev-k1.9.24-50022def4af"
coroutines = "1.8.1-Beta"
flowbinding = "1.2.0"
hilt = "2.51.1"
-kotlin = "1.9.23"
+kotlin = "1.9.24"
kotlinResult = "2.0.0"
lifecycle = "2.8.0-rc01"
moshi = "1.15.1"