Prepare for version 1.6.0

1 files changed, 34 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 89507ca92c1b..12b4fb148b01 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Sebastian Stenzel <sebastian.stenzel@gmail.com>
 
 pkgname=cryptomator
-pkgver=1.5.17
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="Multiplatform transparent client-side encryption of your files in the cloud."
 arch=('x86_64')
@@ -12,49 +12,63 @@ url="https://cryptomator.org/"
 license=('GPL3')
 depends=('fuse2' 'java-environment=16' 'alsa-lib' 'hicolor-icon-theme' 'libxtst' 'libnet' 'libxrender')
 makedepends=('maven')
-source=("cryptomator-${pkgver}::https://github.com/cryptomator/cryptomator/archive/refs/tags/${pkgver}.tar.gz"
+optdepends=('keepassxc-cryptomator: Use KeePassXC to store vault passwords')
+source=("cryptomator-${pkgver}.tar.gz::https://github.com/cryptomator/cryptomator/archive/refs/tags/${pkgver}.tar.gz"
+        "cryptomator-${pkgver}.tar.gz.asc::https://github.com/cryptomator/cryptomator/releases/download/${pkgver}/cryptomator-${pkgver}.tar.gz.asc"
         'org.cryptomator.Cryptomator.desktop'
         'org.cryptomator.Cryptomator.png'
         'org.cryptomator.Cryptomator.svg'
         'cryptomator-vault.xml')
-sha256sums=('222192184442d8f0d44bd277ea519111a78fbf61ea8baf8ded77ef65dee493aa'
+sha256sums=('SKIP'
+            'SKIP'
             '53c509fe54ef1c5c28b469d86291536649367fb2030b2c0fb3101da2031f8e6e'
             'd299636d78d093117fa7a26563f22e01cdb75b1fcc6cc279bc88627574c968bd'
             '0989ecc24ecd672c5c525ab6f1f0fb18a9eeca86ebec19738f512801c152f756'
             '78537ead26dcc1488d7fff02f47fce559f70f9bb2d7fa7fa1741ad3cd151bfad')
 options=('!strip')
 
+validpgpkeys=('58117AFA1F85B3EEC154677D615D449FE6E6A235')
+
 build() {
   cd "${srcdir}/cryptomator-${pkgver}"
-  mvn -B clean package -DskipTests --file main/pom.xml -Prelease,linux
+  mvn -B clean package -DskipTests -Plinux
+
+  cp LICENSE.txt target
+  cp dist/linux/launcher* target
+  cp target/cryptomator-*.jar target/mods
 
-  cd "main/buildkit/target/"
+  cd target
 
   jlink \
-    --output runtimeImage \
+    --output runtime \
+    --module-path jmod \
+    --add-modules java.base,java.desktop,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility \
     --no-header-files \
     --no-man-pages \
     --strip-debug \
-    --compress=2 \
-    --verbose \
-    --add-modules java.base,java.logging,java.xml,java.sql,java.management,java.security.sasl,java.naming,java.datatransfer,java.security.jgss,java.rmi,java.scripting,java.prefs,java.desktop,jdk.security.auth,jdk.unsupported,java.net.http,jdk.crypto.ec
+    --compress=1
 
   jpackage \
     --type app-image \
+    --runtime-image runtime \
     --input libs \
-    --main-jar "launcher-${pkgver}.jar" \
-    --main-class org.cryptomator.launcher.Cryptomator \
-    --runtime-image runtimeImage \
-    --app-version "${pkgver}" \
+    --module-path mods \
+    --module org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator \
+    --dest . \
+    --name cryptomator \
+    --vendor "Skymatic GmbH" \
+    --copyright "(C) 2016 - 2021 Skymatic GmbH" \
+    --java-options "-Xss5m" \
+    --java-options "-Xmx256m" \
+    --java-options "-Dfile.encoding=\"utf-8\"" \
     --java-options "-Dcryptomator.logDir=\"~/.local/share/Cryptomator/logs\"" \
+    --java-options "-Dcryptomator.pluginDir=\"~/.local/share/Cryptomator/plugins\"" \
     --java-options "-Dcryptomator.settingsPath=\"~/.config/Cryptomator/settings.json:~/.Cryptomator/settings.json\"" \
-    --java-options "-Dcryptomator.ipcPortPath=\"~/.config/Cryptomator/ipcPort.bin:~/.Cryptomator/ipcPort.bin\"" \
+    --java-options "-Dcryptomator.ipcSocketPath=\"~/.config/Cryptomator/ipc.socket\"" \
     --java-options "-Dcryptomator.mountPointsDir=\"~/.local/share/Cryptomator/mnt\"" \
-    --java-options "-Dcryptomator.buildNumber=\"ppa\"" \
-    --java-options "-Xss2m" \
-    --java-options "-Xmx512m" \
-    --name cryptomator \
-    --dest "${srcdir}/cryptomator-${pkgver}" \
+    --java-options "-Dcryptomator.showTrayIcon=false" \
+    --java-options "-Dcryptomator.buildNumber=\"aur-${pkgver}\"" \
+    --app-version "${pkgver}" \
     --verbose
 }
 
@@ -66,7 +80,7 @@ package() {
   install -Dm644 "${srcdir}/org.cryptomator.Cryptomator.svg" "${pkgdir}/usr/share/icons/hicolor/512x512/apps/org.cryptomator.Cryptomator.DirIcon"
 
   mkdir -p "${pkgdir}/opt/cryptomator/"
-  cp -R "${srcdir}/cryptomator-${pkgver}/cryptomator" ${pkgdir}/opt/
+  cp -R "${srcdir}/cryptomator-${pkgver}/target/cryptomator" ${pkgdir}/opt/
 
   mkdir -p "${pkgdir}/usr/bin"
   ln -s "/opt/cryptomator/bin/cryptomator" "${pkgdir}/usr/bin/cryptomator"