hubert/Scaffold
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Upgrade gradle + jdk

Browse Source
This commit is contained in:
Hubert Van De Walle 2023-05-07 16:56:34 +02:00
parent e12cb1cac7
commit 37dba17074
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle.kts
View File

@ -16,7 +16,6 @@ dependencies {
} }
application { application {
mainClassName = "scaffold.ScaffoldKt"
mainClass.set("scaffold.ScaffoldKt") mainClass.set("scaffold.ScaffoldKt")
applicationName = "scaffold" applicationName = "scaffold"
} }

10
buildSrc/build.gradle.kts
View File

@ -2,16 +2,12 @@ plugins {
`kotlin-dsl` `kotlin-dsl`
} }
kotlinDslPluginOptions {
experimentalWarning.set(false)
}
repositories { repositories {
gradlePluginPortal() gradlePluginPortal()
} }
dependencies { dependencies {
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.4.31")) implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.21"))
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21")
implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0") implementation("com.github.johnrengelman:shadow:8.1.1")
} }

5
buildSrc/src/main/kotlin/java-convention.gradle.kts
View File

@ -7,8 +7,9 @@ repositories {
} }
java { java {
targetCompatibility = JavaVersion.toVersion(11) toolchain {
sourceCompatibility = JavaVersion.toVersion(11) languageVersion.set(JavaLanguageVersion.of(19))
}
} }
tasks.withType<JavaCompile> { tasks.withType<JavaCompile> {

9
buildSrc/src/main/kotlin/kotlin-convention.gradle.kts
View File

@ -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 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
@ -18,9 +20,10 @@ tasks.withType<Test> {
} }
tasks.withType<KotlinCompile> { tasks.withType<KotlinCompile> {
kotlinOptions { compilerOptions {
jvmTarget = "11" jvmTarget.set(JvmTarget.JVM_19)
javaParameters = true javaParameters.set(true)
languageVersion.set(KotlinVersion.KOTLIN_2_0)
} }
} }

2
gradle.properties
View File

@ -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.caching=true
org.gradle.parallel=true org.gradle.parallel=true

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

3
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists