Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update Kotlin Version: 2.1.0 #2240

Merged
merged 3 commits into from
Nov 27, 2024
Merged

Update Kotlin Version: 2.1.0 #2240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
396a213
Update gradle.properties
mkmuir0 Nov 27, 2024
ca867dd
Update KotlinFactories.kt
mkmuir0 Nov 27, 2024
03b463d
Update KspSubplugin.kt
mkmuir0 Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class KotlinFactories {
from = compilerOptions,
into = kspTask.compilerOptions
)
kspTask.produceUnpackedKlib.set(false)
kspTask.produceUnpackagedKlib.set(false)
kspTask.onlyIf {
// KonanTarget is not properly serializable, hence we should check by name
// see https://youtrack.jetbrains.com/issue/KT-61657.
Expand Down
1 change: 0 additions & 1 deletion gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,6 @@ class KspGradleSubplugin @Inject internal constructor(private val registry: Tool
}

fun configureLanguageVersion(kspTask: KotlinCompilationTask<*>) {
kspTask.compilerOptions.useK2.value(false)
val languageVersion = kotlinCompilation.compilerOptions.options.languageVersion
val progressiveMode = kotlinCompilation.compilerOptions.options.progressiveMode
kspTask.compilerOptions.languageVersion.value(
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Copied from kotlinc
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx4096m -Dfile.encoding=UTF-8

kotlinBaseVersion=2.0.21
kotlinBaseVersion=2.1.0
agpBaseVersion=7.3.1
agpTestVersion=8.7.1
intellijVersion=233.13135.103
intellijVersion=233.13135.128
junitVersion=4.13.1
junit5Version=5.8.2
junitPlatformVersion=1.8.2
Expand All @@ -26,4 +26,4 @@ kotlin.jvm.target.validation.mode=warning

# Build or runtime dependencies of this project
buildKotlinVersion=2.0.20
buildKspVersion=2.0.20-1.0.25
buildKspVersion=2.0.20-1.0.25
Loading