Merge pull request #2023 from liutikas/upgradekgpksp

Upgrade to KGP 2.3.0 and KSP 2.3.4
pull/2024/head
Aurimas 9 months ago committed by GitHub
commit f49e6735aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -27,6 +27,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinBaseExtension import org.jetbrains.kotlin.gradle.dsl.KotlinBaseExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
/** /**
* Configure base Kotlin with Android options * Configure base Kotlin with Android options
@ -85,6 +86,9 @@ private inline fun <reified T : KotlinBaseExtension> Project.configureKotlin() =
is KotlinJvmProjectExtension -> compilerOptions is KotlinJvmProjectExtension -> compilerOptions
else -> TODO("Unsupported project extension $this ${T::class}") else -> TODO("Unsupported project extension $this ${T::class}")
}.apply { }.apply {
// TODO: move remove languageVersion and coreLibrariesVersion after upgrading to AGP 9.0
languageVersion.set(KotlinVersion.KOTLIN_2_2)
coreLibrariesVersion = "2.2.21"
jvmTarget = JvmTarget.JVM_11 jvmTarget = JvmTarget.JVM_11
allWarningsAsErrors = warningsAsErrors allWarningsAsErrors = warningsAsErrors
freeCompilerArgs.add( freeCompilerArgs.add(

@ -46,11 +46,11 @@ hilt = "2.57.2"
hiltExt = "1.2.0" hiltExt = "1.2.0"
jacoco = "0.8.12" jacoco = "0.8.12"
junit4 = "4.13.2" junit4 = "4.13.2"
kotlin = "2.2.21" kotlin = "2.3.0"
kotlinxCoroutines = "1.10.1" kotlinxCoroutines = "1.10.1"
kotlinxDatetime = "0.6.1" kotlinxDatetime = "0.6.1"
kotlinxSerializationJson = "1.8.0" kotlinxSerializationJson = "1.8.0"
ksp = "2.3.1" ksp = "2.3.4"
okhttp = "4.12.0" okhttp = "4.12.0"
protobuf = "4.29.2" protobuf = "4.29.2"
protobufPlugin = "0.9.5" protobufPlugin = "0.9.5"

Loading…
Cancel
Save