fix: upgrade to jdk21 + fix dependencies

panda-lang · Dec 1, 2024 · 6a6499b · 6a6499b
1 parent 2d31ba5
commit 6a6499b
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 23 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -8,14 +8,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [11, 17, 21]
+        java_version: [21]
         os: [windows-latest, macos-14, macos-13, ubuntu-latest] # Macos 13 is x86-64 and 14 is aarch64
 
     steps:
       - uses: actions/checkout@v1
-      - name: Set up JDK 1.8
+      - name: Set up JDK 21
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 21
       - name: Build with Maven
         run: mvn package --file pom.xml
diff --git a/panda-framework/pom.xml b/panda-framework/pom.xml
@@ -51,8 +51,9 @@
 
         <!-- Tests -->
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy</artifactId>
+            <groupId>org.apache.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <type>pom</type>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/panda-standalone/pom.xml b/panda-standalone/pom.xml
@@ -47,8 +47,9 @@
 
         <!-- Tests -->
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy</artifactId>
+            <groupId>org.apache.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <type>pom</type>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/panda-utilities/pom.xml b/panda-utilities/pom.xml
@@ -54,8 +54,9 @@
 
         <!-- Tests -->
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy</artifactId>
+            <groupId>org.apache.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <type>pom</type>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/panda-utilities/src/test/groovy/panda/utilities/ArrayUtilsTest.groovy b/panda-utilities/src/test/groovy/panda/utilities/ArrayUtilsTest.groovy
@@ -23,7 +23,7 @@ import java.util.function.Function
 
 import static org.junit.jupiter.api.Assertions.*
 
-@CompileStatic
+//@CompileStatic
 final class ArrayUtilsTest {
 
     private static final String[] EMPTY_ARRAY = []

diff --git a/panda-utilities/src/test/groovy/panda/utilities/ClassUtilsTest.groovy b/panda-utilities/src/test/groovy/panda/utilities/ClassUtilsTest.groovy
@@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals
 import static org.junit.jupiter.api.Assertions.assertFalse
 import static org.junit.jupiter.api.Assertions.assertTrue
 
-@CompileStatic
+//@CompileStatic
 class ClassUtilsTest {
 
     @Test

diff --git a/panda/pom.xml b/panda/pom.xml
@@ -54,8 +54,9 @@
 
         <!-- Tests -->
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy</artifactId>
+            <groupId>org.apache.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <type>pom</type>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -47,8 +47,8 @@
     <properties>
         <!-- Panda properties -->
         <panda.version>${project.version}</panda.version>
-        <panda.javaLanguageLevel>1.8</panda.javaLanguageLevel>
-        <panda.javaVersion>1.8</panda.javaVersion>
+        <panda.javaLanguageLevel>21</panda.javaLanguageLevel>
+        <panda.javaVersion>21</panda.javaVersion>
 
         <!-- Maven properties -->
         <maven.compiler.source>${panda.javaLanguageLevel}</maven.compiler.source>
@@ -133,37 +133,42 @@
 
             <!-- Tests -->
             <dependency>
-                <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy</artifactId>
-                <version>3.0.9</version>
+                <groupId>org.apache.groovy</groupId>
+                <artifactId>groovy-all</artifactId>
+                <version>4.0.24</version>
+                <type>pom</type>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-api</artifactId>
-                <version>5.8.2</version>
+                <version>5.11.3</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-engine</artifactId>
-                <version>5.8.2</version>
+                <version>5.11.3</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
     <repositories>
         <repository>
-            <id>panda-repository</id>
-            <url>https://repo.panda-lang.org/releases</url>
+            <id>central</id>
+            <url>https://repo.maven.apache.org/maven2</url>
+        </repository>
+        <repository>
+            <id>reposilite-repository</id>
+            <url>https://maven.reposilite.com/releases</url>
         </repository>
     </repositories>
 
     <distributionManagement>
         <repository>
             <id>panda-repository</id>
-            <url>https://repo.panda-lang.org/releases</url>
+            <url>https://maven.reposilite.com/releases</url>
         </repository>
     </distributionManagement>
 
@@ -188,6 +193,7 @@
             <plugin>
                 <groupId>org.codehaus.gmavenplus</groupId>
                 <artifactId>gmavenplus-plugin</artifactId>
+                <version>4.0.1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>