Merge branch 'release/14.0.0'

mediathekview · Jul 19, 2023 · 9105485 · 9105485
2 parents 9181657 + f93d1a3
commit 9105485
Show file tree

Hide file tree

Showing 356 changed files with 12,905 additions and 13,096 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,13 +7,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK 20
+        uses: actions/setup-java@v2
         with:
-          java-version: 17
+          distribution: 'zulu'
+          java-version: '20'
+          java-package: jdk
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -18,11 +18,11 @@ jobs:
         id: check-if-changed
         with:
           paths: .github/workflows src/ res/ pom.xml .install4j/ .mvn/
-      - name: Set up JDK 17
+      - name: Set up JDK 20
         if: steps.check-if-changed.outputs.changed == 'true'
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 20
 
       - name: Cache local Maven repository
         if: steps.check-if-changed.outputs.changed == 'true'
@@ -56,27 +56,27 @@ jobs:
         include:
           - os: linux
             architecture: 64bit
-            maven_profiles: "linux,64bit,install4j"
+            maven_profiles: "linux_64bit,install4j"
           - os: arm
-            architecture: 32bit
-            maven_profiles: "arm,!64bit,32bit,install4j,!linux"
-          - os: windows
             architecture: 64bit
-            maven_profiles: "windows,64bit,install4j,!linux"
+            maven_profiles: "!linux_64bit,linux_arm_64bit,install4j"
           - os: windows
-            architecture: 32bit
-            maven_profiles: "windows32,!64bit,32bit,install4j,!linux"
+            architecture: 64bit
+            maven_profiles: "!linux_64bit,windows_64bit,install4j"
+          # - os: windows
+          #   architecture: 32bit
+          #   maven_profiles: "windows32,!64bit,32bit,install4j,!linux"
           - os: macOS
             architecture: 64bit
-            maven_profiles: "mac,!linux"
+            maven_profiles: "!linux_64bit,mac_intel"
     steps:
       - uses: actions/checkout@v2
         with:
           ref: develop
-      - name: Set up JDK 17
+      - name: Set up JDK 20
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 20
       - uses: AdoptOpenJDK/install-jdk@v1
         with:
           version: '8'
@@ -85,7 +85,7 @@ jobs:
       - name: Download install4j
         uses: wei/curl@v1
         with:
-          args: -fsSL 'https://download-gcdn.ej-technologies.com/install4j/install4j_unix_9_0_5.tar.gz' --output install4j.tar.gz
+          args: -fsSL 'https://download-gcdn.ej-technologies.com/install4j/install4j_unix_9_0_7.tar.gz' --output install4j.tar.gz
       - name: Extract install4j
         run: tar -zxvf install4j.tar.gz
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,11 +19,11 @@ jobs:
         id: check-if-changed
         with:
           paths: .github/workflows src/ res/ pom.xml .install4j/ .mvn/
-      - name: Set up JDK 17
+      - name: Set up JDK 20
         if: steps.check-if-changed.outputs.changed == 'true'
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 20
 
       - name: Cache local Maven repository
         if: steps.check-if-changed.outputs.changed == 'true'
@@ -57,28 +57,28 @@ jobs:
         include:
           - os: linux
             architecture: 64bit
-            maven_profiles: "linux,64bit,install4j"
+            maven_profiles: "linux_64bit,install4j"
           - os: arm
-            architecture: 32bit
-            maven_profiles: "arm,!64bit,32bit,install4j,!linux"
-          - os: windows
             architecture: 64bit
-            maven_profiles: "windows,64bit,install4j,!linux"
+            maven_profiles: "!linux_64bit,linux_arm_64bit,install4j"
           - os: windows
-            architecture: 32bit
-            maven_profiles: "windows32,!64bit,32bit,install4j,!linux"
-          - os: macOS
             architecture: 64bit
-            maven_profiles: "mac,!linux"
+            maven_profiles: "!linux_64bit,windows_64bit,install4j"
+          # - os: windows
+          #   architecture: 32bit
+          #   maven_profiles: "windows32,!64bit,32bit,install4j,!linux"
+          # - os: macOS
+          #   architecture: 64bit
+          #   maven_profiles: "mac,!linux"
     steps:
       - uses: actions/checkout@v2
         with:
           ref: develop
-      - name: Set up JDK 17
+      - name: Set up JDK 20
         uses: actions/setup-java@v2
         with:
-          distribution: 'temurin'
-          java-version: '16'
+          #distribution: 'temurin'
+          java-version: '20'
       - uses: AdoptOpenJDK/install-jdk@v1
         with:
           version: '8'
