Upgrade to Gradle 8.4 (#12)

bakdata · Feb 22, 2024 · 15f4113 · 15f4113
1 parent 6ea55c7
commit 15f4113
Show file tree

Hide file tree

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

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

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,9 +1,9 @@
 plugins {
     // release
-    id("net.researchgate.release") version "2.6.0"
-    id("com.bakdata.sonar") version "1.1.4"
-    id("com.bakdata.sonatype") version "1.1.4"
-    id("org.hildan.github.changelog") version "0.8.0"
+    id("net.researchgate.release") version "3.0.2"
+    id("com.bakdata.sonar") version "1.1.17"
+    id("com.bakdata.sonatype") version "1.1.14"
+    id("org.hildan.github.changelog") version "2.2.0"
 }
 
 allprojects {
@@ -40,9 +40,10 @@ configure<org.hildan.github.changelog.plugin.GitHubChangelogExtension> {
 subprojects {
     apply(plugin = "java-library")
 
-    configure<JavaPluginConvention> {
-        sourceCompatibility = org.gradle.api.JavaVersion.VERSION_11
-        targetCompatibility = org.gradle.api.JavaVersion.VERSION_11
+    configure<JavaPluginExtension> {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(11)
+        }
     }
 
     dependencies {
@@ -62,5 +63,11 @@ subprojects {
     }
 }
 
+release {
+    git {
+        requireBranch.set("master")
+    }
+}
+
 val sonarqube by tasks
 sonarqube.enabled = false //FIXME requires Java 17
diff --git a/generic-avro-reflect/build.gradle.kts b/generic-avro-reflect/build.gradle.kts
@@ -1,7 +1,3 @@
-plugins {
-    `java-library`
-}
-
 description = "Generates an Avro schema from any Java object at runtime"
 
 dependencies {

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Mar 01 09:37:38 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip