From 54bb4676a7c16d959769e522ac018f3e3e822797 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 1 Dec 2022 15:19:41 +0000 Subject: [PATCH] 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 --- .../main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt | 2 ++ gradle/libs.versions.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 763b37d38..34d4675b2 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 { 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 80df7ecb7..173682dad 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"