Merge pull request #159 from beryx/feature/update_gradle_java_asm

Java 25 compatibility, minimum JDK 17, update plugins

Author: xzel23

.github/workflows/build-runtime-plugin.yml

@@ -7,24 +7,19 @@ jobs:
     if: github.ref == 'refs/heads/master' && github.event_name == 'push'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/cache@v1
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-        restore-keys: |
-          ${{ runner.os }}-gradle-
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Grant execute permission for publish.sh
-      run: chmod +x publish.sh
-    - name: Build with Gradle
-      run: ./gradlew -is build groovydoc asciidoc --scan
-    - name: Run publish if necessary
-      env: # Or as an environment variable
-        GRGIT_USER: ${{ secrets.GRGIT_USER }}
-      run: ./publish.sh
+      - uses: actions/checkout@v5
+      - name: Set up JDK 17 (default)
+        uses: actions/setup-java@v5
+        with:
+          java-version: '17'
+          distribution: 'zulu'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Grant execute permission for publish.sh
+        run: chmod +x publish.sh
+      - name: Build and run asciidoc
+        run: ./gradlew -is build groovydoc asciidoc --scan
+      - name: Run publish if necessary
+        env: # Or as an environment variable
+          GRGIT_USER: ${{ secrets.GRGIT_USER }}
+        run: ./publish.sh

.github/workflows/publish-plugin.yml

@@ -6,17 +6,13 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v5
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
         with:
-          java-version: '11'
-          distribution: 'temurin'
+          java-version: '17'
+          distribution: 'zulu'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
       - name: Publish Gradle Plugins
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: |
-            assemble
-            publishPlugins
-            -Pgradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }}
-            -Pgradle.publish.secret=${{ secrets.GRADLE_PUBLISH_SECRET }}
+        run: ./gradlew assemble publishPlugins -Pgradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PUBLISH_SECRET }}

build.gradle

@@ -17,19 +17,17 @@ plugins {
     id 'java-gradle-plugin'
     id 'groovy'
     id 'maven-publish'
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
-    id "com.gradle.plugin-publish" version "1.1.0"
-    id "com.github.ethankhall.semantic-versioning" version "1.1.0"
-    id "com.github.ben-manes.versions" version "0.44.0"
-    id 'com.github.jk1.dependency-license-report' version '2.1'
-    id "com.github.hierynomus.license" version "0.16.1"
-    id 'org.asciidoctor.jvm.convert' version '3.3.2'
-    id "org.ajoberstar.git-publish" version "4.1.1"
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'com.gradle.plugin-publish' version '1.3.1'
+    id 'com.github.ethankhall.semantic-versioning' version '1.1.0'
+    id 'com.github.ben-manes.versions' version '0.53.0'
+    id 'com.github.jk1.dependency-license-report' version '2.9'
+    id 'com.github.hierynomus.license' version '0.16.1'
+    id 'org.asciidoctor.jvm.convert' version '4.0.5'
+    id 'org.ajoberstar.git-publish' version '4.2.2'
 }
 
-if(JavaVersion.current() != JavaVersion.VERSION_11) {
-    throw new GradleException("Please use Java 11 to execute this Gradle build")
-}
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 project.version.with {
     major = badassRuntimePluginVersionMajor as int
@@ -46,13 +44,13 @@ ext.badassRuntimePluginTag = Boolean.valueOf(badassRuntimePluginReleaseBuild) ?
 group = 'org.beryx'
 version = badassRuntimePluginVersion
 
-ext.asmVersion = '9.4'
+ext.asmVersion = '9.8'
 
 repositories {
     mavenCentral()
 }
 
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 
 def defaultEncoding = 'UTF-8'
 [compileJava, compileTestJava]*.options*.encoding = defaultEncoding
@@ -121,7 +119,7 @@ gradlePlugin {
 }
 
 shadowJar {
-    archiveClassifier = null
+    archiveClassifier = ''
     relocate 'org.objectweb.asm', 'org.beryx.jlink.shadow.asm'
 }
 

gradle.properties

@@ -1,5 +1,5 @@
-badassRuntimePluginVersionMajor = 1
-badassRuntimePluginVersionMinor = 13
-badassRuntimePluginVersionPatch = 2
-# badassRuntimePluginVersionLabel = rc-1
+badassRuntimePluginVersionMajor = 2
+badassRuntimePluginVersionMinor = 0
+badassRuntimePluginVersionPatch = 0
+badassRuntimePluginVersionLabel = beta
 badassRuntimePluginReleaseBuild = false

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists