Merge pull request #457 from CommonWealthRobotics/kh/java21-in-ci

Kh/java21 in ci

Author: madhephaestus

.github/workflows/release.yml

@@ -42,14 +42,10 @@ jobs:
     - name: start xvfb
       run:
         Xvfb :99 &
-
     - name: initialize the X11 DISPLAY variable
       run:
         export DISPLAY=:99  
 
-    - name: Pull a JavaFX JDK
-      run: wget https://cdn.azul.com/zulu/bin/zulu21.46.19-ca-fx-jdk21.0.9-linux_x64.tar.gz
-
     - name: After JDK download, list directory contnts
       run: pwd; ls -la
 

build.gradle

@@ -12,7 +12,7 @@ buildscript {
 		]
 	}
 	dependencies {
-		classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0'
+		classpath 'com.gradleup.shadow:shadow-gradle-plugin:8.3.9'
 	}
 }
 
@@ -75,9 +75,9 @@ plugins {
 	id 'application'
 	id 'eclipse'
 }
-apply plugin: 'com.github.johnrengelman.shadow'
 if (project == rootProject) {
 	apply plugin: 'application'
+	apply plugin: 'com.gradleup.shadow'
 }else {
 	apply plugin: 'java-library'
 }
@@ -436,17 +436,21 @@ eclipse{
 		}
 	}
 }
+if (project == rootProject) {
 shadowJar {
-	zip64 true
-	mainClassName = 'com.neuronrobotics.bowlerstudio.BowlerStudio'
-	if (project == rootProject) {
-		baseName = 'BowlerStudio'
-		classifier = ""
-	}else {
-		archiveBaseName.set('BowlerStudio')
-		archiveClassifier.set('')
-		archiveVersion.set('')
-	}
-	mergeServiceFiles()
-}
+    zip64 true
+    mainClassName = 'com.neuronrobotics.bowlerstudio.BowlerStudio'
+
+    if (project == rootProject) {
+        archiveBaseName.set('BowlerStudio')
+        archiveClassifier.set('')
+        archiveVersion.set('')
+    } else {
+        archiveBaseName.set('BowlerStudio')
+        archiveClassifier.set('')
+        archiveVersion.set('')
+    }
 
+    mergeServiceFiles()
+}
+}

gradle/wrapper/gradle-wrapper.jar

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