diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0b09280..c50302f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,7 +16,6 @@ dependencies { } application { - mainClassName = "scaffold.ScaffoldKt" mainClass.set("scaffold.ScaffoldKt") applicationName = "scaffold" } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index ac57beb..bc59fe0 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -2,16 +2,12 @@ plugins { `kotlin-dsl` } -kotlinDslPluginOptions { - experimentalWarning.set(false) -} - repositories { gradlePluginPortal() } dependencies { - implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.4.31")) - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31") - implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0") + implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.21")) + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21") + implementation("com.github.johnrengelman:shadow:8.1.1") } diff --git a/buildSrc/src/main/kotlin/java-convention.gradle.kts b/buildSrc/src/main/kotlin/java-convention.gradle.kts index 76f6fbe..29d2310 100644 --- a/buildSrc/src/main/kotlin/java-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/java-convention.gradle.kts @@ -7,8 +7,9 @@ repositories { } java { - targetCompatibility = JavaVersion.toVersion(11) - sourceCompatibility = JavaVersion.toVersion(11) + toolchain { + languageVersion.set(JavaLanguageVersion.of(19)) + } } tasks.withType { diff --git a/buildSrc/src/main/kotlin/kotlin-convention.gradle.kts b/buildSrc/src/main/kotlin/kotlin-convention.gradle.kts index 398ef92..d7e53fe 100644 --- a/buildSrc/src/main/kotlin/kotlin-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/kotlin-convention.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { @@ -18,9 +20,10 @@ tasks.withType { } tasks.withType { - kotlinOptions { - jvmTarget = "11" - javaParameters = true + compilerOptions { + jvmTarget.set(JvmTarget.JVM_19) + javaParameters.set(true) + languageVersion.set(KotlinVersion.KOTLIN_2_0) } } diff --git a/gradle.properties b/gradle.properties index 961751b..ae6a9da 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx2048M -XX:MaxPermSize=512m -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 org.gradle.caching=true org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..c1962a7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d913..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists