For #26930: Upgrade kotlin to 1.7.10 and compose compiler to 1.3.0.

Replace deprecated Xopt-in with op-in.
Replace deprecated Xjvm-default=enable with Xjvm-default=all.
pull/543/head
mcarare 2 years ago committed by mergify[bot]
parent fbe8dfee6f
commit 7a240eb9f6

@ -449,7 +449,7 @@ configurations {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
kotlinOptions { kotlinOptions {
freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi" freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
} }
} }

@ -144,7 +144,7 @@ allprojects {
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
kotlinOptions.allWarningsAsErrors = true kotlinOptions.allWarningsAsErrors = true
kotlinOptions.freeCompilerArgs += [ kotlinOptions.freeCompilerArgs += [
"-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=enable" "-opt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"
] ]
} }
} }

@ -6,7 +6,7 @@
// FORCE REBUILD 2022-09-16 // FORCE REBUILD 2022-09-16
object Versions { object Versions {
const val kotlin = "1.6.10" const val kotlin = "1.7.10"
const val coroutines = "1.6.1" const val coroutines = "1.6.1"
// These versions are linked: lint should be X+23.Y.Z of gradle_plugin version, according to: // These versions are linked: lint should be X+23.Y.Z of gradle_plugin version, according to:
@ -21,7 +21,7 @@ object Versions {
const val jna = "5.8.0" const val jna = "5.8.0"
const val androidx_compose = "1.2.1" const val androidx_compose = "1.2.1"
const val androidx_compose_compiler = "1.1.1" const val androidx_compose_compiler = "1.3.0"
const val androidx_appcompat = "1.3.0" const val androidx_appcompat = "1.3.0"
const val androidx_benchmark = "1.0.0" const val androidx_benchmark = "1.0.0"
const val androidx_biometric = "1.1.0" const val androidx_biometric = "1.1.0"

Loading…
Cancel
Save