diff --git a/build-logic/kotlin-plugins/src/main/kotlin/dev.msfjarvis.claw.kotlin-common.gradle.kts b/build-logic/kotlin-plugins/src/main/kotlin/dev.msfjarvis.claw.kotlin-common.gradle.kts index 0dc5fbbb..e61b03a8 100644 --- a/build-logic/kotlin-plugins/src/main/kotlin/dev.msfjarvis.claw.kotlin-common.gradle.kts +++ b/build-logic/kotlin-plugins/src/main/kotlin/dev.msfjarvis.claw.kotlin-common.gradle.kts @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile val additionalCompilerArgs = listOf( - "-opt-in=kotlin.RequiresOptIn", + "-Xopt-in=kotlin.RequiresOptIn", "-P", "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true", ) diff --git a/gradle.properties b/gradle.properties index 38e21bab..ec472998 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,6 +27,8 @@ android.enableR8.fullMode=true android.useAndroidX=true # Kotlin Multiplatform +kotlin.mpp.enableGranularSourceSetsMetadata=false +kotlin.native.enableDependencyPropagation=false kotlin.mpp.stability.nowarn=true # Enable non-transitive R class namespacing where each library only contains diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8c162c24..2509e532 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ aurora = "1.1.0" coroutines = "1.6.1" dagger = "2.41" hilt = "1.0.0" -kotlin = "1.6.21" +kotlin = "1.6.10" richtext = "0.11.0" serialization = "1.3.2" sqldelight = "2.0.0-alpha02" @@ -56,6 +56,6 @@ sqldelight-primitiveAdapters = { module = "app.cash.sqldelight:primitive-adapter testing-mockWebServer = "com.squareup.okhttp3:mockwebserver3-junit4:5.0.0-alpha.6" [plugins] -compose = "org.jetbrains.compose:0.0.0-master-dev673" +compose = "org.jetbrains.compose:1.1.1" hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" } diff --git a/renovate.json b/renovate.json index 3477599a..90ec6d3f 100644 --- a/renovate.json +++ b/renovate.json @@ -8,13 +8,6 @@ "matchPackagePatterns": ["*"], "automerge": true, "automergeType": "branch" - }, - { - "managers": ["gradle"], - "packagePatterns": [ - "^org.jetbrains.compose" - ], - "enabled": false } ] }