Skip to content

Commit 8229f11

Browse files
committed
upgrade Gradle, kotlin, and java
1 parent a3b43ea commit 8229f11

File tree

5 files changed

+19
-15
lines changed

5 files changed

+19
-15
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ allprojects {
33
}
44

55
tasks.getByName<Wrapper>("wrapper") {
6-
gradleVersion = "8.13"
6+
gradleVersion = "9.2.1"
77
distributionType = Wrapper.DistributionType.BIN
88
}
99

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
toolchainVersion=21

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

personal-site/build.gradle.kts

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies {
1818
implementation("org.jsoup:jsoup:1.15.3")
1919
implementation("com.beust:klaxon:5.5")
2020
implementation("com.github.kittinunf.fuel:fuel:2.3.1")
21-
implementation("ch.qos.logback:logback-classic:1.4.5")
21+
implementation("ch.qos.logback:logback-classic:1.5.22")
2222
implementation("com.rometools:rome:1.10.0")
2323
implementation("com.vladsch.flexmark:flexmark-all:0.50.16")
2424

@@ -29,21 +29,24 @@ dependencies {
2929
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.3.1")
3030
}
3131

32-
val testTask = tasks.getByName<Test>("test") {
33-
useJUnitPlatform()
34-
}
35-
36-
tasks.jacocoTestReport {
37-
dependsOn(testTask)
32+
testing {
33+
suites {
34+
named<JvmTestSuite>("test"){
35+
useJUnitJupiter()
36+
targets.all {
37+
testTask.configure {
38+
finalizedBy("jacocoTestReport")
39+
}
40+
}
41+
}
42+
}
3843
}
3944

40-
tasks.findByPath("build")?.dependsOn("jacocoTestReport")
41-
4245
tasks.getByName<JavaExec>("run") {
4346
if (project.hasProperty("neocities.apiKey")) {
44-
args(project.properties.get("neocities.apiKey"))
47+
args(project.properties.get("neocities.apiKey") ?: "")
4548
} else if (project.hasProperty("neocities.user")) {
46-
args(project.properties.get("neocities.user"), project.properties.get("neocities.password"))
49+
args(project.properties.get("neocities.user") ?: "", project.properties.get("neocities.password") ?: "")
4750
}
4851
}
4952

settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pluginManagement{
22
plugins {
3-
id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
4-
id("org.jetbrains.kotlin.jvm") version "2.1.20"
3+
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
4+
id("org.jetbrains.kotlin.jvm") version "2.3.0"
55
id("com.jfrog.artifactory") version "4.24.12"
66
}
77
}

0 commit comments

Comments
 (0)