Merge branch 'release/1.6.1'

Preparing 1.6.1
fixes #1843
2026-05-16 01:31:28 +00:00 · 2021-10-20 13:40:49 +02:00 · 2021-10-20 13:39:20 +02:00 · 2021-10-20 12:46:37 +02:00 · 2021-10-19 22:05:59 +02:00 · 2021-10-19 19:12:53 +02:00
5 changed files with 100 additions and 83 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -534,6 +534,9 @@ jobs:
          --app-version "${{ needs.metadata.outputs.semVerNum }}"
          --win-menu
          --win-dir-chooser
+          --win-shortcut-prompt
+          --win-update-url "https:\\cryptomator.org"
+          --win-menu-group Cryptomator
          --resource-dir dist/win/resources
          --license-file dist/win/resources/license.rtf
          --file-associations dist/win/resources/FAvaultFile.properties
@@ -549,7 +552,7 @@ jobs:
          timestampUrl: 'http://timestamp.digicert.com'
          folder: installer
      - name: Add possible alpha/beta tags to installer name
-        run: mv installer/Cryptomator-*.msi installer/Cryptomator-${{ needs.metadata.outputs.semVerStr }}.msi
+        run: mv installer/Cryptomator-*.msi installer/Cryptomator-${{ needs.metadata.outputs.semVerStr }}-x64.msi
      - name: Upload win-msi
        uses: actions/upload-artifact@v2
        with:
--- a/dist/linux/appimage/build.sh
+++ b/dist/linux/appimage/build.sh
@@ -8,8 +8,11 @@ if [ -z "${JAVA_HOME}" ]; then echo "JAVA_HOME not set. Run using JAVA_HOME=/pat
 command -v mvn >/dev/null 2>&1 || { echo >&2 "mvn not found."; exit 1; }
 command -v curl >/dev/null 2>&1 || { echo >&2 "curl not found."; exit 1; }

+VERSION=$(mvn -f ../../../pom.xml help:evaluate -Dexpression=project.version -q -DforceStdout)
+
 # compile
-mvn -B -f../../pom.xml clean package -DskipTests -Plinux
+mvn -B -f ../../../pom.xml clean package -DskipTests -Plinux
+cp ../../../target/cryptomator-*.jar ../../../target/mods

 # add runtime
 ${JAVA_HOME}/bin/jlink \
@@ -26,8 +29,8 @@ ${JAVA_HOME}/bin/jpackage \
    --verbose \
    --type app-image \
    --runtime-image runtime \
-    --input buildkit/libs \
-    --module-path buildkit/mods \
+    --input ../../../target/libs \
+    --module-path ../../../target/mods \
    --module org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator \
    --dest . \
    --name Cryptomator \
@@ -35,19 +38,19 @@ ${JAVA_HOME}/bin/jpackage \
    --copyright "(C) 2016 - 2021 Skymatic GmbH" \
    --java-options "-Xss5m" \
    --java-options "-Xmx256m" \
-    --app-version "${{ needs.metadata.outputs.versionNum }}.${{ needs.metadata.outputs.revNum }}" \
+    --app-version "${VERSION}.${REVISION_NO}" \
    --java-options "-Dfile.encoding=\"utf-8\"" \
    --java-options "-Dcryptomator.logDir=\"~/.local/share/Cryptomator/logs\"" \
    --java-options "-Dcryptomator.settingsPath=\"~/.config/Cryptomator/settings.json:~/.Cryptomator/settings.json\"" \
    --java-options "-Dcryptomator.ipcSocketPath=\"~/.config/Cryptomator/ipc.socket\"" \
    --java-options "-Dcryptomator.mountPointsDir=\"~/.local/share/Cryptomator/mnt\"" \
    --java-options "-Dcryptomator.showTrayIcon=false" \
-    --java-options "-Dcryptomator.buildNumber=\"appimage-${{ needs.metadata.outputs.revNum }}\"" \
+    --java-options "-Dcryptomator.buildNumber=\"appimage-${REVISION_NO}\"" \
    --resource-dir ../resources

 # transform AppDir
 mv Cryptomator Cryptomator.AppDir
