diff options
| -rw-r--r-- | build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt | 2 | ||||
| -rw-r--r-- | gradle/libs.versions.toml | 2 | ||||
| -rw-r--r-- | settings.gradle.kts | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt b/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt index 24bd95de..f37e427d 100644 --- a/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt +++ b/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt @@ -62,8 +62,6 @@ class KotlinCommonPlugin : Plugin<Project> { private val ADDITIONAL_COMPILER_ARGS = listOf( "-opt-in=kotlin.RequiresOptIn", - "-P", - "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=1.7.20", ) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 493e028a..34d5bafe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -50,7 +50,7 @@ build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.11.0" build-vcu = "nl.littlerobots.version-catalog-update:nl.littlerobots.version-catalog-update.gradle.plugin:0.6.1" build-versions = "com.github.ben-manes:gradle-versions-plugin:0.42.0" compose-animation = "androidx.compose.animation:animation:1.3.0-beta03" -compose-compiler = "androidx.compose.compiler:compiler:1.4.0-dev-k1.7.20-RC-a143c065804" +compose-compiler = "androidx.compose.compiler:compiler:1.3.2" compose-foundation-core = { module = "androidx.compose.foundation:foundation", version.ref = "composeFoundation" } compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "composeFoundation" } compose-hilt = "androidx.hilt:hilt-navigation-compose:1.0.0" diff --git a/settings.gradle.kts b/settings.gradle.kts index 8727067c..cadfe9d5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -77,6 +77,7 @@ dependencyResolutionManagement { includeGroup("androidx.cardview") includeGroup("androidx.collection") includeGroup("androidx.compose.animation") + includeGroup("androidx.compose.compiler") includeGroup("androidx.compose.foundation") includeGroup("androidx.compose.material") includeGroup("androidx.compose.material3") @@ -144,10 +145,6 @@ dependencyResolutionManagement { } } exclusiveContent { - forRepository { maven(url = "https://androidx.dev/storage/compose-compiler/repository/") } - filter { includeGroup("androidx.compose.compiler") } - } - exclusiveContent { forRepository { maven("https://jitpack.io") } filter { includeModule("com.github.haroldadmin", "WhatTheStack") } } |