@@ -87,7 +87,7 @@ jobs:
       - name: Download install4j
         uses: wei/curl@v1
         with:
-          args: -fsSL 'https://download-gcdn.ej-technologies.com/install4j/install4j_unix_9_0_5.tar.gz' --output install4j.tar.gz
+          args: -fsSL 'https://download-gcdn.ej-technologies.com/install4j/install4j_unix_9_0_7.tar.gz' --output install4j.tar.gz
       - name: Extract install4j
         run: tar -zxvf install4j.tar.gz
 
@@ -125,10 +125,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: develop
-      - name: Set up JDK 17
+      - name: Set up JDK 20
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 20
       - name: Get version
         run: echo "VERSION=$( ./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout )" >> $GITHUB_ENV
       - uses: actions/download-artifact@v2

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ variables:
   MAVEN_OPTS: "-Djava.awt.headless=true -Dmaven.repo.local=./.m2/repository"
   MAVEN_CLI_OPTS: "-B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
 
-image: maven:3.8-eclipse-temurin-17
+image: maven:3.9-eclipse-temurin-20
 
 
 cache:
@@ -15,32 +15,35 @@ default:
     - mvrunner1
   before_script:
     - apt-get update -qq
-    - apt-get install -y -qq openjdk-11-jre-headless ssh lib32ncurses6 lib32z1 wget tar file gnupg2 > /dev/null
+    - apt-get install -y -qq openjdk-11-jre-headless ssh lib32ncurses6 lib32z1 wget tar file gnupg2 git-lfs > /dev/null
     - source /private/ENVS
     - whoami
     - mkdir ~/.ssh
     - ssh-keyscan -p 60002 dw2.mvorg.de >> ~/.ssh/known_hosts
     - ssh-keyscan -p 60002 148.251.176.136 >> ~/.ssh/known_hosts
     - chmod 644 ~/.ssh/known_hosts
-    - wget -q https://download-gcdn.ej-technologies.com/install4j/install4j_unix_9_0_5.tar.gz
-    - tar -zxf install4j_unix_9_0_5.tar.gz
+    - wget -q https://download-gcdn.ej-technologies.com/install4j/install4j_unix_10_0_5.tar.gz -O install4j.tar.gz
+    - tar -zxf install4j.tar.gz
     - java -version
     - ${INSTALL4J_JAVA_HOME}/bin/java -version
     - mvn -v
     - mvn clean
     - mvn install4j:install-license -Pinstall4j
+    - git clone https://gitlab.com/mediathekview/mediathekview-buildres.git tmpres
+    - mv tmpres/bin res/
+    - rm -rf tmpres
 
 stages:
   - deploy-nightly-lin
   - deploy-nightly-linarm
   - deploy-nightly-win
-  - deploy-nightly-win32
+  # - deploy-nightly-win32
   - deploy-nightly-mac
   # - deploy-nightly-mac-as
   - deploy-lin
   - deploy-linarm
   - deploy-win
-  - deploy-win32
+  # - deploy-win32
 
 Build and Deploy nightly Linux:
   stage: deploy-nightly-lin
@@ -56,7 +59,7 @@ Build and Deploy nightly Linux ARM:
   stage: deploy-nightly-linarm
   script:
     - mvn -B package -P!linux_64bit,linux_arm_64bit,install4j $MAVEN_CLI_OPTS
-    - /skripte/deploy.sh nightly linux-armhf $CI_COMMIT_SHA
+    - /skripte/deploy.sh nightly linux-aarch64 $CI_COMMIT_SHA
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "develop"'
 
@@ -68,13 +71,13 @@ Build and Deploy nightly Windows:
   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
-    - /skripte/deploy.sh nightly win32 $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
+#     - /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
@@ -108,7 +111,7 @@ Build and Deploy Linux ARM:
   stage: deploy-linarm
   script:
     - mvn -B package -P!linux_64bit,linux_arm_64bit,install4j $MAVEN_CLI_OPTS
-    - /skripte/deploy.sh release linux-armhf
+    - /skripte/deploy.sh release linux-aarch64
   rules:
     - if: $CI_COMMIT_TAG
 
@@ -120,10 +123,10 @@ Build and Deploy Windows:
   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
-    - /skripte/deploy.sh release win32
-  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
+#     - /skripte/deploy.sh release win32
+#   rules:
+#     - if: $CI_COMMIT_TAG
diff --git a/.install4j/mediathekview_arm.install4j b/.install4j/mediathekview_arm.install4j
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="9.0.5" transformSequenceNumber="9">
+<install4j version="${install4j.version}" transformSequenceNumber="9">
   <directoryPresets config="${project.basedir}/.install4j" />
