Skip to content

Commit 6bac769

Browse files
committed
Downgrade KSP to 1.0.32
1 parent 764160c commit 6bac769

File tree

6 files changed

+18
-9
lines changed

6 files changed

+18
-9
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
### sqllin-processor
2121

22-
* Update `KSP`'s version to `2.1.20-2.0.0`
22+
* Update `KSP`'s version to `2.1.20-1.0.32`
2323

2424
## v1.4.1 / 2025-02-04
2525

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ kotlin.code.style=official
2727
kotlin.mpp.stability.nowarn=true
2828
kotlin.mpp.enableCInteropCommonization=true
2929
kotlin.natvie.increment=true
30-
#ksp.useKSP2=true
30+
kotlin.jvm.target.validation.mode=warning
3131
#kotlin.compiler.execution.strategy=out-of-process

gradle/libs.versions.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
kotlin = "2.1.20"
44
agp = "8.9.2"
5-
ksp = "2.1.20-2.0.0"
5+
ksp = "2.1.20-1.0.32"
66
serialization = "1.8.1"
77
coroutines = "1.10.2"
88
androidx-annotation = "1.9.1"
99
androidx-test = "1.6.1"
1010
androidx-test-runner = "1.6.2"
1111
sqlite-jdbc = "3.49.1.0"
12+
desugar-jdk-libs = "2.1.5"
1213

1314
[libraries]
1415

@@ -24,6 +25,8 @@ androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "
2425

2526
sqlite-jdbc = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite-jdbc" }
2627

28+
desugar-jdk-libs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "desugar-jdk-libs" }
29+
2730
[plugins]
2831

2932
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

sample/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ plugins {
1111
version = "1.0"
1212

1313
kotlin {
14+
jvmToolchain(21)
1415
androidTarget {
1516
publishLibraryVariants("release")
1617
}
@@ -47,12 +48,12 @@ android {
4748
minSdk = 23
4849
}
4950
compileOptions {
50-
sourceCompatibility = JavaVersion.VERSION_11
51-
targetCompatibility = JavaVersion.VERSION_21
51+
isCoreLibraryDesugaringEnabled = true
5252
}
5353
}
5454

5555
dependencies {
56+
coreLibraryDesugaring(libs.desugar.jdk.libs)
5657
add("kspCommonMainMetadata", project(":sqllin-processor"))
5758
}
5859

sqllin-driver/build.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ version = VERSION
2020
@OptIn(ExperimentalKotlinGradlePluginApi::class)
2121
kotlin {
2222
explicitApi()
23+
jvmToolchain(21)
2324
androidTarget {
2425
publishLibraryVariants("release")
2526
instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
@@ -106,8 +107,7 @@ android {
106107
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
107108
}
108109
compileOptions {
109-
sourceCompatibility = JavaVersion.VERSION_11
110-
targetCompatibility = JavaVersion.VERSION_21
110+
isCoreLibraryDesugaringEnabled = true
111111
}
112112
}
113113

@@ -125,6 +125,10 @@ fun KotlinNativeTarget.setupNativeConfig() {
125125
}
126126
}
127127

128+
dependencies {
129+
coreLibraryDesugaring(libs.desugar.jdk.libs)
130+
}
131+
128132
val javadocJar: TaskProvider<Jar> by tasks.registering(Jar::class) {
129133
archiveClassifier.set("javadoc")
130134
}

sqllin-dsl/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ version = VERSION
2323
@OptIn(ExperimentalKotlinGradlePluginApi::class)
2424
kotlin {
2525
explicitApi()
26+
jvmToolchain(21)
2627
androidTarget {
2728
publishLibraryVariants("release")
2829
instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
@@ -171,8 +172,7 @@ android {
171172
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
172173
}
173174
compileOptions {
174-
sourceCompatibility = JavaVersion.VERSION_11
175-
targetCompatibility = JavaVersion.VERSION_21
175+
isCoreLibraryDesugaringEnabled = true
176176
}
177177
}
178178

@@ -189,6 +189,7 @@ fun KotlinNativeTarget.setupNativeConfig() {
189189
}
190190

191191
dependencies {
192+
coreLibraryDesugaring(libs.desugar.jdk.libs)
192193
val sourceSets = listOf(
193194
"kspAndroidAndroidTest",
194195

0 commit comments

Comments
 (0)