summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>2022-12-01 15:19:41 +0000
committerGitHub <noreply@github.com>2022-12-01 15:19:41 +0000
commit54bb4676a7c16d959769e522ac018f3e3e822797 (patch)
tree931873c4048fa2ad4d64ef971fa398b63649e7bc
parent0e993fca29343bc12688e326e17525c46fddc479 (diff)
fix(deps): update kotlin to v1.7.22 (#2278)
* fix(deps): update kotlin to v1.7.22 * fix(gradle): allow Kotlin 1.7.22 for Compose Compiler (cherry picked from commit 6c218c20bfd21e0a9ad75e3dfc98525d4ac40a7f) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
-rw-r--r--build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt2
-rw-r--r--gradle/libs.versions.toml2
2 files changed, 3 insertions, 1 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 763b37d3..34d4675b 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
@@ -61,6 +61,8 @@ class KotlinCommonPlugin : Plugin<Project> {
private val ADDITIONAL_COMPILER_ARGS =
listOf(
"-opt-in=kotlin.RequiresOptIn",
+ "-P",
+ "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=1.7.22",
)
}
}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 80df7ecb..173682da 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ composeCompiler = "1.4.0-alpha02"
coroutines = "1.6.4"
flowbinding = "1.2.0"
hilt = "2.44.2"
-kotlin = "1.7.21"
+kotlin = "1.7.22"
leakcanary = "2.10"
lifecycle = "2.6.0-alpha03"