@@ -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
@@ -6,7 +6,7 @@ on:
types: [labeled]
defaults:
run:
@@ -55,7 +55,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- name: Cache SonarCloud packages
@@ -15,24 +15,25 @@ on:
name: Build Debian Package
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
steps:
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
@@ -35,7 +35,7 @@ jobs:
architecture: ${{ matrix.architecture }}
@@ -4,7 +4,7 @@ on:
pull_request:
@@ -19,7 +19,7 @@ jobs:
- name: Build and Test
@@ -10,7 +10,9 @@ on:
+ JAVA_DIST: 'zulu'
+ JAVA_CACHE: 'maven'
@@ -27,9 +29,9 @@ jobs:
+ distribution: ${{ env.JAVA_DIST }}
- cache: 'maven'
+ cache: ${{ env.JAVA_CACHE }}
name: Apply version information
@@ -212,9 +214,9 @@ jobs:
run: mv dist/win/bundle/resources/Cryptomator*.msi dist/win/bundle/resources/Cryptomator.msi
- name: Generate license for exe
run: >
mvn -B license:add-third-party
@@ -8,7 +8,7 @@
</list>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_19" default="true" project-jdk-name="19" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</project>
@@ -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
@@ -2,7 +2,7 @@ Source: cryptomator
Maintainer: Cryptobot <releases@cryptomator.org>
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
@@ -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 \
@@ -21,7 +21,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.jdk.version>17</project.jdk.version>
+ <project.jdk.version>19</project.jdk.version>
<!-- Group IDs of jars that need to stay on the class path for now -->
<nonModularGroupIds>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</nonModularGroupIds>
@@ -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());