-  <application name="MediathekView" applicationId="1927-5045-2127-3394" mediaDir="target" mediaFilePattern="${compiler:sys.shortName}-${compiler:sys.version}-linux-armhf" shortName="MediathekView" publisher="MediathekView Team" publisherWeb="https://mediathekview.de" version="${project.version}" convertDotsToUnderscores="false" macVolumeId="d594baf3c2b3424d" javaMinVersion="${install4j.jdk.min-version}">
+  <application name="MediathekView" applicationId="1927-5045-2127-3394" mediaDir="target" mediaFilePattern="${compiler:sys.shortName}-${compiler:sys.version}-linux-aarch64" shortName="MediathekView" publisher="MediathekView Team" publisherWeb="https://mediathekview.de" version="${project.version}" convertDotsToUnderscores="false" macVolumeId="d594baf3c2b3424d" javaMinVersion="${install4j.jdk.min-version}">
     <languages>
       <principalLanguage id="de" />
     </languages>
-    <jreBundles jdkProviderId="Liberica" release="${install4j.liberica.jdk.version}">
+    <jreBundles jdkProviderId="Zulu" release="${install4j.zulu.jdk.version}">
       <modules>
         <defaultModules set="all" />
       </modules>
@@ -33,7 +33,7 @@
   <launchers>
     <launcher name="mediathekview_arm" id="323" menuName="MediathekView">
       <executable name="MediathekView" iconSet="true" executableMode="gui" singleInstance="true" />
-      <java mainClass="mediathek.Main" vmParameters="${install4j.vmparameters.linux.32}">
+      <java mainClass="mediathek.Main" vmParameters="${install4j.vmparameters.linux.64}">
         <classPath>
           <archive location="MediathekView.jar" failOnError="false" />
         </classPath>
@@ -48,7 +48,7 @@
     </launcher>
     <launcher name="MediathekView_Portable" id="61" excludeFromMenu="true">
       <executable name="MediathekView_Portable" iconSet="true" executableMode="gui" />
-      <java mainClass="mediathek.Main" vmParameters="${install4j.vmparameters.linux.32}" arguments="Einstellungen/.mediathek3">
+      <java mainClass="mediathek.Main" vmParameters="${install4j.vmparameters.linux.64}" arguments="Einstellungen/.mediathek3">
         <classPath>
           <archive location="MediathekView.jar" failOnError="false" />
         </classPath>
@@ -61,7 +61,7 @@
       </iconImageFiles>
     </launcher>
   </launchers>
-  <installerGui autoUpdateDescriptorUrl="https://download.mediathekview.de/stabil/updates-linux-armhf.xml" useAutoUpdateBaseUrl="true" autoUpdateBaseUrl="https://download.mediathekview.de/stabil/">
+  <installerGui autoUpdateDescriptorUrl="https://download.mediathekview.de/stabil/updates-linux-aarch64.xml" useAutoUpdateBaseUrl="true" autoUpdateBaseUrl="https://download.mediathekview.de/stabil/">
     <applications>
       <application id="installer" beanClass="com.install4j.runtime.beans.applications.InstallerApplication">
         <startup>
@@ -1004,22 +1004,22 @@ return true;</property>
     </styles>
   </installerGui>
   <mediaSets>
-    <unixInstaller name="Unix Installer ARM32" id="161">
-      <jreBundle platform="linux-arm32-vfp-hflt">
+    <unixInstaller name="Unix Installer ARM64" id="161">
+      <jreBundle platform="linux-aarch64">
         <modules>
           <defaultModules set="all" />
         </modules>
       </jreBundle>
     </unixInstaller>
-    <linuxDeb name="Linux Deb Archive ARM32" id="164" maintainerEmail="[email protected]" architectureSet="true" architecture="armhf">
-      <jreBundle platform="linux-arm32-vfp-hflt">
+    <linuxDeb name="Linux Deb Archive ARM64" id="164" maintainerEmail="[email protected]" architectureSet="true" architecture="aarch64">
+      <jreBundle platform="linux-aarch64">
         <modules>
           <defaultModules set="all" />
         </modules>
       </jreBundle>
     </linuxDeb>
-    <unixArchive name="Unix Archive ARM32" id="679">
-      <jreBundle platform="linux-arm32-vfp-hflt">
+    <unixArchive name="Unix Archive ARM64" id="679">
+      <jreBundle platform="linux-aarch64">
         <modules>
           <defaultModules set="all" />
         </modules>