upgraded for v1.21 spigot

groovier-minecraft · Nov 11, 2024 · fd2d9ea · fd2d9ea
1 parent 3a31f4b
commit fd2d9ea
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 39 deletions.
diff --git a/.github/workflows/1.21.yml b/.github/workflows/1.21.yml
@@ -0,0 +1,25 @@
+name: build artifacts for 1.21
+on:
+  push:
+    branches:
+      - feat/1.21
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Source Code
+        id: checkout-source
+        uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'adopt'
+      - name: 'Package Jar'
+        run: mvn -B package --file ./pom.xml
+      - name: 'upload artifacts'
+        id: upload-artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: groovier-plugin
+          path: './groovier-plugin/target'
diff --git a/groovier-engine/pom.xml b/groovier-engine/pom.xml
@@ -11,12 +11,6 @@
 
     <artifactId>groovier-engine</artifactId>
 
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
-
     <dependencies>
         <dependency>
             <groupId>org.groovier</groupId>

diff --git a/groovier-plugin/pom.xml b/groovier-plugin/pom.xml
@@ -12,13 +12,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>groovier-plugin</artifactId>
-    <version>${project.parent.version}.2</version>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
+    <version>${project.parent.version}-1.21</version>
 
     <dependencies>
         <dependency>

diff --git a/groovier-plugin/src/main/resources_bungee/grapesConfig.groovy b/groovier-plugin/src/main/resources_bungee/grapesConfig.groovy
@@ -1,5 +1,5 @@
 @GrabResolver(name = 'bungee-repo', root = 'https://oss.sonatype.org/content/repositories/snapshots')
-@Grab(group = 'net.md-5', module = 'bungeecord-api', version = '1.21-R0.1-SNAPSHOT')
+@Grab(group = 'net.md-5', module = 'bungeecord-api', version = '1.20-R0.1')
 @GrabResolver(name = 'groovier', root = 'https://maven.pkg.github.com/groovier-minecraft/groovier')
 @Grab(group = 'org.groovier', module = 'groovier-scripts', version = '0.0.4')
 import java.lang.Object
diff --git a/groovier-plugin/src/main/resources_spigot/grapesConfig.groovy b/groovier-plugin/src/main/resources_spigot/grapesConfig.groovy
@@ -1,5 +1,5 @@
 @GrabResolver(name = 'spigot-repo', root = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/')
-@Grab(group = 'org.spigotmc', module = 'spigot-api', version = '1.20.4-R0.1-SNAPSHOT')
+@Grab(group = 'org.spigotmc', module = 'spigot-api', version = '1.21.1-R0.1-SNAPSHOT')
 @GrabResolver(name = 'groovier', root = 'https://maven.pkg.github.com/groovier-minecraft/groovier')
 @Grab(group = 'org.groovier', module = 'groovier-scripts', version = '0.0.4')
 import java.lang.Object
diff --git a/groovier-scripts/pom.xml b/groovier-scripts/pom.xml
@@ -12,11 +12,6 @@
 
     <artifactId>groovier-scripts</artifactId>
 
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
     <build>
         <plugins>
             <plugin>

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,8 @@
     </modules>
 
     <properties>
-        <java.version>17</java.version>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -28,7 +29,7 @@
                 <plugin>
                     <groupId>org.codehaus.gmavenplus</groupId>
                     <artifactId>gmavenplus-plugin</artifactId>
-                    <version>1.13.1</version>
+                    <version>4.0.1</version>
                     <executions>
                         <execution>
                             <goals>
@@ -57,7 +58,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.1</version>
                     <executions>
                         <execution>
                             <id>save-resources</id>
@@ -89,7 +90,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.3.2</version>
+                    <version>3.11.1</version>
                     <executions>
                         <execution>
                             <id>attach-javadocs</id>
@@ -106,7 +107,6 @@
                             <link>https://docs.groovy-lang.org/latest/html/api/</link>
                         </links>
                         <show>public</show>
-                        <isOffline>false</isOffline>
                         <linksource>true</linksource>
                         <encoding>UTF-8</encoding>
                         <windowtitle>Groovier</windowtitle>
@@ -116,15 +116,14 @@
                         <version>true</version>
                         <linksource>true</linksource>
                         <notimestamp>true</notimestamp>
-                        <reportOutputDirectory>${project.build.directory}</reportOutputDirectory>
                         <outputDirectory>../javadocs</outputDirectory>
                         <detectJavaApiLink>true</detectJavaApiLink>
                     </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>2.4</version>
+                    <version>3.3.1</version>
                     <executions>
                         <execution>
                             <id>attach-sources</id>
@@ -137,11 +136,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
-                    <configuration>
-                        <source>${java.version}</source>
-                        <target>${java.version}</target>
-                    </configuration>
+                    <version>3.13.0</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.codehaus.groovy</groupId>
@@ -153,7 +148,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.2.4</version>
+                    <version>3.6.0</version>
                     <executions>
                         <execution>
                             <phase>package</phase>
@@ -211,12 +206,12 @@
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy-dep</artifactId>
-                <version>1.12.10</version>
+                <version>1.15.10</version>
             </dependency>
             <dependency>
                 <groupId>org.jetbrains</groupId>
                 <artifactId>annotations</artifactId>
-                <version>23.0.0</version>
+                <version>26.0.1</version>
             </dependency>
             <dependency>
                 <groupId>org.groovier</groupId>
@@ -231,20 +226,20 @@
             <dependency>
                 <groupId>org.spigotmc</groupId>
                 <artifactId>spigot-api</artifactId>
-                <version>1.20.4-R0.1-SNAPSHOT</version>
+                <version>1.21.1-R0.1-SNAPSHOT</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>net.md-5</groupId>
                 <artifactId>bungeecord-api</artifactId>
-                <version>1.19-R0.1-SNAPSHOT</version>
+                <version>1.20-R0.1</version>
                 <type>jar</type>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>com.google.inject</groupId>
                 <artifactId>guice</artifactId>
-                <version>5.1.0</version>
+                <version>6.0.0</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.inject</groupId>
@@ -260,7 +255,7 @@
             <dependency>
                 <groupId>org.apache.groovy</groupId>
                 <artifactId>groovy</artifactId>
-                <version>4.0.22</version>
+                <version>4.0.24</version>
             </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>