From afc3ee54717a7c5bfd740f7d5a8795a2f91e4f0c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Apr 2022 00:13:26 +0530 Subject: [PATCH] chore(deps): update org.jetbrains.kotlin to v1.6.20 (#312) * chore(deps): update org.jetbrains.kotlin to v1.6.20 * gradle: fix warnings from Kotlin 1.6.20 upgrade * Switch to Compose 0.0.0-master-dev673 JetBrains why are you like this Co-authored-by: Renovate Bot Co-authored-by: Harsh Shandilya --- .../kotlin/dev.msfjarvis.claw.kotlin-common.gradle.kts | 2 +- gradle.properties | 2 -- gradle/libs.versions.toml | 4 ++-- renovate.json | 7 +++++++ 4 files changed, 10 insertions(+), 5 deletions(-) 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 e61b03a8..0dc5fbbb 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( - "-Xopt-in=kotlin.RequiresOptIn", + "-opt-in=kotlin.RequiresOptIn", "-P", "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true", ) diff --git a/gradle.properties b/gradle.properties index ec472998..38e21bab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,8 +27,6 @@ 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 2509e532..b572f8ae 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.10" +kotlin = "1.6.20" 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:1.1.1" +compose = "org.jetbrains.compose:0.0.0-master-dev673" 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 90ec6d3f..3477599a 100644 --- a/renovate.json +++ b/renovate.json @@ -8,6 +8,13 @@ "matchPackagePatterns": ["*"], "automerge": true, "automergeType": "branch" + }, + { + "managers": ["gradle"], + "packagePatterns": [ + "^org.jetbrains.compose" + ], + "enabled": false } ] }