Update dependencies

mediathekview · Jun 12, 2023 · 36f0dfb · 36f0dfb
1 parent 6f4a956
commit 36f0dfb
Show file tree

Hide file tree

Showing 10 changed files with 740 additions and 94 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,11 +9,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK 20
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: '20'
-          java-package: jdk
       - name: Cache local Maven repository
         uses: actions/cache@v3
         with:

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -1,4 +1,4 @@
-name: Nigthly release
+name: Nightly release
 on:
   schedule:
     - cron: '0 0 * * *'
@@ -10,23 +10,24 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: develop
           fetch-depth: 10
-      - uses: marceloprado/has-changed-path@v1
+      - uses: marceloprado/has-changed-path@v1.0.1
         id: check-if-changed
         with:
           paths: .github/workflows src/ res/ pom.xml .install4j/ .mvn/
       - name: Set up JDK 20
         if: steps.check-if-changed.outputs.changed == 'true'
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 20
+          distribution: 'zulu'
+          java-version: '20'
 
       - name: Cache local Maven repository
         if: steps.check-if-changed.outputs.changed == 'true'
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -35,7 +36,7 @@ jobs:
       - name: Build and test with Maven
         if: steps.check-if-changed.outputs.changed == 'true'
         run: ./mvnw -B package
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: target
           path: target/
@@ -70,13 +71,14 @@ jobs:
             architecture: 64bit
             maven_profiles: "!linux_64bit,mac_intel"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: develop
       - name: Set up JDK 20
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 20
+          distribution: 'zulu'
+          java-version: '20'
       - uses: AdoptOpenJDK/install-jdk@v1
         with:
           version: '8'
@@ -85,12 +87,12 @@ jobs:
       - name: Download install4j
         uses: wei/curl@v1
         with:
-          args: -fsSL 'https://download-gcdn.ej-technologies.com/install4j/install4j_unix_9_0_7.tar.gz' --output install4j.tar.gz
+          args: -fsSL 'https://download-gcdn.ej-technologies.com/install4j/install4j_unix_10_0_5.tar.gz' --output install4j.tar.gz
       - name: Extract install4j
         run: tar -zxvf install4j.tar.gz
 
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -100,7 +102,7 @@ jobs:
         run: ./mvnw clean install4j:install-license -Pinstall4j
         env:
           LICENSE_KEY_9: ${{ secrets.LICENSE_KEY_9 }}
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: target
 
@@ -109,7 +111,7 @@ jobs:
       - name: Building AppImage
         if: matrix.os == 'linux'
         run: scripte/appimage.sh
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: release-target
           path: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,23 +11,24 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: develop
           fetch-depth: 10
-      - uses: marceloprado/has-changed-path@v1
+      - uses: marceloprado/has-changed-path@v1.0.1
         id: check-if-changed
         with:
           paths: .github/workflows src/ res/ pom.xml .install4j/ .mvn/
       - name: Set up JDK 20
         if: steps.check-if-changed.outputs.changed == 'true'
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 20
+          distribution: 'zulu'
+          java-version: '20'
 
       - name: Cache local Maven repository
         if: steps.check-if-changed.outputs.changed == 'true'
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -36,7 +37,7 @@ jobs:
       - name: Build and test with Maven
         if: steps.check-if-changed.outputs.changed == 'true'
         run: ./mvnw -B package
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: target
           path: target/
@@ -71,13 +72,13 @@ jobs:
           #   architecture: 64bit
           #   maven_profiles: "mac,!linux"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: develop
       - name: Set up JDK 20
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
-          #distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '20'
       - uses: AdoptOpenJDK/install-jdk@v1
         with:
@@ -87,12 +88,12 @@ jobs:
       - name: Download install4j
         uses: wei/curl@v1
         with:
-          args: -fsSL 'https://download-gcdn.ej-technologies.com/install4j/install4j_unix_9_0_7.tar.gz' --output install4j.tar.gz
+          args: -fsSL 'https://download-gcdn.ej-technologies.com/install4j/install4j_unix_10_0_5.tar.gz' --output install4j.tar.gz
       - name: Extract install4j
         run: tar -zxvf install4j.tar.gz
 
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -102,7 +103,7 @@ jobs:
         run: ./mvnw clean install4j:install-license -Pinstall4j
         env:
           LICENSE_KEY_9: ${{ secrets.LICENSE_KEY_9 }}
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: target
 
@@ -111,7 +112,7 @@ jobs:
       - name: Building AppImage
         if: matrix.os == 'linux'
         run: scripte/appimage.sh
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: release-target
           path: |
@@ -122,19 +123,20 @@ jobs:
     needs: [build,test]
     if: needs.test.outputs.haschanged == 'true'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: develop
       - name: Set up JDK 20
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 20
+          distribution: 'zulu'
+          java-version: '20'
       - name: Get version
         run: echo "VERSION=$( ./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout )" >> $GITHUB_ENV
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: release-target
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: release-artifacts
           path: |
