Merge branch 'develop' into release/1.6.0

[ci skip]

.github/workflows/release.yml

@@ -590,11 +590,12 @@ jobs:
         env:
           GPG_PRIVATE_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
           GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
-      - id: checksums
-        name: Compute SHA256 checksums of release artifacts
+      - name: Compute SHA256 checksums of release artifacts
         run: |
           SHA256_SUMS=`find . -name "*.AppImage" -o -name "*.dmg" -o -name "*.msi" -name "*.tar.gz" | xargs sha256sum`
-          echo "::set-output name=SHA256_SUMS::${SHA256_SUMS}"
+          echo "SHA256_SUMS<<EOF" >> $GITHUB_ENV
+          echo "${SHA256_SUMS}" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
         continue-on-error: true
       - name: Create release draft
         uses: softprops/action-gh-release@v1
@@ -618,4 +619,4 @@ jobs:
             :scroll: A complete list of closed issues is available [here](LINK)
             ---
             Checksums of release artifacts:
-            ${{ steps.checksums.outputs.SHA256_SUMS }}"
+            ${{ env.SHA256_SUMS }}"

dist/linux/appimage/resources/AppDir/bin/cryptomator.sh

@@ -28,7 +28,7 @@ export LD_PRELOAD=lib/app/libjffi.so
 	-cp "lib/app/*" \
 	-Dfile.encoding="utf-8" \
 	-Dcryptomator.logDir="~/.local/share/Cryptomator/logs" \
-	-Dcryptomator.pluginDir="~/.local/share/Cryptomator/plugins"
+	-Dcryptomator.pluginDir="~/.local/share/Cryptomator/plugins" \
 	-Dcryptomator.mountPointsDir="~/.local/share/Cryptomator/mnt" \
 	-Dcryptomator.settingsPath="~/.config/Cryptomator/settings.json:~/.Cryptomator/settings.json" \
 	-Dcryptomator.ipcSocketPath="~/.config/Cryptomator/ipc.socket" \

dist/mac/dmg/.gitignore

@@ -0,0 +1,3 @@
+# created during build
+runtime/
+*.app/

dist/mac/dmg/build.sh

@@ -0,0 +1,96 @@
+#!/bin/bash
+
+# parse options
+usage() { echo "Usage: $0 [-s <codesign-identity>]" 1>&2; exit 1; }
+while getopts ":s:" o; do
+    case "${o}" in
+        s)
+            CODESIGN_IDENTITY=${OPTARG}
+            ;;
+        *)
+            usage
+            ;;
+    esac
+done
+shift "$((OPTIND-1))"
+
+# prepare working dir and variables
+cd $(dirname $0)
+rm -rf runtime *.app
+REVISION_NO=`git rev-list --count HEAD`
+VERSION_NO=`mvn -f../../../pom.xml help:evaluate -Dexpression=project.version -q -DforceStdout | sed -rn 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/p'`
+
+# check preconditions
+if [ -z "${JAVA_HOME}" ]; then echo "JAVA_HOME not set. Run using JAVA_HOME=/path/to/jdk ./build.sh"; exit 1; fi
+command -v mvn >/dev/null 2>&1 || { echo >&2 "mvn not found."; exit 1; }
+if [ -n "${CODESIGN_IDENTITY}" ]; then
+    command -v codesign >/dev/null 2>&1 || { echo >&2 "codesign not found. Fix by 'xcode-select --install'."; exit 1; }
+    if [[ ! `security find-identity -v -p codesigning | grep -w "${CODESIGN_IDENTITY}"` ]]; then echo "Given codesign identity is invalid."; exit 1; fi
+fi
+
+# compile
+mvn -B -f../../../pom.xml clean package -DskipTests -Pmac
+cp ../../../target/cryptomator-*.jar ../../../target/mods
+
+# add runtime
+${JAVA_HOME}/bin/jlink \
+    --output runtime \
+    --module-path "${JAVA_HOME}/jmods" \
+    --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=1
+
+# create app dir
+${JAVA_HOME}/bin/jpackage \
+    --verbose \
+    --type app-image \
+    --runtime-image runtime \
+    --input ../../../target/libs \
+    --module-path ../../../target/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 "-Dcryptomator.appVersion=\"${VERSION_NO}\"" \
+    --app-version "${VERSION_NO}" \
+    --java-options "-Dfile.encoding=\"utf-8\"" \
+    --java-options "-Dcryptomator.logDir=\"~/Library/Logs/Cryptomator\"" \
+    --java-options "-Dcryptomator.pluginDir=\"~/Library/Application Support/Cryptomator/Plugins\"" \
+    --java-options "-Dcryptomator.settingsPath=\"~/Library/Application Support/Cryptomator/settings.json\"" \
+    --java-options "-Dcryptomator.ipcSocketPath=\"~/Library/Application Support/Cryptomator/ipc.socket\"" \
+    --java-options "-Dcryptomator.showTrayIcon=true" \
+    --java-options "-Dcryptomator.buildNumber=\"dmg-${REVISION_NO}\"" \
+    --mac-package-identifier org.cryptomator \
+    --resource-dir ../resources
+
+# transform app dir
+cp ../resources/Cryptomator-Vault.icns Cryptomator.app/Contents/Resources/
+sed -i '' "s|###BUNDLE_SHORT_VERSION_STRING###|${VERSION_NO}|g" Cryptomator.app/Contents/Info.plist
+sed -i '' "s|###BUNDLE_VERSION###|${REVISION_NO}|g" Cryptomator.app/Contents/Info.plist
+
+# codesign
+if [ -n "${CODESIGN_IDENTITY}" ]; then
+    find Cryptomator.app/Contents/runtime/Contents/MacOS -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
+    for JAR_PATH in `find Cryptomator.app -name "*.jar"`; do
+    if [[ `unzip -l ${JAR_PATH} | grep '.dylib\|.jnilib'` ]]; then
+        JAR_FILENAME=$(basename ${JAR_PATH})
+        OUTPUT_PATH=${JAR_PATH%.*}
+        echo "Codesigning libs in ${JAR_FILENAME}..."
+        unzip -q ${JAR_PATH} -d ${OUTPUT_PATH}
+        find ${OUTPUT_PATH} -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
+        find ${OUTPUT_PATH} -name '*.jnilib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
+        rm ${JAR_PATH}
+        pushd ${OUTPUT_PATH} > /dev/null
+        zip -qr ../${JAR_FILENAME} *
+        popd > /dev/null
+        rm -r ${OUTPUT_PATH}
+    fi
+    done
+    echo "Codesigning Cryptomator.app..."
+    codesign --force --deep --entitlements ../Cryptomator.entitlements -o runtime -s ${CODESIGN_IDENTITY} Cryptomator.app
+fi

pom.xml

@@ -31,7 +31,7 @@
 		<cryptomator.integrations.version>1.0.0</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>1.0.0-rc1</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>1.0.0-rc1</cryptomator.integrations.mac.version>
-		<cryptomator.integrations.linux.version>1.0.0-rc1</cryptomator.integrations.linux.version>
+		<cryptomator.integrations.linux.version>1.0.0-rc2</cryptomator.integrations.linux.version>
 		<cryptomator.fuse.version>1.3.2</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.3.3</cryptomator.dokany.version>
 		<cryptomator.webdav.version>1.2.6</cryptomator.webdav.version>