-cp -r dist/linux/appimage/resources/AppDir/* Cryptomator.AppDir/
+cp -r resources/AppDir/* Cryptomator.AppDir/
 chmod +x Cryptomator.AppDir/lib/runtime/bin/java
 envsubst '${REVISION_NO}' < resources/AppDir/bin/cryptomator.sh > Cryptomator.AppDir/bin/cryptomator.sh
 ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/org.cryptomator.Cryptomator.svg
@@ -70,4 +73,4 @@ chmod +x /tmp/appimagetool.AppImage
 /tmp/appimagetool.AppImage \
    Cryptomator.AppDir \
    cryptomator-SNAPSHOT-x86_64.AppImage \
-    -u 'gh-releases-zsync|cryptomator|cryptomator|latest|cryptomator-*-x86_64.AppImage.zsync'
+    -u 'gh-releases-zsync|cryptomator|cryptomator|latest|cryptomator-*-x86_64.AppImage.zsync'
--- a/dist/win/resources/main.wxs
+++ b/dist/win/resources/main.wxs
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Cryptomator's Jpackage Wix installer file 
-    
-    Remark: Expressions like $(var.name) are preprocessor variables, see also https://wixtoolset.org/documentation/manual/v3/overview/preprocessor.html
-->
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-  xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">

  <?ifdef JpIsSystemWide ?>
-  <?define JpInstallScope="perMachine"?>
+    <?define JpInstallScope="perMachine"?>
  <?else?>
-  <?define JpInstallScope="perUser"?>
+    <?define JpInstallScope="perUser"?>
  <?endif?>

  <?define JpProductLanguage=1033 ?>
@@ -17,27 +13,49 @@
  <?define JpCompressedMsi=yes ?>

  <?ifdef JpAllowUpgrades ?>
-  <?define JpUpgradeVersionOnlyDetectUpgrade="no"?>
+    <?define JpUpgradeVersionOnlyDetectUpgrade="no"?>
  <?else?>
-  <?define JpUpgradeVersionOnlyDetectUpgrade="yes"?>
+    <?define JpUpgradeVersionOnlyDetectUpgrade="yes"?>
  <?endif?>
  <?ifdef JpAllowDowngrades ?>
-  <?define JpUpgradeVersionOnlyDetectDowngrade="no"?>
+    <?define JpUpgradeVersionOnlyDetectDowngrade="no"?>
  <?else?>
-  <?define JpUpgradeVersionOnlyDetectDowngrade="yes"?>
+    <?define JpUpgradeVersionOnlyDetectDowngrade="yes"?>
  <?endif?>

  <?include $(var.JpConfigDir)/overrides.wxi ?>

-  <Product Id="$(var.JpProductCode)" Name="$(var.JpAppName)" Language="$(var.JpProductLanguage)" Version="$(var.JpAppVersion)" Manufacturer="$(var.JpAppVendor)" UpgradeCode="$(var.JpProductUpgradeCode)">
+  <Product
+    Id="$(var.JpProductCode)"
+    Name="$(var.JpAppName)"
+    Language="$(var.JpProductLanguage)"
+    Version="$(var.JpAppVersion)"
+    Manufacturer="$(var.JpAppVendor)"
+    UpgradeCode="$(var.JpProductUpgradeCode)">

-    <Package Description="$(var.JpAppDescription)" Manufacturer="$(var.JpAppVendor)" InstallerVersion="$(var.JpInstallerVersion)" Compressed="$(var.JpCompressedMsi)" InstallScope="$(var.JpInstallScope)" Platform="x64" />
+    <Package
+      Description="$(var.JpAppDescription)"
+      Manufacturer="$(var.JpAppVendor)"
+      InstallerVersion="$(var.JpInstallerVersion)"
+      Compressed="$(var.JpCompressedMsi)"
+      InstallScope="$(var.JpInstallScope)" Platform="x64"
+    />

    <Media Id="1" Cabinet="Data.cab" EmbedCab="yes" />

    <Upgrade Id="$(var.JpProductUpgradeCode)">
-      <UpgradeVersion OnlyDetect="$(var.JpUpgradeVersionOnlyDetectUpgrade)" Property="JP_UPGRADABLE_FOUND" Maximum="$(var.JpAppVersion)" MigrateFeatures="yes" IncludeMaximum="$(var.JpUpgradeVersionOnlyDetectUpgrade)" />
-      <UpgradeVersion OnlyDetect="$(var.JpUpgradeVersionOnlyDetectDowngrade)" Property="JP_DOWNGRADABLE_FOUND" Minimum="$(var.JpAppVersion)" MigrateFeatures="yes" IncludeMinimum="$(var.JpUpgradeVersionOnlyDetectDowngrade)" />
+      <UpgradeVersion
+        OnlyDetect="$(var.JpUpgradeVersionOnlyDetectUpgrade)"
+        Property="JP_UPGRADABLE_FOUND"
+        Maximum="$(var.JpAppVersion)"
+        MigrateFeatures="yes"
+        IncludeMaximum="$(var.JpUpgradeVersionOnlyDetectUpgrade)" />
+      <UpgradeVersion
+        OnlyDetect="$(var.JpUpgradeVersionOnlyDetectDowngrade)"
+        Property="JP_DOWNGRADABLE_FOUND"
+        Minimum="$(var.JpAppVersion)"
+        MigrateFeatures="yes"
+        IncludeMinimum="$(var.JpUpgradeVersionOnlyDetectDowngrade)" />
    </Upgrade>

    <?ifndef JpAllowUpgrades ?>
@@ -47,6 +65,7 @@
    <CustomAction Id="JpDisallowDowngrade" Error="!(loc.DowngradeErrorMessage)" />
    <?endif?>

+
    <!-- Looking for legacy Cryptomator versions-->
    <Property Id="OLDEXEINSTALLER">
      <RegistrySearch Id="InnoSetupInstallation" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Cryptomator_is1" Type="raw" Name="DisplayName" />
@@ -57,9 +76,6 @@
        <![CDATA[Installed OR NOT OLDEXEINSTALLER]]>
    </Condition>

-    <!-- Standard required root -->
-    <Directory Id="TARGETDIR" Name="SourceDir"/>
-
    <!-- Non-Opening ProgID -->
    <DirectoryRef Id="INSTALLDIR">
        <Component Win64="yes" Id="nonStartingProgID" >
@@ -73,6 +89,9 @@
        </Component>
    </DirectoryRef>

+    <!-- Standard required root -->
+    <Directory Id="TARGETDIR" Name="SourceDir"/>
+
    <Feature Id="DefaultFeature" Title="!(loc.MainFeatureTitle)" Level="1">
      <ComponentGroupRef Id="Shortcuts"/>
      <ComponentGroupRef Id="Files"/>
@@ -81,68 +100,45 @@
      <ComponentRef Id="nonStartingProgID" />
    </Feature>

-    <?ifdef JpInstallDirChooser ?>
-    <Binary Id="JpCaDll" SourceFile="wixhelper.dll"/>
-    <CustomAction Id="JpCheckInstallDir" BinaryKey="JpCaDll" DllEntry="CheckInstallDir" />
+    <CustomAction Id="JpSetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
+    <CustomAction Id="JpSetARPCOMMENTS" Property="ARPCOMMENTS" Value="$(var.JpAppDescription)" />
+    <CustomAction Id="JpSetARPCONTACT" Property="ARPCONTACT" Value="$(var.JpAppVendor)" />
+    <CustomAction Id="JpSetARPSIZE" Property="ARPSIZE" Value="$(var.JpAppSizeKb)" />
+
+    <?ifdef JpHelpURL ?>
+      <CustomAction Id="JpSetARPHELPLINK" Property="ARPHELPLINK" Value="$(var.JpHelpURL)" />
    <?endif?>

-    <CustomAction Id="JpSetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
+    <?ifdef JpAboutURL ?>
+      <CustomAction Id="JpSetARPURLINFOABOUT" Property="ARPURLINFOABOUT" Value="$(var.JpAboutURL)" />
+    <?endif?>
+
+    <?ifdef JpUpdateURL ?>
+      <CustomAction Id="JpSetARPURLUPDATEINFO" Property="ARPURLUPDATEINFO" Value="$(var.JpUpdateURL)" />
+    <?endif?>

    <?ifdef JpIcon ?>
    <Property Id="ARPPRODUCTICON" Value="JpARPPRODUCTICON"/>
    <Icon Id="JpARPPRODUCTICON" SourceFile="$(var.JpIcon)"/>
    <?endif?>

-    <UI>
-      <?ifdef JpInstallDirChooser ?>
-      <Dialog Id="JpInvalidInstallDir" Width="300" Height="85" Title="[ProductName] Setup" NoMinimize="yes">
-        <Control Id="JpInvalidInstallDirYes" Type="PushButton" X="100" Y="55" Width="50" Height="15" Default="no" Cancel="no" Text="Yes">
-          <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-        </Control>
-        <Control Id="JpInvalidInstallDirNo" Type="PushButton" X="150" Y="55" Width="50" Height="15" Default="yes" Cancel="yes" Text="No">
-          <Publish Event="NewDialog" Value="InstallDirDlg">1</Publish>
-        </Control>
-        <Control Id="Text" Type="Text" X="25" Y="15" Width="250" Height="30" TabSkip="no">
-          <Text>!(loc.message.install.dir.exist)</Text>
-        </Control>
-      </Dialog>
-
-      <!--
-        Run our custom wizard in the default install directory.
-      -->
-      <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>
-      <!-- included at the end -->
-      <UIRef Id="CustomWizard" />
-
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="JpCheckInstallDir" Order="3">1</Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="JpInvalidInstallDir" Order="5">INSTALLDIR_VALID="0"</Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="5">INSTALLDIR_VALID="1"</Publish>
-
-      <?ifndef JpLicenseRtf ?>
-      <!--
-        No license file provided.
-        Override the dialog sequence in built-in dialog set "WixUI_InstallDir"
-        to exclude license dialog.
-      -->
-      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2">1</Publish>
-      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">1</Publish>
-      <?endif?>
-
-      <?else?>
-
-      <?ifdef JpLicenseRtf ?>
-      <UIRef Id="WixUI_Minimal" />
-      <?endif?>
-
-      <?endif?>
-    </UI>
-
-    <?ifdef JpLicenseRtf ?>
-    <WixVariable Id="WixUILicenseRtf" Value="$(var.JpLicenseRtf)"/>
-    <?endif?>
+    <UIRef Id="JpUI"/>

    <InstallExecuteSequence>
      <Custom Action="JpSetARPINSTALLLOCATION" After="CostFinalize">Not Installed</Custom>
+      <Custom Action="JpSetARPCOMMENTS" After="CostFinalize">Not Installed</Custom>
+      <Custom Action="JpSetARPCONTACT" After="CostFinalize">Not Installed</Custom>
+      <Custom Action="JpSetARPSIZE" After="CostFinalize">Not Installed</Custom>
+      <?ifdef JpHelpURL ?>
+        <Custom Action="JpSetARPHELPLINK" After="CostFinalize">Not Installed</Custom>
+      <?endif?>
+      <?ifdef JpAboutURL ?>
+        <Custom Action="JpSetARPURLINFOABOUT" After="CostFinalize">Not Installed</Custom>
+      <?endif?>
+      <?ifdef JpUpdateURL ?>
+        <Custom Action="JpSetARPURLUPDATEINFO" After="CostFinalize">Not Installed</Custom>
+      <?endif?>
+
      <?ifndef JpAllowUpgrades ?>
      <Custom Action="JpDisallowUpgrade" After="FindRelatedProducts">JP_UPGRADABLE_FOUND</Custom>
      <?endif?>
@@ -156,5 +152,4 @@
    <WixVariable Id="WixUIDialogBmp" Value="$(env.JP_WIXWIZARD_RESOURCES)\background.bmp" />
  </Product>

-  <?include $(env.JP_WIXWIZARD_RESOURCES)\customWizard.wxi ?>
 </Wix>
--- a/dist/win/resources/ui.wxf
+++ b/dist/win/resources/ui.wxf
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+  <Fragment>
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
+    <WixVariable Id="WixUILicenseRtf" Value="$(var.JpLicenseRtf)"></WixVariable>
+    <UI Id="JpUI">
+      <UIRef Id="CustomWizard" />
+      <DialogRef Id="InstallDirNotEmptyDlg"></DialogRef>
+      <Publish Dialog="ShortcutPromptDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg">1</Publish>
+      <Publish Dialog="ShortcutPromptDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ShortcutPromptDlg" Order="6">NOT Installed</Publish>
+      <UIRef Id="CustomWizard" />
+    </UI>
+  </Fragment>
+  <?include $(env.JP_WIXWIZARD_RESOURCES)\customWizard.wxi ?>
+</Wix>
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>cryptomator</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
+	<version>1.6.1</version>
 	<name>Cryptomator Desktop App</name>

 	<organization>
@@ -27,11 +27,11 @@
 		<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>

 		<!-- cryptomator dependencies -->
-		<cryptomator.cryptofs.version>2.1.0-beta13</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>2.1.1</cryptomator.cryptofs.version>
 		<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-rc2</cryptomator.integrations.linux.version>
+		<cryptomator.integrations.win.version>1.0.0</cryptomator.integrations.win.version>
+		<cryptomator.integrations.mac.version>1.0.0</cryptomator.integrations.mac.version>
+		<cryptomator.integrations.linux.version>1.0.0</cryptomator.integrations.linux.version>
 		<cryptomator.fuse.version>1.3.3</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.3.3</cryptomator.dokany.version>
 		<cryptomator.webdav.version>1.2.6</cryptomator.webdav.version>
Author	SHA1	Message	Date
Julian Raufelder	cea8b7556e	Merge branch 'release/1.6.1'	2021-10-20 13:40:49 +02:00
Julian Raufelder	5dde332b8b	Preparing 1.6.1	2021-10-20 13:39:20 +02:00
Sebastian Stenzel	0980e4776b	fixes #1843	2021-10-20 12:46:37 +02:00
Tobias Hagemann	fd7a6f42f1	added x64 suffix to msi installer name	2021-10-19 22:05:59 +02:00
Armin Schrenk	8bfbfc7700	Update installer workflow to add options introduced in JDK 17	2021-10-19 19:12:53 +02:00
Armin Schrenk	ec72762548	fix windows installer	2021-10-19 18:45:25 +02:00
Sebastian Stenzel	6abe39679e	Merge branch 'master' into develop [ci skip]	2021-10-19 15:58:51 +02:00
Sebastian Stenzel	1daab1a4f1	Merge branch 'release/1.6.0' # Conflicts: # main/buildkit/pom.xml # main/commons/pom.xml # main/launcher/pom.xml # main/pom.xml # main/ui/pom.xml # main/ui/src/main/resources/license/THIRD-PARTY.txt	2021-10-19 15:57:51 +02:00
Armin Schrenk	39d1a3d5a6	Merge branch 'develop' into release/1.6.0	2021-10-19 15:47:17 +02:00
Tobias Hagemann	a6b50bde75	Merge pull request #1796 from PBillodeau/fix/linux-build Relative paths in linux build are incorrect	2021-10-19 13:51:00 +02:00
Armin Schrenk	3f569fe33e	Merge branch 'develop' into release/1.6.0	2021-10-19 13:31:27 +02:00
Armin Schrenk	4801ae3fe3	final dependency bump	2021-10-19 13:31:11 +02:00
Sebastian Stenzel	5f672880b9	Merge branch 'develop' into release/1.6.0	2021-10-19 09:34:24 +02:00
Sebastian Stenzel	6ccbc2b806	update cryptofs	2021-10-18 13:44:15 +02:00
Sebastian Stenzel	3492ddbee1	fixes #1833	2021-10-18 13:43:45 +02:00
PBillodeau	aa7ee65d99	Update build version variable Add path to pom.xml and move after preconditions	2021-09-27 09:54:43 -05:00
PBillodeau	279db5ffd0	Merge branch 'cryptomator:develop' into fix/linux-build	2021-09-27 09:51:20 -05:00
PBillodeau	772e3ae68a	Apply suggestions from code review Co-authored-by: Tobias Hagemann <tobias.hagemann@gmail.com>	2021-09-27 09:50:51 -05:00
PBillodeau	96d37096c1	Relative paths in linux build are incorrect	2021-09-18 14:07:42 -05:00
Tobias Hagemann	78e4c714a1	preparing 1.5.19	2021-09-09 14:14:36 +02:00
Tobias Hagemann	9d43f8bb81	updated dependency, fixes #1778	2021-09-09 14:13:42 +02:00
Tobias Hagemann	4e31f7e5c7	updated THIRD-PARTY	2021-09-07 12:49:10 +02:00
Tobias Hagemann	d9a35a4f93	preparing 1.5.18	2021-09-07 12:39:24 +02:00
Tobias Hagemann	80b4aea7e0	updated dependencies	2021-09-07 12:38:39 +02:00
Armin Schrenk	775fbf4873	update cryptofs- and dokany-dependency	2021-09-03 11:44:10 +02:00
Armin Schrenk	1ad6dbba64	preparing 1.5.17	2021-09-02 13:01:19 +02:00