feat(deps): migrate to Kotlin 1.8.20

This commit is contained in:
Harsh Shandilya 2023-04-10 16:00:07 +05:30
parent 5ab0c53d03
commit 5e3c08f1da
No known key found for this signature in database
5 changed files with 18 additions and 10 deletions

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="KotlinJpsPluginSettings">
<option name="version" value="1.8.10" />
<option name="version" value="1.8.20" />
</component>
</project>

View file

@ -16,6 +16,8 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.withType
import org.gradle.language.base.plugins.LifecycleBasePlugin
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@Suppress("Unused")
@ -43,11 +45,13 @@ class KotlinCommonPlugin : Plugin<Project> {
targetCompatibility = JavaVersion.VERSION_11.toString()
}
withType<KotlinCompile>().configureEach {
kotlinOptions {
allWarningsAsErrors = true
jvmTarget = JavaVersion.VERSION_11.toString()
freeCompilerArgs = freeCompilerArgs + ADDITIONAL_COMPILER_ARGS
languageVersion = "1.5"
kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
}
withType<KotlinCompilationTask<*>>().configureEach {
compilerOptions {
allWarningsAsErrors.set(true)
languageVersion.set(KotlinVersion.KOTLIN_1_5)
freeCompilerArgs.addAll(ADDITIONAL_COMPILER_ARGS)
}
}
withType<Test>().configureEach {
@ -61,6 +65,7 @@ class KotlinCommonPlugin : Plugin<Project> {
private val ADDITIONAL_COMPILER_ARGS =
listOf(
"-opt-in=kotlin.RequiresOptIn",
"-Xsuppress-version-warnings",
)
}
}

View file

@ -28,7 +28,7 @@ kapt.incremental.apt=true
kapt.include.compile.classpath=false
# New incremental compilation for Kotlin
kotlin.incremental.useClasspathSnapshot=true
kotlin.compiler.preciseCompilationResultsBackup=true
kotlin.build.report.output=file
# Use R8 instead of ProGuard for code shrinking.

View file

@ -3,11 +3,11 @@ agp = "7.4.2"
androidxActivity = "1.7.0"
bouncycastle = "1.72"
# @keep used for kotlinCompilerExtensionVersion
composeCompiler = "1.4.4"
composeCompiler = "1.4.4-dev-k1.8.20-f6ae19e64ff"
coroutines = "1.6.4"
flowbinding = "1.2.0"
hilt = "2.45"
kotlin = "1.8.10"
kotlin = "1.8.20"
leakcanary = "2.10"
lifecycle = "2.6.1"

View file

@ -78,7 +78,6 @@ dependencyResolutionManagement {
includeGroup("androidx.cardview")
includeGroup("androidx.collection")
includeGroup("androidx.compose.animation")
includeGroup("androidx.compose.compiler")
includeGroup("androidx.compose.foundation")
includeGroup("androidx.compose.material")
includeGroup("androidx.compose.material3")
@ -155,6 +154,10 @@ dependencyResolutionManagement {
forRepository { maven("https://storage.googleapis.com/r8-releases/raw") }
filter { includeModule("com.android.tools", "r8") }
}
exclusiveContent {
forRepository { maven("https://androidx.dev/storage/compose-compiler/repository/") }
filter { includeGroup("androidx.compose.compiler") }
}
mavenCentral()
}
}