Upgrade to Gradle 8.4

bakdata · Mar 11, 2024 · c153875 · c153875
1 parent 236a932
commit c153875
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml
@@ -9,6 +9,8 @@ jobs:
   build-and-publish:
     name: Java Gradle
     uses: bakdata/ci-templates/.github/workflows/[email protected]
+    with:
+      java-version: 17
     secrets:
       sonar-token: ${{ secrets.SONARCLOUD_TOKEN }}
       sonar-organization: ${{ secrets.SONARCLOUD_ORGANIZATION }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -18,6 +18,7 @@ jobs:
     name: Java Gradle
     uses: bakdata/ci-templates/.github/workflows/[email protected]
     with:
+      java-version: 17
       release-type: "${{ inputs.release-type }}"
 
     secrets:

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -41,8 +41,9 @@ subprojects {
     apply(plugin = "java")
 
     configure<JavaPluginExtension> {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(11)
+        }
     }
 
     apply(plugin = "java-gradle-plugin")
@@ -74,12 +75,9 @@ subprojects {
     }
 
     dependencies {
-        "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.3.0")
-        "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.3.0")
-        "testImplementation"("org.assertj", "assertj-core", "3.11.1")
-        "testImplementation"("org.junit-pioneer", "junit-pioneer", "0.3.0")
+        val junitVersion = "5.10.2"
+        "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
+        "testImplementation"("org.junit.jupiter:junit-jupiter-api:$junitVersion")
+        "testImplementation"("org.assertj", "assertj-core", "3.25.3")
     }
 }
-
-val sonarqube by tasks
-sonarqube.enabled = false //FIXME requires Java 17
diff --git a/sonar/src/test/kotlin/com/bakdata/gradle/SonarPluginIT.kt b/sonar/src/test/kotlin/com/bakdata/gradle/SonarPluginIT.kt
@@ -30,14 +30,11 @@ import org.gradle.testkit.runner.BuildTask
 import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
-import org.junitpioneer.jupiter.TempDirectory
-import org.junitpioneer.jupiter.TempDirectory.TempDir
+import org.junit.jupiter.api.io.TempDir
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Path
 
-@ExtendWith(TempDirectory::class)
 internal class SonarPluginIT {
     private fun taskWithPathAndOutcome(path: String, outcome: TaskOutcome):
             Condition<BuildTask> = Condition({ it.path == path && it.outcome == outcome }, "Task $path=$outcome")

diff --git a/sonatype/src/test/kotlin/com/bakdata/gradle/SonatypePluginIT.kt b/sonatype/src/test/kotlin/com/bakdata/gradle/SonatypePluginIT.kt
@@ -36,16 +36,15 @@ import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
-import org.junitpioneer.jupiter.TempDirectory
-import org.junitpioneer.jupiter.TempDirectory.TempDir
+import org.junit.jupiter.api.io.TempDir
 import ru.lanwen.wiremock.ext.WiremockResolver
 import ru.lanwen.wiremock.ext.WiremockResolver.Wiremock
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Path
 
 
-@ExtendWith(TempDirectory::class, WiremockResolver::class)
+@ExtendWith(WiremockResolver::class)
 internal class SonatypePluginIT {
     private fun taskWithPathAndOutcome(path: String, outcome: TaskOutcome):
             Condition<BuildTask> = Condition({ it.path == path && it.outcome == outcome }, "Task $path=$outcome")