diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index f16bbefde..0bd519d39 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -10,7 +10,7 @@ on: required: false env: - JAVA_VERSION: 17 + JAVA_VERSION: 19 jobs: build: @@ -23,7 +23,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - id: versions diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 77a49ad1a..94c9ab037 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ on: types: [labeled] env: - JAVA_VERSION: 17 + JAVA_VERSION: 19 defaults: run: @@ -55,7 +55,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - name: Cache SonarCloud packages diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 687dd0834..500587444 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -15,24 +15,25 @@ on: required: false env: - JAVA_VERSION: 17 + JAVA_VERSION: 19 jobs: build: name: Build Debian Package - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 with: fetch-depth: 0 - name: Install build tools run: | + sudo add-apt-repository ppa:coffeelibs/openjdk sudo apt-get update - sudo apt-get install debhelper devscripts dput + sudo apt-get install debhelper devscripts dput coffeelibs-jdk-19 - name: Setup Java uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - id: versions diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index c617b1adb..b51430ee0 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -10,7 +10,7 @@ on: required: false env: - JAVA_VERSION: 17 + JAVA_VERSION: 19 jobs: build: @@ -35,7 +35,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} architecture: ${{ matrix.architecture }} cache: 'maven' diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 383fe9df7..48f7bd185 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -4,7 +4,7 @@ on: pull_request: env: - JAVA_VERSION: 17 + JAVA_VERSION: 19 defaults: run: @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - name: Build and Test diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 2e35b3902..46e1dbed1 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -10,7 +10,9 @@ on: required: false env: - JAVA_VERSION: 17 + JAVA_VERSION: 19 + JAVA_DIST: 'zulu' + JAVA_CACHE: 'maven' defaults: run: @@ -27,9 +29,9 @@ jobs: - name: Setup Java uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: ${{ env.JAVA_DIST }} java-version: ${{ env.JAVA_VERSION }} - cache: 'maven' + cache: ${{ env.JAVA_CACHE }} - id: versions name: Apply version information run: | @@ -212,9 +214,9 @@ jobs: run: mv dist/win/bundle/resources/Cryptomator*.msi dist/win/bundle/resources/Cryptomator.msi - uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: ${{ env.JAVA_DIST }} java-version: ${{ env.JAVA_VERSION }} - cache: 'maven' + cache: ${{ env.JAVA_CACHE }} - name: Generate license for exe run: > mvn -B license:add-third-party diff --git a/.idea/misc.xml b/.idea/misc.xml index 4731638fd..e5d629592 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/dist/linux/debian/changelog b/dist/linux/debian/changelog index 2c7606733..84a9756f9 100644 --- a/dist/linux/debian/changelog +++ b/dist/linux/debian/changelog @@ -1,4 +1,4 @@ -cryptomator (${PPA_VERSION}) bionic; urgency=low +cryptomator (${PPA_VERSION}) focal; urgency=low * Full changelog can be found on https://github.com/cryptomator/cryptomator/releases diff --git a/dist/linux/debian/control b/dist/linux/debian/control index ef06120b3..77aba901c 100644 --- a/dist/linux/debian/control +++ b/dist/linux/debian/control @@ -2,7 +2,7 @@ Source: cryptomator Maintainer: Cryptobot Section: utils Priority: optional -Build-Depends: debhelper (>=10), openjdk-17-jdk +Build-Depends: debhelper (>=10), coffeelibs-jdk-19 Standards-Version: 4.5.0 Homepage: https://cryptomator.org Vcs-Git: https://github.com/cryptomator/cryptomator.git diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules index b77e6f8f2..04c256f60 100755 --- a/dist/linux/debian/rules +++ b/dist/linux/debian/rules @@ -4,6 +4,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +JAVA_HOME = /usr/lib/jvm/java-19-coffeelibs + %: dh $@ @@ -16,7 +18,7 @@ override_dh_auto_clean: override_dh_auto_build: mkdir resources ln -s ../common/org.cryptomator.Cryptomator512.png resources/cryptomator.png - jlink \ + $(JAVA_HOME)/bin/jlink \ --output runtime \ --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr \ --strip-native-commands \ @@ -24,7 +26,7 @@ override_dh_auto_build: --no-man-pages \ --strip-debug \ --compress=2 - jpackage \ + $(JAVA_HOME)/bin/jpackage \ --type app-image \ --runtime-image runtime \ --input libs \ diff --git a/pom.xml b/pom.xml index 0eb618328..34170ea51 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ UTF-8 - 17 + 19 com.github.serceman,com.github.jnr,org.ow2.asm,net.java.dev.jna,org.apache.jackrabbit,org.apache.httpcomponents,de.swiesend,org.purejava,com.github.hypfvieh diff --git a/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java b/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java index 5a9f1bc07..7d76409e8 100644 --- a/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java +++ b/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java @@ -18,7 +18,7 @@ public class SupportedLanguagesTest { var locale = Locale.forLanguageTag(tag); Assertions.assertNotEquals("und", locale.toLanguageTag(), "Undefined language tag"); - var bundle = Assertions.assertDoesNotThrow(() -> ResourceBundle.getBundle("/i18n/strings", locale)); + var bundle = Assertions.assertDoesNotThrow(() -> ResourceBundle.getBundle("i18n.strings", locale)); Assertions.assertEquals(locale, bundle.getLocale()); Assertions.assertFalse(bundle.keySet().isEmpty());