refactor(build): realign to Kotlin 1.9.0
This commit is contained in:
parent
d0ebe6048c
commit
923010dfff
|
@ -20,10 +20,12 @@
|
||||||
{
|
{
|
||||||
"matchPackageNames": [
|
"matchPackageNames": [
|
||||||
"com.google.devtools.ksp",
|
"com.google.devtools.ksp",
|
||||||
"org.jetbrains.kotlin:kotlin-gradle-plugin",
|
|
||||||
"org.jetbrains.kotlin:kotlin-compiler-embeddable",
|
"org.jetbrains.kotlin:kotlin-compiler-embeddable",
|
||||||
|
"org.jetbrains.kotlin:kotlin-gradle-plugin",
|
||||||
|
"org.jetbrains.kotlin:kotlin-gradle-plugin-api",
|
||||||
],
|
],
|
||||||
"groupName": "Kotlin",
|
"groupName": "Kotlin",
|
||||||
|
"enabled": false,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="KotlinJpsPluginSettings">
|
<component name="KotlinJpsPluginSettings">
|
||||||
<option name="version" value="1.9.10" />
|
<option name="version" value="1.9.0" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
|
@ -2,5 +2,5 @@ plugins { `kotlin-dsl` }
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(libs.android.gradle.plugin)
|
implementation(libs.android.gradle.plugin)
|
||||||
implementation(libs.kotlin.gradle.plugin)
|
implementation(libs.kotlin.gradlePlugin)
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,6 +20,7 @@ tasks.test.configure {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
implementation(platform(embeddedKotlin("bom")))
|
||||||
compileOnly(libs.kotlin.compiler)
|
compileOnly(libs.kotlin.compiler)
|
||||||
ksp(libs.auto.ksp)
|
ksp(libs.auto.ksp)
|
||||||
compileOnly(libs.auto.annotations)
|
compileOnly(libs.auto.annotations)
|
||||||
|
|
|
@ -20,7 +20,9 @@ gradlePlugin.plugins.register("dev.msfjarvis.tracelog") {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(libs.kotlin.gradle.plugin)
|
implementation(platform(embeddedKotlin("bom")))
|
||||||
ksp(libs.auto.ksp)
|
|
||||||
compileOnly(libs.auto.annotations)
|
compileOnly(libs.auto.annotations)
|
||||||
|
compileOnly(libs.kotlin.gradlePlugin.api)
|
||||||
|
compileOnly(libs.kotlin.stdlib)
|
||||||
|
ksp(libs.auto.ksp)
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
kotlin.stdlib.default.dependency=false
|
|
@ -1,10 +1,9 @@
|
||||||
[versions]
|
[versions]
|
||||||
junit = "5.10.0"
|
junit = "5.10.0"
|
||||||
kotlin = "1.9.10"
|
|
||||||
|
|
||||||
[plugins]
|
[plugins]
|
||||||
buildconfig = "com.github.gmazzo.buildconfig:4.1.2"
|
buildconfig = "com.github.gmazzo.buildconfig:4.1.2"
|
||||||
ksp = "com.google.devtools.ksp:1.9.10-1.0.13"
|
ksp = "com.google.devtools.ksp:1.9.0-1.0.13"
|
||||||
spotless = "com.diffplug.spotless:6.20.0"
|
spotless = "com.diffplug.spotless:6.20.0"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
|
@ -15,7 +14,9 @@ junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.re
|
||||||
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
|
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
|
||||||
junit-legacy = "junit:junit:4.13.2"
|
junit-legacy = "junit:junit:4.13.2"
|
||||||
kct = "dev.zacsweers.kctfork:core:0.3.2"
|
kct = "dev.zacsweers.kctfork:core:0.3.2"
|
||||||
kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
|
kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable" }
|
||||||
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin"}
|
kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin" }
|
||||||
|
kotlin-gradlePlugin-api = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-api" }
|
||||||
|
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib" }
|
||||||
mordant = "com.github.ajalt.mordant:mordant:2.1.0"
|
mordant = "com.github.ajalt.mordant:mordant:2.1.0"
|
||||||
truth = "com.google.truth:truth:1.1.5"
|
truth = "com.google.truth:truth:1.1.5"
|
||||||
|
|
|
@ -17,6 +17,7 @@ tasks.withType<KotlinCompile>().configureEach {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
implementation(platform(embeddedKotlin("bom")))
|
||||||
kotlinCompilerPluginClasspath(projects.compilerPlugin)
|
kotlinCompilerPluginClasspath(projects.compilerPlugin)
|
||||||
implementation(projects.runtime)
|
implementation(projects.runtime)
|
||||||
implementation(libs.mordant)
|
implementation(libs.mordant)
|
||||||
|
|
|
@ -22,6 +22,7 @@ kotlin {
|
||||||
macosX64 { configureTarget() }
|
macosX64 { configureTarget() }
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
commonMainImplementation(platform(embeddedKotlin("bom")))
|
||||||
kotlinCompilerPluginClasspath(projects.compilerPlugin)
|
kotlinCompilerPluginClasspath(projects.compilerPlugin)
|
||||||
commonMainImplementation(projects.runtime)
|
commonMainImplementation(projects.runtime)
|
||||||
commonMainImplementation(libs.mordant)
|
commonMainImplementation(libs.mordant)
|
||||||
|
|
Loading…
Reference in New Issue