paper-plugin scoped for 1.21; upgrade maven-compiler-plugin

ELDEpendenci · Oct 17, 2024 · 7d39e89 · 7d39e89
1 parent ee6737c
commit 7d39e89
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 9 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -16,7 +16,9 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: |
+            17
+            21
           distribution: 'adopt'
       - run: mvn --batch-mode -Dmaven.deploy.skip=true clean package
         name: build plugins
@@ -41,7 +43,9 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: |
+            17
+            21
           distribution: 'adopt'
       - run: echo ::set-output name=version::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
         id: project

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -19,7 +19,9 @@ jobs:
       uses: actions/checkout@v4
     - uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: |
+          17
+          21
         distribution: 'adopt'
     - run: mvn --batch-mode clean package
       name: build plugins
@@ -83,7 +85,9 @@ jobs:
          separator: '.'
       - uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: |
+            17
+            21
           distribution: 'adopt'
       - name: Publish package
         run: mvn --batch-mode clean deploy

diff --git a/.github/workflows/temp.yml b/.github/workflows/temp.yml
@@ -19,7 +19,9 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: |
+            17
+            21
           distribution: 'adopt'
       - run: mvn --batch-mode -Dmaven.deploy.skip=true -Dmaven.javadoc.skip=true clean package
         name: build plugins

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -18,7 +18,9 @@ jobs:
         id: setup-java
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: |
+            17
+            21
           distribution: 'adopt'
       - name: Build with Maven
         run: mvn -B package --file pom.xml
diff --git a/eldependenci-bukkit-plugin/paper-plugin/pom.xml b/eldependenci-bukkit-plugin/paper-plugin/pom.xml
@@ -11,7 +11,10 @@
 
     <artifactId>paper-plugin</artifactId>
 
-
+    <properties>
+        <maven.compile.source>21</maven.compile.source>
+        <maven.compile.target>21</maven.compile.target>
+    </properties>
 
     <version>${eld.plugin.version}</version>
 
@@ -44,4 +47,4 @@
     </build>
 
 
-</project>
+</project>
diff --git a/pom.xml b/pom.xml
@@ -303,7 +303,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.10.1</version>
+                    <version>3.13.0</version>
                     <configuration>
                         <source>${maven.compile.source}</source>
                         <target>${maven.compile.target}</target>