Merge pull request #29 from ELDEpendenci/develop

v2.0.3
ELDEpendenci · Oct 17, 2024 · 59ec486 · 59ec486
2 parents ec2bf62 + f995fac
commit 59ec486
Show file tree

Hide file tree

Showing 15 changed files with 91 additions and 86 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -13,19 +13,19 @@ jobs:
     steps:
       - name: Checkout Source Code
         id: checkout-source
-        uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
+        uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
-          java-version: '18'
+          java-version: '17'
           distribution: 'adopt'
       - run: mvn --batch-mode -Dmaven.deploy.skip=true clean package
         name: build plugins
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         name: 'upload plugins'
         with:
           name: 'plugins'
           path: 'outputs/'
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         name: 'upload javadocs'
         with:
           name: 'javadocs'
@@ -38,15 +38,15 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
-          java-version: '18'
+          java-version: '17'
           distribution: 'adopt'
       - run: echo ::set-output name=version::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
         id: project
       - name: Publish package
         run: mvn --batch-mode clean deploy
         if: ${{ endsWith(steps.project.outputs.version, '-SNAPSHOT') }}
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,44 +10,38 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      packages: read
     steps:
     - name: Checkout Source Code
       id: checkout-source
-      uses: actions/checkout@v2
-    - uses: actions/setup-java@v2
+      uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
-        java-version: '18'
+        java-version: '17'
         distribution: 'adopt'
     - run: mvn --batch-mode clean package
       name: build plugins
     - run: echo ::set-output name=version::$(mvn help:evaluate -Dexpression=eld.plugin.version -q -DforceStdout)
       id: project
 
     - name: Delete existing release and tag
+      continue-on-error: true
       id: delete-tag-release
-      uses: dev-drprasad/delete-tag-and-release@v0.1.2
-      with:
-        tag_name: ${{ steps.project.outputs.version }}
-        delete_release: true
+      run: gh release delete ${{ steps.project.outputs.version }} --yes --cleanup-tag
+
+    - name: zip plugins
+      run: zip -r plugins.zip outputs
 
     - name: Create Release
       id: create_release
-      uses: actions/create-release@v1
+      uses: softprops/action-gh-release@v2
       with:
         tag_name: ${{ steps.project.outputs.version }}
-        release_name: Release ${{ github.repository }} v${{ steps.project.outputs.version }}
+        name: Release ${{ github.repository }} v${{ steps.project.outputs.version }}
         body: 請到 [wiki](https://eric2788.gitbook.io/eldependenci/references/version-update) 查看更新內容
-    - name: zip plugins
-      run: zip -r plugins.zip outputs
-
-    - name: Upload Release jar
-      id: upload-release-asset-jar
-      uses: actions/upload-release-asset@v1
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./plugins.zip
-        asset_name: plugins.zip
-        asset_content_type: application/zip
+        files: plugins.zip
 
     - name: 'Update javadocs'
       run: |
@@ -79,17 +73,17 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: actions-ecosystem/action-get-latest-tag@v1
         id: latest-tag
       - uses: jungwinter/split@v2
         id: version
         with:
          msg: ${{ steps.latest-tag.outputs.tag }}
          separator: '.'
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v4
         with:
-          java-version: '18'
+          java-version: '17'
           distribution: 'adopt'
       - name: Publish package
         run: mvn --batch-mode clean deploy

diff --git a/.github/workflows/temp.yml b/.github/workflows/temp.yml
@@ -0,0 +1,30 @@
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+name: Publish WorkFlows for ELDependenci feature/hotfix branch
+
+on:
+  push:
+    branches:
+      - '*/*'
+      - '!master'
+      - '!develop'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Source Code
+        id: checkout-source
+        uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+      - run: mvn --batch-mode -Dmaven.deploy.skip=true -Dmaven.javadoc.skip=true clean package
+        name: build plugins
+      - uses: actions/upload-artifact@v4
+        name: 'upload plugins'
+        with:
+          name: 'plugins'
+          path: 'outputs/'
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -13,11 +13,12 @@ jobs:
     steps:
       - name: Checkout Source Code
         id: checkout-source
-        uses: actions/checkout@v2
-      - name: Set up JDK 18
+        uses: actions/checkout@v4
+      - name: Set up JDK 17
         id: setup-java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
-          java-version: 18
+          java-version: '17'
+          distribution: 'adopt'
       - name: Build with Maven
-        run: mvn -B package --file pom.xml
+        run: mvn -B package --file pom.xml
diff --git a/eldependenci-addon/pom.xml b/eldependenci-addon/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>eldependenci</artifactId>
         <groupId>org.eldependenci</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/eldependenci-bukkit-plugin/paper-plugin/pom.xml b/eldependenci-bukkit-plugin/paper-plugin/pom.xml
@@ -5,16 +5,13 @@
     <parent>
         <artifactId>eldependenci-bukkit-plugin</artifactId>
         <groupId>org.eldependenci</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>paper-plugin</artifactId>
 
-    <properties>
-        <maven.compiler.source>18</maven.compiler.source>
-        <maven.compiler.target>18</maven.compiler.target>
-    </properties>
+
 
     <version>${eld.plugin.version}</version>
 

diff --git a/eldependenci-bukkit-plugin/pom.xml b/eldependenci-bukkit-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>eldependenci</artifactId>
         <groupId>org.eldependenci</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
 
     <packaging>pom</packaging>
@@ -20,10 +20,7 @@
 
     <artifactId>eldependenci-bukkit-plugin</artifactId>
 
-    <properties>
-        <maven.compiler.source>18</maven.compiler.source>
-        <maven.compiler.target>18</maven.compiler.target>
-    </properties>
+
 
 
     <dependencies>

diff --git a/eldependenci-bukkit-plugin/spigot-based/pom.xml b/eldependenci-bukkit-plugin/spigot-based/pom.xml
@@ -5,17 +5,14 @@
     <parent>
         <artifactId>eldependenci-bukkit-plugin</artifactId>
         <groupId>org.eldependenci</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spigot-based</artifactId>
     <version>${eld.plugin.version}</version>
 
-    <properties>
-        <maven.compiler.source>18</maven.compiler.source>
-        <maven.compiler.target>18</maven.compiler.target>
-    </properties>
+
 
     <dependencies>
         <dependency>

diff --git a/eldependenci-bukkit-plugin/spigot-plugin/pom.xml b/eldependenci-bukkit-plugin/spigot-plugin/pom.xml
@@ -5,15 +5,14 @@
     <parent>
         <artifactId>eldependenci-bukkit-plugin</artifactId>
         <groupId>org.eldependenci</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spigot-plugin</artifactId>
 
     <properties>
-        <maven.compiler.source>18</maven.compiler.source>
-        <maven.compiler.target>18</maven.compiler.target>
+
 
     </properties>
 

diff --git a/eldependenci-bukkit/pom.xml b/eldependenci-bukkit/pom.xml
@@ -5,16 +5,13 @@
     <parent>
         <artifactId>eldependenci</artifactId>
         <groupId>org.eldependenci</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eldependenci-bukkit</artifactId>
 
-    <properties>
-        <maven.compiler.source>18</maven.compiler.source>
-        <maven.compiler.target>18</maven.compiler.target>
-    </properties>
+
 
     <dependencies>
         <dependency>

diff --git a/eldependenci-bungee-plugin/pom.xml b/eldependenci-bungee-plugin/pom.xml
@@ -5,17 +5,14 @@
     <parent>
         <artifactId>eldependenci</artifactId>
         <groupId>org.eldependenci</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eldependenci-bungee-plugin</artifactId>
 
-    <properties>
-        <maven.compiler.source>18</maven.compiler.source>
-        <maven.compiler.target>18</maven.compiler.target>
-    </properties>
+
 
     <version>${eld.plugin.version}</version>
 

diff --git a/eldependenci-bungee/pom.xml b/eldependenci-bungee/pom.xml
@@ -5,16 +5,13 @@
     <parent>
         <artifactId>eldependenci</artifactId>
         <groupId>org.eldependenci</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eldependenci-bungee</artifactId>
 
-    <properties>
-        <maven.compiler.source>18</maven.compiler.source>
-        <maven.compiler.target>18</maven.compiler.target>
-    </properties>
+
 
     <dependencies>
         <dependency>

diff --git a/eldependenci-common/pom.xml b/eldependenci-common/pom.xml
@@ -5,16 +5,13 @@
     <parent>
         <artifactId>eldependenci</artifactId>
         <groupId>org.eldependenci</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eldependenci-common</artifactId>
 
-    <properties>
-        <maven.compiler.source>18</maven.compiler.source>
-        <maven.compiler.target>18</maven.compiler.target>
-    </properties>
+
 
     <dependencies>
         <dependency>

diff --git a/eldependenci-framework/pom.xml b/eldependenci-framework/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>eldependenci</artifactId>
         <groupId>org.eldependenci</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>