mirror of
https://github.com/Suwayomi/Tachidesk.git
synced 2025-12-10 06:42:07 +01:00
Update Kotlin to 2.0.20
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -5,6 +5,7 @@ gradle.properties
|
|||||||
.fleet
|
.fleet
|
||||||
# But we need these
|
# But we need these
|
||||||
!.idea/runConfigurations
|
!.idea/runConfigurations
|
||||||
|
.kotlin
|
||||||
|
|
||||||
# Ignore Gradle build output directory
|
# Ignore Gradle build output directory
|
||||||
build
|
build
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
|
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
|
||||||
import org.jlleitschuh.gradle.ktlint.KtlintExtension
|
import org.jlleitschuh.gradle.ktlint.KtlintExtension
|
||||||
import org.jlleitschuh.gradle.ktlint.KtlintPlugin
|
import org.jlleitschuh.gradle.ktlint.KtlintPlugin
|
||||||
@@ -43,12 +44,9 @@ subprojects {
|
|||||||
tasks {
|
tasks {
|
||||||
withType<KotlinJvmCompile> {
|
withType<KotlinJvmCompile> {
|
||||||
dependsOn("ktlintFormat")
|
dependsOn("ktlintFormat")
|
||||||
kotlinOptions {
|
compilerOptions {
|
||||||
jvmTarget = JavaVersion.VERSION_1_8.toString()
|
jvmTarget = JvmTarget.JVM_1_8
|
||||||
|
freeCompilerArgs.add("-Xcontext-receivers")
|
||||||
freeCompilerArgs += listOf(
|
|
||||||
"-Xcontext-receivers",
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
[versions]
|
[versions]
|
||||||
kotlin = "1.9.10"
|
kotlin = "2.0.20"
|
||||||
coroutines = "1.7.3"
|
coroutines = "1.7.3"
|
||||||
serialization = "1.6.0"
|
serialization = "1.6.0"
|
||||||
okhttp = "5.0.0-alpha.14" # Major version is locked by Tachiyomi extensions
|
okhttp = "5.0.0-alpha.14" # Major version is locked by Tachiyomi extensions
|
||||||
|
|||||||
@@ -141,11 +141,10 @@ tasks {
|
|||||||
}
|
}
|
||||||
|
|
||||||
withType<KotlinJvmCompile> {
|
withType<KotlinJvmCompile> {
|
||||||
kotlinOptions {
|
compilerOptions {
|
||||||
freeCompilerArgs +=
|
freeCompilerArgs.add(
|
||||||
listOf(
|
"-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
|
||||||
"-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user