Skip to content

Commit 08dbaa7

Browse files
authored
Merge pull request #2240 from mkmuir0/1.0.29-release
Update Kotlin Version: 2.1.0
2 parents 523c6f7 + 03b463d commit 08dbaa7

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

Diff for: gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ class KotlinFactories {
166166
from = compilerOptions,
167167
into = kspTask.compilerOptions
168168
)
169-
kspTask.produceUnpackedKlib.set(false)
169+
kspTask.produceUnpackagedKlib.set(false)
170170
kspTask.onlyIf {
171171
// KonanTarget is not properly serializable, hence we should check by name
172172
// see https://youtrack.jetbrains.com/issue/KT-61657.

Diff for: gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt

-1
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,6 @@ class KspGradleSubplugin @Inject internal constructor(private val registry: Tool
417417
}
418418

419419
fun configureLanguageVersion(kspTask: KotlinCompilationTask<*>) {
420-
kspTask.compilerOptions.useK2.value(false)
421420
val languageVersion = kotlinCompilation.compilerOptions.options.languageVersion
422421
val progressiveMode = kotlinCompilation.compilerOptions.options.progressiveMode
423422
kspTask.compilerOptions.languageVersion.value(

Diff for: gradle.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Copied from kotlinc
22
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx4096m -Dfile.encoding=UTF-8
33

4-
kotlinBaseVersion=2.0.21
4+
kotlinBaseVersion=2.1.0
55
agpBaseVersion=7.3.1
66
agpTestVersion=8.7.1
7-
intellijVersion=233.13135.103
7+
intellijVersion=233.13135.128
88
junitVersion=4.13.1
99
junit5Version=5.8.2
1010
junitPlatformVersion=1.8.2
@@ -26,4 +26,4 @@ kotlin.jvm.target.validation.mode=warning
2626

2727
# Build or runtime dependencies of this project
2828
buildKotlinVersion=2.0.20
29-
buildKspVersion=2.0.20-1.0.25
29+
buildKspVersion=2.0.20-1.0.25

0 commit comments

Comments
 (0)