@@ -162,7 +164,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Deleting build artifacts
-        uses: geekyeggo/delete-artifact@v1
+        uses: geekyeggo/delete-artifact@v2
         with:
           name: |
             release-target

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -48,7 +48,7 @@ stages:
 Build and Deploy nightly Linux:
   stage: deploy-nightly-lin
   script:
-    - mvn -B package -Plinux_64bit,install4j $MAVEN_CLI_OPTS
+    - mvn package -Plinux_64bit,install4j $MAVEN_CLI_OPTS
     - echo "Baue AppImage"
     - scripte/appimage.sh nightly
     - /skripte/deploy.sh nightly linux $CI_COMMIT_SHA
@@ -58,39 +58,39 @@ Build and Deploy nightly Linux:
 Build and Deploy nightly Linux ARM:
   stage: deploy-nightly-linarm
   script:
-    - mvn -B package -P!linux_64bit,linux_arm_64bit,install4j $MAVEN_CLI_OPTS
+    - mvn package -P!linux_64bit,linux_arm_64bit,install4j $MAVEN_CLI_OPTS
     - /skripte/deploy.sh nightly linux-aarch64 $CI_COMMIT_SHA
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "develop"'
 
 Build and Deploy nightly Windows:
   stage: deploy-nightly-win
   script:
-    - mvn -B package -P!linux_64bit,windows_64bit,install4j $MAVEN_CLI_OPTS
+    - mvn package -P!linux_64bit,windows_64bit,install4j $MAVEN_CLI_OPTS
     - /skripte/deploy.sh nightly win $CI_COMMIT_SHA
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "develop"'
 
 # Build and Deploy nightly Windows 32bit:
 #   stage: deploy-nightly-win32
 #   script:
-#     - mvn -B package -P!linux_64bit,windows_32bit,install4j $MAVEN_CLI_OPTS
+#     - mvn package -P!linux_64bit,windows_32bit,install4j $MAVEN_CLI_OPTS
 #     - /skripte/deploy.sh nightly win32 $CI_COMMIT_SHA
 #   rules:
 #     - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "develop"'
 
 Build and Deploy nightly Mac Intel:
   stage: deploy-nightly-mac
   script:
-    - mvn -B package -P!linux_64bit,mac_intel $MAVEN_CLI_OPTS
+    - mvn package -P!linux_64bit,mac_intel $MAVEN_CLI_OPTS
     - /skripte/deploy.sh nightly mac $CI_COMMIT_SHA
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "develop"'
 
 # Build and Deploy nightly Mac Apple Silicon:
 #   stage: deploy-nightly-mac-as
 #   script:
-#     - mvn -B package -P!linux_64bit,mac_apple_silicon $MAVEN_CLI_OPTS
+#     - mvn package -P!linux_64bit,mac_apple_silicon $MAVEN_CLI_OPTS
 #     - /skripte/deploy.sh nightly mac $CI_COMMIT_SHA
 #   rules:
 #     - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "develop"'
@@ -100,7 +100,7 @@ Build and Deploy nightly Mac Intel:
 Build and Deploy Linux:
   stage: deploy-lin
   script:
-    - mvn -B package -Plinux_64bit,install4j $MAVEN_CLI_OPTS
+    - mvn package -Plinux_64bit,install4j $MAVEN_CLI_OPTS
     - echo "Baue AppImage"
     - scripte/appimage.sh release
     - /skripte/deploy.sh release linux
@@ -110,23 +110,23 @@ Build and Deploy Linux:
 Build and Deploy Linux ARM:
   stage: deploy-linarm
   script:
-    - mvn -B package -P!linux_64bit,linux_arm_64bit,install4j $MAVEN_CLI_OPTS
+    - mvn package -P!linux_64bit,linux_arm_64bit,install4j $MAVEN_CLI_OPTS
     - /skripte/deploy.sh release linux-aarch64
   rules:
     - if: $CI_COMMIT_TAG
 
 Build and Deploy Windows:
   stage: deploy-win
   script:
-    - mvn -B package -P!linux_64bit,windows_64bit,install4j $MAVEN_CLI_OPTS
+    - mvn package -P!linux_64bit,windows_64bit,install4j $MAVEN_CLI_OPTS
     - /skripte/deploy.sh release win
   rules:
     - if: $CI_COMMIT_TAG
 
 # Build and Deploy Windows 32bit:
 #   stage: deploy-win32
 #   script:
-#     - mvn -B package -P!linux_64bit,windows_32bit,install4j $MAVEN_CLI_OPTS
+#     - mvn package -P!linux_64bit,windows_32bit,install4j $MAVEN_CLI_OPTS
 #     - /skripte/deploy.sh release win32
 #   rules:
 #     - if: $CI_COMMIT_TAG
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar