浏览代码

Single maven module (#1676)

combined all sources into single maven module
Sebastian Stenzel 3 年之前
父节点
当前提交
7fac6da448
共有 100 个文件被更改,包括 649 次插入961 次删除
  1. 2 2
      .crowdin.yml
  2. 13 16
      .github/workflows/build.yml
  3. 1 1
      .idea/misc.xml
  4. 0 8
      .idea/modules.xml
  5. 1 1
      .idea/runConfigurations/Cryptomator_Linux.xml
  6. 1 1
      .idea/runConfigurations/Cryptomator_Linux_Dev.xml
  7. 1 1
      .idea/runConfigurations/Cryptomator_Windows.xml
  8. 1 1
      .idea/runConfigurations/Cryptomator_Windows_Dev.xml
  9. 1 1
      .idea/runConfigurations/Cryptomator_macOS.xml
  10. 1 1
      .idea/runConfigurations/Cryptomator_macOS_Dev.xml
  11. 5 4
      README.md
  12. 7 0
      main/buildkit/assembly-linux.xml
  13. 7 0
      main/buildkit/assembly-mac.xml
  14. 7 0
      main/buildkit/assembly-win.xml
  15. 0 216
      main/buildkit/pom.xml
  16. 0 86
      main/commons/pom.xml
  17. 0 48
      main/launcher/pom.xml
  18. 0 445
      main/pom.xml
  19. 0 14
      main/suppression.xml
  20. 0 115
      main/ui/pom.xml
  21. 601 0
      pom.xml
  22. 0 0
      src/license/THIRD-PARTY.properties
  23. 0 0
      src/license/template.ftl
  24. 0 0
      src/main/java/org/cryptomator/common/CommonsModule.java
  25. 0 0
      src/main/java/org/cryptomator/common/Constants.java
  26. 0 0
      src/main/java/org/cryptomator/common/ConsumerThrowingException.java
  27. 0 0
      src/main/java/org/cryptomator/common/Environment.java
  28. 0 0
      src/main/java/org/cryptomator/common/LicenseChecker.java
  29. 0 0
      src/main/java/org/cryptomator/common/LicenseHolder.java
  30. 0 0
      src/main/java/org/cryptomator/common/RunnableThrowingException.java
  31. 0 0
      src/main/java/org/cryptomator/common/SemVerComparator.java
  32. 0 0
      src/main/java/org/cryptomator/common/ShutdownHook.java
  33. 0 0
      src/main/java/org/cryptomator/common/SupplierThrowingException.java
  34. 0 0
      src/main/java/org/cryptomator/common/keychain/KeychainManager.java
  35. 0 0
      src/main/java/org/cryptomator/common/keychain/KeychainModule.java
  36. 0 0
      src/main/java/org/cryptomator/common/keychain/NoKeychainAccessProviderException.java
  37. 0 0
      src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java
  38. 0 0
      src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
  39. 0 0
      src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
  40. 0 0
      src/main/java/org/cryptomator/common/mountpoint/InvalidMountPointException.java
  41. 0 0
      src/main/java/org/cryptomator/common/mountpoint/MacVolumeMountChooser.java
  42. 0 0
      src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
  43. 0 0
      src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java
  44. 0 0
      src/main/java/org/cryptomator/common/mountpoint/MountPointHelper.java
  45. 0 0
      src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
  46. 0 0
      src/main/java/org/cryptomator/common/settings/KeychainBackend.java
  47. 0 0
      src/main/java/org/cryptomator/common/settings/Settings.java
  48. 0 0
      src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java
  49. 0 0
      src/main/java/org/cryptomator/common/settings/SettingsProvider.java
  50. 0 0
      src/main/java/org/cryptomator/common/settings/UiTheme.java
  51. 0 0
      src/main/java/org/cryptomator/common/settings/VaultSettings.java
  52. 0 0
      src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
  53. 0 0
      src/main/java/org/cryptomator/common/settings/VolumeImpl.java
  54. 0 0
      src/main/java/org/cryptomator/common/settings/WebDavUrlScheme.java
  55. 0 0
      src/main/java/org/cryptomator/common/settings/WhenUnlocked.java
  56. 0 0
      src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
  57. 0 0
      src/main/java/org/cryptomator/common/vaults/AutoLocker.java
  58. 0 0
      src/main/java/org/cryptomator/common/vaults/DefaultMountFlags.java
  59. 0 0
      src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
  60. 0 0
      src/main/java/org/cryptomator/common/vaults/FuseVolume.java
  61. 0 0
      src/main/java/org/cryptomator/common/vaults/LockNotCompletedException.java
  62. 0 0
      src/main/java/org/cryptomator/common/vaults/MountPointRequirement.java
  63. 0 0
      src/main/java/org/cryptomator/common/vaults/PerVault.java
  64. 0 0
      src/main/java/org/cryptomator/common/vaults/Vault.java
  65. 0 0
      src/main/java/org/cryptomator/common/vaults/VaultComponent.java
  66. 0 0
      src/main/java/org/cryptomator/common/vaults/VaultListChangeListener.java
  67. 0 0
      src/main/java/org/cryptomator/common/vaults/VaultListManager.java
  68. 0 0
      src/main/java/org/cryptomator/common/vaults/VaultListModule.java
  69. 0 0
      src/main/java/org/cryptomator/common/vaults/VaultModule.java
  70. 0 0
      src/main/java/org/cryptomator/common/vaults/VaultState.java
  71. 0 0
      src/main/java/org/cryptomator/common/vaults/VaultStats.java
  72. 0 0
      src/main/java/org/cryptomator/common/vaults/Volume.java
  73. 0 0
      src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
  74. 0 0
      src/main/java/org/cryptomator/common/vaults/WindowsDriveLetters.java
  75. 0 0
      src/main/java/org/cryptomator/launcher/Cryptomator.java
  76. 0 0
      src/main/java/org/cryptomator/launcher/CryptomatorComponent.java
  77. 0 0
      src/main/java/org/cryptomator/launcher/CryptomatorModule.java
  78. 0 0
      src/main/java/org/cryptomator/launcher/FileOpenRequestHandler.java
  79. 0 0
      src/main/java/org/cryptomator/launcher/IpcFactory.java
  80. 0 0
      src/main/java/org/cryptomator/launcher/IpcProtocol.java
  81. 0 0
      src/main/java/org/cryptomator/launcher/IpcProtocolImpl.java
  82. 0 0
      src/main/java/org/cryptomator/logging/DebugMode.java
  83. 0 0
      src/main/java/org/cryptomator/logging/LaunchAndSizeBasedTriggerinPolicy.java
  84. 0 0
      src/main/java/org/cryptomator/logging/LaunchBasedTriggeringPolicy.java
  85. 0 0
      src/main/java/org/cryptomator/logging/LoggerConfiguration.java
  86. 0 0
      src/main/java/org/cryptomator/logging/LoggerModule.java
  87. 0 0
      src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java
  88. 0 0
      src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultSuccessController.java
  89. 0 0
      src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWelcomeController.java
  90. 0 0
      src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java
  91. 0 0
      src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardScoped.java
  92. 0 0
      src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardWindow.java
  93. 0 0
      src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java
  94. 0 0
      src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java
  95. 0 0
      src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java
  96. 0 0
      src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java
  97. 0 0
      src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultRecoveryKeyController.java
  98. 0 0
      src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java
  99. 0 0
      src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java
  100. 0 0
      main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordComponent.java

+ 2 - 2
.crowdin.yml

@@ -1,5 +1,5 @@
 commit_message: "[ci skip]"
 escape_special_characters: 0
 files:
-  - source: /main/ui/src/main/resources/i18n/strings.properties
-    translation: /main/ui/src/main/resources/i18n/strings_%two_letters_code%.properties
+  - source: /src/main/resources/i18n/strings.properties
+    translation: /src/main/resources/i18n/strings_%two_letters_code%.properties

+ 13 - 16
.github/workflows/build.yml

@@ -20,41 +20,38 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: Ensure to use tagged version
-        run: mvn versions:set --file main/pom.xml -DnewVersion=${GITHUB_REF##*/} # use shell parameter expansion to strip of 'refs/tags'
+        run: mvn versions:set -DnewVersion=${GITHUB_REF##*/} # use shell parameter expansion to strip of 'refs/tags'
         if: startsWith(github.ref, 'refs/tags/')
       - name: Build and Test
-        run: mvn -B install --file main/pom.xml -Pcoverage
-      - name: Run Codacy Coverage Reporter
-        if: github.repository == 'cryptomator/cryptomator'
-        run: |
-          curl -o ~/codacy-coverage-reporter.jar https://repo.maven.apache.org/maven2/com/codacy/codacy-coverage-reporter/7.1.0/codacy-coverage-reporter-7.1.0-assembly.jar
-          $JAVA_HOME/bin/java --illegal-access=permit -jar ~/codacy-coverage-reporter.jar report -l Java -r main/commons/target/site/jacoco/jacoco.xml --partial
-          $JAVA_HOME/bin/java --illegal-access=permit -jar ~/codacy-coverage-reporter.jar report -l Java -r main/ui/target/site/jacoco/jacoco.xml --partial
-          $JAVA_HOME/bin/java --illegal-access=permit -jar ~/codacy-coverage-reporter.jar report -l Java -r main/launcher/target/site/jacoco/jacoco.xml --partial
-          $JAVA_HOME/bin/java --illegal-access=permit -jar ~/codacy-coverage-reporter.jar final
+        run: mvn -B clean install jacoco:report -Pcoverage,dependency-check
+      - name: Upload code coverage report
+        id: codacyCoverageReporter
+        run: bash <(curl -Ls https://coverage.codacy.com/get.sh)
         env:
           CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
+        continue-on-error: true
+### TODO: move to matrix build:
       - name: Assemble buildkit-linux.zip
-        run: mvn -B clean package -DskipTests --file main/pom.xml --resume-from=buildkit -Prelease,linux
+        run: mvn -B clean package -DskipTests -Plinux
       - name: Upload buildkit-linux.zip
         uses: actions/upload-artifact@v1
         with:
           name: buildkit-linux.zip
-          path: main/buildkit/target/buildkit-linux.zip
+          path: target/buildkit-linux.zip
       - name: Assemble buildkit-mac.zip
-        run: mvn -B clean package -DskipTests --file main/pom.xml --resume-from=buildkit -Prelease,mac
+        run: mvn -B clean package -DskipTests -Pmac
       - name: Upload buildkit-mac.zip
         uses: actions/upload-artifact@v1
         with:
           name: buildkit-mac.zip
-          path: main/buildkit/target/buildkit-mac.zip
+          path: target/buildkit-mac.zip
       - name: Assemble buildkit-win.zip
-        run: mvn -B clean package -DskipTests --file main/pom.xml --resume-from=buildkit -Prelease,windows
+        run: mvn -B clean package -DskipTests -Pwindows
       - name: Upload buildkit-win.zip
         uses: actions/upload-artifact@v1
         with:
           name: buildkit-win.zip
-          path: main/buildkit/target/buildkit-win.zip
+          path: target/buildkit-win.zip
           
   release:
     name: Draft a Release on GitHub Releases

+ 1 - 1
.idea/misc.xml

@@ -4,7 +4,7 @@
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
-        <option value="$PROJECT_DIR$/main/pom.xml" />
+        <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
   </component>

+ 0 - 8
.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/Desktop.iml" filepath="$PROJECT_DIR$/.idea/Desktop.iml" />
-    </modules>
-  </component>
-</project>

+ 1 - 1
.idea/runConfigurations/Cryptomator_Linux.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Cryptomator Linux" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
-    <module name="launcher" />
+    <module name="cryptomator" />
     <option name="VM_PARAMETERS" value="-Djdk.gtk.version=2 -Duser.language=en -Dcryptomator.settingsPath=&quot;~/.config/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/.config/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/.local/share/Cryptomator/logs&quot; -Dcryptomator.mountPointsDir=&quot;~/.local/share/Cryptomator/mnt&quot; -Dcryptomator.showTrayIcon=true -Xss20m -Xmx512m" />
     <method v="2">
       <option name="Make" enabled="true" />

+ 1 - 1
.idea/runConfigurations/Cryptomator_Linux_Dev.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Cryptomator Linux Dev" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
-    <module name="launcher" />
+    <module name="cryptomator" />
     <option name="VM_PARAMETERS" value="-Djdk.gtk.version=2 -Duser.language=en -Dcryptomator.settingsPath=&quot;~/.config/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/.config/Cryptomator-Dev/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/.local/share/Cryptomator-Dev/logs&quot; -Dcryptomator.mountPointsDir=&quot;~/.local/share/Cryptomator-Dev/mnt&quot; -Dcryptomator.showTrayIcon=true -Dfuse.experimental=&quot;true&quot; -Xss20m -Xmx512m" />
     <method v="2">
       <option name="Make" enabled="true" />

+ 1 - 1
.idea/runConfigurations/Cryptomator_Windows.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Cryptomator Windows" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
-    <module name="launcher" />
+    <module name="cryptomator" />
     <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/AppData/Roaming/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator&quot; -Dcryptomator.keychainPath=&quot;~/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.mountPointsDir=&quot;~/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m" />
     <method v="2">
       <option name="Make" enabled="true" />

文件差异内容过多而无法显示
+ 1 - 1
.idea/runConfigurations/Cryptomator_Windows_Dev.xml


+ 1 - 1
.idea/runConfigurations/Cryptomator_macOS.xml

@@ -4,7 +4,7 @@
       <env name="LD_LIBRARY_PATH" value="/usr/local/lib" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
-    <module name="launcher" />
+    <module name="cryptomator" />
     <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/Library/Application Support/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m -ea" />
     <method v="2">
       <option name="Make" enabled="true" />

+ 1 - 1
.idea/runConfigurations/Cryptomator_macOS_Dev.xml

@@ -4,7 +4,7 @@
       <env name="LD_LIBRARY_PATH" value="/usr/local/lib" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
-    <module name="launcher" />
+    <module name="cryptomator" />
     <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/Library/Application Support/Cryptomator-Dev/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator-Dev&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m -ea" />
     <method v="2">
       <option name="Make" enabled="true" />

+ 5 - 4
README.md

@@ -88,12 +88,13 @@ For more information on the security details visit [cryptomator.org](https://doc
 
 ```
 cd main
-mvn clean install -Prelease,windows
-# or mvn clean install -Prelease,mac
-# or mvn clean install -Prelease,linux
+mvn clean install
+# or mvn clean install -Pwindows
+# or mvn clean install -Pmac
+# or mvn clean install -Plinux
 ```
 
-This will build all the jars and bundle them together with their OS-specific dependencies under `main/buildkit/target`. This can now be used to build native packages.
+This will build all the jars and bundle them together with their OS-specific dependencies under `target`. This can now be used to build native packages.
 
 ### Start Cryptomator
 

+ 7 - 0
main/buildkit/assembly-linux.xml

@@ -29,6 +29,13 @@
 			<outputDirectory></outputDirectory>
 			<fileMode>0755</fileMode>
 		</fileSet>
+		<fileSet>
+			<directory>target/</directory>
+			<includes>
+				<include>cryptomator-*.jar</include>
+			</includes>
+			<outputDirectory>libs</outputDirectory>
+		</fileSet>
 		<fileSet>
 			<directory>target/libs</directory>
 			<includes>

+ 7 - 0
main/buildkit/assembly-mac.xml

@@ -29,6 +29,13 @@
 			<outputDirectory></outputDirectory>
 			<fileMode>0755</fileMode>
 		</fileSet>
+		<fileSet>
+			<directory>target/</directory>
+			<includes>
+				<include>cryptomator-*.jar</include>
+			</includes>
+			<outputDirectory>libs</outputDirectory>
+		</fileSet>
 		<fileSet>
 			<directory>target/libs</directory>
 			<includes>

+ 7 - 0
main/buildkit/assembly-win.xml

@@ -29,6 +29,13 @@
 			<outputDirectory></outputDirectory>
 			<fileMode>0755</fileMode>
 		</fileSet>
+		<fileSet>
+			<directory>target/</directory>
+			<includes>
+				<include>cryptomator-*.jar</include>
+			</includes>
+			<outputDirectory>libs</outputDirectory>
+		</fileSet>
 		<fileSet>
 			<directory>target/libs</directory>
 			<includes>

+ 0 - 216
main/buildkit/pom.xml

@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.cryptomator</groupId>
-		<artifactId>main</artifactId>
-		<version>1.6.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>buildkit</artifactId>
-	<packaging>pom</packaging>
-	<name>Cryptomator Build Kit</name>
-	<description>Builds a package that can be built with Ant locally</description>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>launcher</artifactId>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<!-- copy resources -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-resources</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}</outputDirectory>
-							<resources>
-								<resource>
-									<directory>${project.basedir}/src/main/resources</directory>
-									<includes>
-										<include>version.txt</include>
-										<include>ffi-version.txt</include>
-										<include>launcher-mac.sh</include>
-										<include>launcher-linux.sh</include>
-										<include>launcher-win.bat</include>
-										<include>LICENSE.txt</include>
-									</includes>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<!-- copy libraries to target/libs/: -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-libs</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<includeScope>runtime</includeScope>
-							<outputDirectory>${project.build.directory}/libs</outputDirectory>
-							<excludeClassifiers>linux,mac,win</excludeClassifiers>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>linux</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-assembly-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>assemble-linux</id>
-								<phase>package</phase>
-								<goals>
-									<goal>single</goal>
-								</goals>
-								<configuration>
-									<descriptors>
-										<descriptor>assembly-linux.xml</descriptor>
-									</descriptors>
-									<appendAssemblyId>false</appendAssemblyId>
-									<finalName>buildkit-linux</finalName>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>copy-linux-libs</id>
-								<phase>prepare-package</phase>
-								<goals>
-									<goal>copy-dependencies</goal>
-								</goals>
-								<configuration>
-									<outputDirectory>${project.build.directory}/libs</outputDirectory>
-									<includeGroupIds>org.openjfx</includeGroupIds>
-									<classifier>linux</classifier>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-		<profile>
-			<id>mac</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-assembly-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>assemble-mac</id>
-								<phase>package</phase>
-								<goals>
-									<goal>single</goal>
-								</goals>
-								<configuration>
-									<descriptors>
-										<descriptor>assembly-mac.xml</descriptor>
-									</descriptors>
-									<appendAssemblyId>false</appendAssemblyId>
-									<finalName>buildkit-mac</finalName>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>copy-mac-libs</id>
-								<phase>prepare-package</phase>
-								<goals>
-									<goal>copy-dependencies</goal>
-								</goals>
-								<configuration>
-									<outputDirectory>${project.build.directory}/libs</outputDirectory>
-									<includeGroupIds>org.openjfx</includeGroupIds>
-									<classifier>mac</classifier>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-		<profile>
-			<id>windows</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-assembly-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>assemble-win</id>
-								<phase>package</phase>
-								<goals>
-									<goal>single</goal>
-								</goals>
-								<configuration>
-									<descriptors>
-										<descriptor>assembly-win.xml</descriptor>
-									</descriptors>
-									<appendAssemblyId>false</appendAssemblyId>
-									<finalName>buildkit-win</finalName>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>copy-win-libs</id>
-								<phase>prepare-package</phase>
-								<goals>
-									<goal>copy-dependencies</goal>
-								</goals>
-								<configuration>
-									<outputDirectory>${project.build.directory}/libs</outputDirectory>
-									<includeGroupIds>org.openjfx</includeGroupIds>
-									<classifier>win</classifier>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>

+ 0 - 86
main/commons/pom.xml

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.cryptomator</groupId>
-		<artifactId>main</artifactId>
-		<version>1.6.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>commons</artifactId>
-	<name>Cryptomator Commons</name>
-	<description>Shared utilities</description>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>cryptofs</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>fuse-nio-adapter</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>dokany-nio-adapter</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>webdav-nio-adapter</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>integrations-api</artifactId>
-		</dependency>
-
-		<!-- JavaFx -->
-		<dependency>
-			<groupId>org.openjfx</groupId>
-			<artifactId>javafx-base</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.openjfx</groupId>
-			<artifactId>javafx-graphics</artifactId>
-		</dependency>
-
-		<!-- EasyBind -->
-		<dependency>
-			<groupId>com.tobiasdiez</groupId>
-			<artifactId>easybind</artifactId>
-		</dependency>
-
-		<!-- JWT -->
-		<dependency>
-			<groupId>com.auth0</groupId>
-			<artifactId>java-jwt</artifactId>
-		</dependency>
-
-		<!-- Google -->
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-		</dependency>
-
-		<!-- Apache Commons -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
-
-		<!-- DI -->
-		<dependency>
-			<groupId>com.google.dagger</groupId>
-			<artifactId>dagger</artifactId>
-		</dependency>
-
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>

+ 0 - 48
main/launcher/pom.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.cryptomator</groupId>
-		<artifactId>main</artifactId>
-		<version>1.6.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>launcher</artifactId>
-	<name>Cryptomator Launcher</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>commons</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>ui</artifactId>
-		</dependency>
-
-		<!-- Libs -->
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
-
-		<!-- DI -->
-		<dependency>
-			<groupId>com.google.dagger</groupId>
-			<artifactId>dagger</artifactId>
-		</dependency>
-
-		<!-- Logging -->
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-		</dependency>
-	</dependencies>
-</project>

+ 0 - 445
main/pom.xml

@@ -1,445 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.cryptomator</groupId>
-	<artifactId>main</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>Cryptomator</name>
-
-	<organization>
-		<name>cryptomator.org</name>
-		<url>https://cryptomator.org</url>
-	</organization>
-
-	<developers>
-		<developer>
-			<name>Sebastian Stenzel</name>
-			<email>sebastian.stenzel@gmail.com</email>
-			<timezone>+1</timezone>
-		</developer>
-	</developers>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.jdk.version>16</project.jdk.version>
-
-		<!-- cryptomator dependencies -->
-		<cryptomator.cryptofs.version>2.1.0-beta5</cryptomator.cryptofs.version>
-		<cryptomator.integrations.version>1.0.0-beta2</cryptomator.integrations.version>
-		<cryptomator.integrations.win.version>1.0.0-beta2</cryptomator.integrations.win.version>
-		<cryptomator.integrations.mac.version>1.0.0-beta2</cryptomator.integrations.mac.version>
-		<cryptomator.integrations.linux.version>1.0.0-beta1</cryptomator.integrations.linux.version>
-		<cryptomator.fuse.version>1.3.1</cryptomator.fuse.version>
-		<cryptomator.dokany.version>1.3.1</cryptomator.dokany.version>
-		<cryptomator.webdav.version>1.2.2</cryptomator.webdav.version>
-
-		<!-- 3rd party dependencies -->
-		<javafx.version>16</javafx.version>
-		<commons-lang3.version>3.11</commons-lang3.version>
-		<jwt.version>3.15.0</jwt.version>
-		<easybind.version>2.1.0</easybind.version>
-		<guava.version>30.1.1-jre</guava.version>
-		<dagger.version>2.35.1</dagger.version>
-		<gson.version>2.8.6</gson.version>
-		<slf4j.version>1.7.30</slf4j.version>
-		<logback.version>1.2.3</logback.version>
-
-		<!-- test dependencies -->
-		<junit.jupiter.version>5.7.1</junit.jupiter.version>
-		<mockito.version>3.9.0</mockito.version>
-		<hamcrest.version>2.2</hamcrest.version>
-	</properties>
-
-	<dependencyManagement>
-		<dependencies>
-			<!-- modules -->
-			<dependency>
-				<groupId>org.cryptomator</groupId>
-				<artifactId>commons</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.cryptomator</groupId>
-				<artifactId>ui</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.cryptomator</groupId>
-				<artifactId>launcher</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-
-			<!-- Cryptomator Libs -->
-			<dependency>
-				<groupId>org.cryptomator</groupId>
-				<artifactId>cryptofs</artifactId>
-				<version>${cryptomator.cryptofs.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.cryptomator</groupId>
-				<artifactId>fuse-nio-adapter</artifactId>
-				<version>${cryptomator.fuse.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.cryptomator</groupId>
-				<artifactId>dokany-nio-adapter</artifactId>
-				<version>${cryptomator.dokany.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.cryptomator</groupId>
-				<artifactId>webdav-nio-adapter</artifactId>
-				<version>${cryptomator.webdav.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.cryptomator</groupId>
-				<artifactId>integrations-api</artifactId>
-				<version>${cryptomator.integrations.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.cryptomator</groupId>
-				<artifactId>integrations-win</artifactId>
-				<version>${cryptomator.integrations.win.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.cryptomator</groupId>
-				<artifactId>integrations-mac</artifactId>
-				<version>${cryptomator.integrations.mac.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.cryptomator</groupId>
-				<artifactId>integrations-linux</artifactId>
-				<version>${cryptomator.integrations.linux.version}</version>
-			</dependency>
-
-			<!-- JavaFX -->
-			<dependency>
-				<groupId>org.openjfx</groupId>
-				<artifactId>javafx-base</artifactId>
-				<version>${javafx.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.openjfx</groupId>
-				<artifactId>javafx-graphics</artifactId>
-				<version>${javafx.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.openjfx</groupId>
-				<artifactId>javafx-controls</artifactId>
-				<version>${javafx.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.openjfx</groupId>
-				<artifactId>javafx-fxml</artifactId>
-				<version>${javafx.version}</version>
-			</dependency>
-
-			<!-- Logging -->
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-api</artifactId>
-				<version>${slf4j.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-simple</artifactId>
-				<version>${slf4j.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>ch.qos.logback</groupId>
-				<artifactId>logback-core</artifactId>
-				<version>${logback.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>ch.qos.logback</groupId>
-				<artifactId>logback-classic</artifactId>
-				<version>${logback.version}</version>
-			</dependency>
-
-			<!-- Apache Commons -->
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-lang3</artifactId>
-				<version>${commons-lang3.version}</version>
-			</dependency>
-
-			<!-- JWT -->
-			<dependency>
-				<groupId>com.auth0</groupId>
-				<artifactId>java-jwt</artifactId>
-				<version>${jwt.version}</version>
-			</dependency>
-
-			<!-- EasyBind -->
-			<dependency>
-				<groupId>com.tobiasdiez</groupId>
-				<artifactId>easybind</artifactId>
-				<version>${easybind.version}</version>
-			</dependency>
-
-			<!-- Google -->
-			<dependency>
-				<groupId>com.google.guava</groupId>
-				<artifactId>guava</artifactId>
-				<version>${guava.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.google.dagger</groupId>
-				<artifactId>dagger</artifactId>
-				<version>${dagger.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.google.code.gson</groupId>
-				<artifactId>gson</artifactId>
-				<version>${gson.version}</version>
-			</dependency>
-
-			<!-- JUnit / Mockito / Hamcrest -->
-			<dependency>
-				<groupId>org.junit.jupiter</groupId>
-				<artifactId>junit-jupiter</artifactId>
-				<version>${junit.jupiter.version}</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.mockito</groupId>
-				<artifactId>mockito-core</artifactId>
-				<version>${mockito.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.hamcrest</groupId>
-				<artifactId>hamcrest</artifactId>
-				<version>${hamcrest.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.openjfx</groupId>
-				<artifactId>javafx-swing</artifactId>
-				<version>${javafx.version}</version>
-				<scope>test</scope>
-			</dependency>
-
-		</dependencies>
-	</dependencyManagement>
-
-	<dependencies>
-		<!-- common dependencies for all modules -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<modules>
-		<module>commons</module>
-		<module>ui</module>
-		<module>launcher</module>
-	</modules>
-
-	<profiles>
-		<profile>
-			<id>release</id>
-			<modules>
-				<module>buildkit</module>
-			</modules>
-		</profile>
-		<profile>
-			<id>coverage</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.jacoco</groupId>
-						<artifactId>jacoco-maven-plugin</artifactId>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>mac</id>
-			<activation>
-				<os>
-					<family>mac</family>
-				</os>
-				<property>
-					<name>idea.version</name>
-				</property>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>org.cryptomator</groupId>
-					<artifactId>integrations-mac</artifactId>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>linux</id>
-			<activation>
-				<os>
-					<family>unix</family>
-					<name>Linux</name>
-				</os>
-				<property>
-					<name>idea.version</name>
-				</property>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>org.cryptomator</groupId>
-					<artifactId>integrations-linux</artifactId>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>windows</id>
-			<activation>
-				<os>
-					<family>windows</family>
-				</os>
-				<property>
-					<name>idea.version</name>
-				</property>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>org.cryptomator</groupId>
-					<artifactId>integrations-win</artifactId>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>dependency-check</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.owasp</groupId>
-						<artifactId>dependency-check-maven</artifactId>
-						<version>6.0.3</version>
-						<configuration>
-							<cveValidForHours>24</cveValidForHours>
-							<failBuildOnCVSS>0</failBuildOnCVSS>
-							<skipTestScope>true</skipTestScope>
-							<detail>true</detail>
-							<suppressionFile>suppression.xml</suppressionFile>
-						</configuration>
-						<executions>
-							<execution>
-								<goals>
-									<goal>check</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.8.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-resources-plugin</artifactId>
-					<version>3.2.0</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-dependency-plugin</artifactId>
-					<version>3.1.2</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-assembly-plugin</artifactId>
-					<version>3.3.0</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.22.2</version>
-				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>license-maven-plugin</artifactId>
-					<version>2.0.0</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.2.0</version>
-					<configuration>
-						<archive>
-							<manifest>
-								<!-- adds Implementation-Version which can be read during runtime -->
-								<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-							</manifest>
-						</archive>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.jacoco</groupId>
-					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>0.8.6</version>
-					<executions>
-						<execution>
-							<id>prepare-agent</id>
-							<goals>
-								<goal>prepare-agent</goal>
-							</goals>
-						</execution>
-						<execution>
-							<id>report</id>
-							<goals>
-								<goal>report</goal>
-							</goals>
-						</execution>
-					</executions>
-					<configuration>
-						<excludes>
-							<exclude>**/*_*</exclude>
-							<exclude>**/Dagger*</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<release>${project.jdk.version}</release>
-					<annotationProcessorPaths>
-						<path>
-							<groupId>com.google.dagger</groupId>
-							<artifactId>dagger-compiler</artifactId>
-							<version>${dagger.version}</version>
-						</path>
-					</annotationProcessorPaths>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>

+ 0 - 14
main/suppression.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This file lists false positives found by org.owasp:dependency-check-maven build plugin -->
-<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.2.xsd">
-	<suppress>
-		<notes><![CDATA[ Suppress known vulnerabilities in FUSE libraries for fuse-nio-adapter. For more info, see suppression.xml of https://github.com/cryptomator/fuse-nio-adapter ]]></notes>
-		<gav regex="true">^org\.cryptomator:fuse-nio-adapter:.*$</gav>
-		<cvssBelow>9</cvssBelow>
-	</suppress>
-	<suppress>
-		<notes><![CDATA[ Suppress known vulnerabilities in FUSE libraries for jnr-fuse (dependency of fuse-nio-adapter). ]]></notes>
-		<gav regex="true">^com\.github\.serceman:jnr-fuse:.*$</gav>
-		<cvssBelow>9</cvssBelow>
-	</suppress>
-</suppressions>

+ 0 - 115
main/ui/pom.xml

@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.cryptomator</groupId>
-		<artifactId>main</artifactId>
-		<version>1.6.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>ui</artifactId>
-	<name>Cryptomator GUI</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>commons</artifactId>
-		</dependency>
-
-		<!-- JavaFx -->
-		<dependency>
-			<groupId>org.openjfx</groupId>
-			<artifactId>javafx-controls</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.openjfx</groupId>
-			<artifactId>javafx-fxml</artifactId>
-		</dependency>
-
-		<!-- EasyBind -->
-		<dependency>
-			<groupId>com.tobiasdiez</groupId>
-			<artifactId>easybind</artifactId>
-		</dependency>
-
-		<!-- Google -->
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-		</dependency>
-
-		<!-- Apache Commons -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
-
-		<!-- DI -->
-		<dependency>
-			<groupId>com.google.dagger</groupId>
-			<artifactId>dagger</artifactId>
-		</dependency>
-
-		<!-- Zxcvbn -->
-		<dependency>
-			<groupId>com.nulab-inc</groupId>
-			<artifactId>zxcvbn</artifactId>
-			<version>1.3.0</version>
-		</dependency>
-
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- Testing -->
-		<dependency>
-			<groupId>com.google.jimfs</groupId>
-			<artifactId>jimfs</artifactId>
-			<version>1.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.openjfx</groupId>
-			<artifactId>javafx-swing</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>license-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-third-party</id>
-						<goals>
-							<goal>add-third-party</goal>
-						</goals>
-						<phase>generate-resources</phase>
-						<configuration>
-							<outputDirectory>${project.basedir}/src/main/resources/license</outputDirectory>
-							<thirdPartyFilename>THIRD-PARTY.txt</thirdPartyFilename>
-							<includedScopes>compile</includedScopes>
-							<excludedGroups>org\.cryptomator</excludedGroups>
-							<licenseMerges>
-								<licenseMerge>Apache License v2.0|Apache License, Version 2.0|The Apache Software License, Version 2.0|Apache 2.0|Apache Software License - Version 2.0</licenseMerge>
-								<licenseMerge>MIT License|The MIT License (MIT)|The MIT License|MIT license</licenseMerge>
-								<licenseMerge>LGPL 2.1|LGPL, version 2.1|GNU Lesser/Library General Public License version 2|GNU Lesser General Public License Version 2.1</licenseMerge>
-								<licenseMerge>GPLv2|GNU General Public License Version 2</licenseMerge>
-								<licenseMerge>GPLv2+CE|CDDL + GPLv2 with classpath exception</licenseMerge>
-							</licenseMerges>
-							<fileTemplate>${project.basedir}/src/license/template.ftl</fileTemplate>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>

+ 601 - 0
pom.xml

@@ -0,0 +1,601 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.cryptomator</groupId>
+	<artifactId>cryptomator</artifactId>
+	<version>1.6.0-SNAPSHOT</version>
+	<name>Cryptomator Desktop App</name>
+
+	<organization>
+		<name>cryptomator.org</name>
+		<url>https://cryptomator.org</url>
+	</organization>
+
+	<developers>
+		<developer>
+			<name>Sebastian Stenzel</name>
+			<email>sebastian.stenzel@gmail.com</email>
+			<timezone>+1</timezone>
+		</developer>
+	</developers>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.jdk.version>16</project.jdk.version>
+
+		<!-- cryptomator dependencies -->
+		<cryptomator.cryptofs.version>2.1.0-beta5</cryptomator.cryptofs.version>
+		<cryptomator.integrations.version>1.0.0-beta2</cryptomator.integrations.version>
+		<cryptomator.integrations.win.version>1.0.0-beta2</cryptomator.integrations.win.version>
+		<cryptomator.integrations.mac.version>1.0.0-beta2</cryptomator.integrations.mac.version>
+		<cryptomator.integrations.linux.version>1.0.0-beta1</cryptomator.integrations.linux.version>
+		<cryptomator.fuse.version>1.3.1</cryptomator.fuse.version>
+		<cryptomator.dokany.version>1.3.1</cryptomator.dokany.version>
+		<cryptomator.webdav.version>1.2.2</cryptomator.webdav.version>
+
+		<!-- 3rd party dependencies -->
+		<javafx.version>16</javafx.version>
+		<commons-lang3.version>3.11</commons-lang3.version>
+		<jwt.version>3.15.0</jwt.version>
+		<easybind.version>2.1.0</easybind.version>
+		<guava.version>30.1.1-jre</guava.version>
+		<dagger.version>2.35.1</dagger.version>
+		<gson.version>2.8.6</gson.version>
+		<slf4j.version>1.7.30</slf4j.version>
+		<logback.version>1.2.3</logback.version>
+
+		<!-- test dependencies -->
+		<junit.jupiter.version>5.7.1</junit.jupiter.version>
+		<mockito.version>3.9.0</mockito.version>
+		<hamcrest.version>2.2</hamcrest.version>
+	</properties>
+
+	<dependencies>
+		<!-- Cryptomator Libs -->
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>cryptofs</artifactId>
+			<version>${cryptomator.cryptofs.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>fuse-nio-adapter</artifactId>
+			<version>${cryptomator.fuse.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>dokany-nio-adapter</artifactId>
+			<version>${cryptomator.dokany.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>webdav-nio-adapter</artifactId>
+			<version>${cryptomator.webdav.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>integrations-api</artifactId>
+			<version>${cryptomator.integrations.version}</version>
+		</dependency>
+
+		<!-- JavaFX -->
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-base</artifactId>
+			<version>${javafx.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-graphics</artifactId>
+			<version>${javafx.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-controls</artifactId>
+			<version>${javafx.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-fxml</artifactId>
+			<version>${javafx.version}</version>
+		</dependency>
+
+		<!-- Logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>${logback.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback.version}</version>
+		</dependency>
+
+		<!-- Apache Commons -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>${commons-lang3.version}</version>
+		</dependency>
+
+		<!-- JWT -->
+		<dependency>
+			<groupId>com.auth0</groupId>
+			<artifactId>java-jwt</artifactId>
+			<version>${jwt.version}</version>
+		</dependency>
+
+		<!-- EasyBind -->
+		<dependency>
+			<groupId>com.tobiasdiez</groupId>
+			<artifactId>easybind</artifactId>
+			<version>${easybind.version}</version>
+		</dependency>
+
+		<!-- Zxcvbn -->
+		<dependency>
+			<groupId>com.nulab-inc</groupId>
+			<artifactId>zxcvbn</artifactId>
+			<version>1.3.0</version>
+		</dependency>
+
+		<!-- Google -->
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.dagger</groupId>
+			<artifactId>dagger</artifactId>
+			<version>${dagger.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>${gson.version}</version>
+		</dependency>
+
+		<!-- JUnit / Mockito / Hamcrest -->
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>${junit.jupiter.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>${mockito.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest</artifactId>
+			<version>${hamcrest.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-swing</artifactId>
+			<version>${javafx.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.google.jimfs</groupId>
+			<artifactId>jimfs</artifactId>
+			<version>1.1</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.8.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>3.2.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-dependency-plugin</artifactId>
+					<version>3.1.2</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-assembly-plugin</artifactId>
+					<version>3.3.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.22.2</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>license-maven-plugin</artifactId>
+					<version>2.0.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>3.2.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>0.8.6</version>
+				</plugin>
+				<plugin>
+					<groupId>org.owasp</groupId>
+					<artifactId>dependency-check-maven</artifactId>
+					<version>6.0.3</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<release>${project.jdk.version}</release>
+					<annotationProcessorPaths>
+						<path>
+							<groupId>com.google.dagger</groupId>
+							<artifactId>dagger-compiler</artifactId>
+							<version>${dagger.version}</version>
+						</path>
+					</annotationProcessorPaths>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<!-- adds Implementation-Version which can be read during runtime -->
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${project.basedir}/src/package</directory>
+									<includes>
+										<include>version.txt</include>
+										<include>ffi-version.txt</include>
+										<include>launcher-mac.sh</include>
+										<include>launcher-linux.sh</include>
+										<include>launcher-win.bat</include>
+										<include>LICENSE.txt</include>
+									</includes>
+									<filtering>true</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-libs</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<includeScope>runtime</includeScope>
+							<outputDirectory>${project.build.directory}/libs</outputDirectory>
+							<excludeClassifiers>linux,mac,win</excludeClassifiers>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>license-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>add-third-party</id>
+						<goals>
+							<goal>add-third-party</goal>
+						</goals>
+						<phase>generate-resources</phase>
+						<configuration>
+							<outputDirectory>${project.basedir}/src/main/resources/license</outputDirectory>
+							<thirdPartyFilename>THIRD-PARTY.txt</thirdPartyFilename>
+							<includedScopes>compile</includedScopes>
+							<excludedGroups>org\.cryptomator</excludedGroups>
+							<licenseMerges>
+								<licenseMerge>Apache License v2.0|Apache License, Version 2.0|The Apache Software License, Version 2.0|Apache 2.0|Apache Software License - Version 2.0</licenseMerge>
+								<licenseMerge>MIT License|The MIT License (MIT)|The MIT License|MIT license</licenseMerge>
+								<licenseMerge>LGPL 2.1|LGPL, version 2.1|GNU Lesser/Library General Public License version 2|GNU Lesser General Public License Version 2.1</licenseMerge>
+								<licenseMerge>GPLv2|GNU General Public License Version 2</licenseMerge>
+								<licenseMerge>GPLv2+CE|CDDL + GPLv2 with classpath exception</licenseMerge>
+							</licenseMerges>
+							<fileTemplate>${project.basedir}/src/license/template.ftl</fileTemplate>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<profiles>
+		<profile>
+			<id>coverage</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.jacoco</groupId>
+						<artifactId>jacoco-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>prepare-agent</id>
+								<goals>
+									<goal>prepare-agent</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>report</id>
+								<goals>
+									<goal>report</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<excludes>
+								<exclude>**/*_*</exclude>
+								<exclude>**/Dagger*</exclude>
+							</excludes>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+			<id>dependency-check</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.owasp</groupId>
+						<artifactId>dependency-check-maven</artifactId>
+						<configuration>
+							<cveValidForHours>24</cveValidForHours>
+							<failBuildOnCVSS>0</failBuildOnCVSS>
+							<skipTestScope>true</skipTestScope>
+							<detail>true</detail>
+							<suppressionFile>suppression.xml</suppressionFile>
+						</configuration>
+						<executions>
+							<execution>
+								<goals>
+									<goal>check</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+			<id>mac</id>
+			<activation>
+				<os>
+					<family>mac</family>
+				</os>
+				<property>
+					<name>idea.version</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.cryptomator</groupId>
+					<artifactId>integrations-mac</artifactId>
+					<version>${cryptomator.integrations.mac.version}</version>
+				</dependency>
+			</dependencies>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>assemble-mac</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptors>
+										<descriptor>assembly-mac.xml</descriptor>
+									</descriptors>
+									<appendAssemblyId>false</appendAssemblyId>
+									<finalName>buildkit-mac</finalName>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-mac-libs</id>
+								<phase>prepare-package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>${project.build.directory}/libs</outputDirectory>
+									<includeGroupIds>org.openjfx</includeGroupIds>
+									<classifier>mac</classifier>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+			<id>linux</id>
+			<activation>
+				<os>
+					<family>unix</family>
+					<name>Linux</name>
+				</os>
+				<property>
+					<name>idea.version</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.cryptomator</groupId>
+					<artifactId>integrations-linux</artifactId>
+					<version>${cryptomator.integrations.linux.version}</version>
+				</dependency>
+			</dependencies>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>assemble-linux</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptors>
+										<descriptor>assembly-linux.xml</descriptor>
+									</descriptors>
+									<appendAssemblyId>false</appendAssemblyId>
+									<finalName>buildkit-linux</finalName>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-linux-libs</id>
+								<phase>prepare-package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>${project.build.directory}/libs</outputDirectory>
+									<includeGroupIds>org.openjfx</includeGroupIds>
+									<classifier>linux</classifier>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+			<id>windows</id>
+			<activation>
+				<os>
+					<family>windows</family>
+				</os>
+				<property>
+					<name>idea.version</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.cryptomator</groupId>
+					<artifactId>integrations-win</artifactId>
+					<version>${cryptomator.integrations.win.version}</version>
+				</dependency>
+			</dependencies>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>assemble-win</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptors>
+										<descriptor>assembly-win.xml</descriptor>
+									</descriptors>
+									<appendAssemblyId>false</appendAssemblyId>
+									<finalName>buildkit-win</finalName>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-win-libs</id>
+								<phase>prepare-package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>${project.build.directory}/libs</outputDirectory>
+									<includeGroupIds>org.openjfx</includeGroupIds>
+									<classifier>win</classifier>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
+</project>

main/ui/src/license/THIRD-PARTY.properties → src/license/THIRD-PARTY.properties


main/ui/src/license/template.ftl → src/license/template.ftl


main/commons/src/main/java/org/cryptomator/common/CommonsModule.java → src/main/java/org/cryptomator/common/CommonsModule.java


main/commons/src/main/java/org/cryptomator/common/Constants.java → src/main/java/org/cryptomator/common/Constants.java


main/commons/src/main/java/org/cryptomator/common/ConsumerThrowingException.java → src/main/java/org/cryptomator/common/ConsumerThrowingException.java


main/commons/src/main/java/org/cryptomator/common/Environment.java → src/main/java/org/cryptomator/common/Environment.java


main/commons/src/main/java/org/cryptomator/common/LicenseChecker.java → src/main/java/org/cryptomator/common/LicenseChecker.java


main/commons/src/main/java/org/cryptomator/common/LicenseHolder.java → src/main/java/org/cryptomator/common/LicenseHolder.java


main/commons/src/main/java/org/cryptomator/common/RunnableThrowingException.java → src/main/java/org/cryptomator/common/RunnableThrowingException.java


main/commons/src/main/java/org/cryptomator/common/SemVerComparator.java → src/main/java/org/cryptomator/common/SemVerComparator.java


main/commons/src/main/java/org/cryptomator/common/ShutdownHook.java → src/main/java/org/cryptomator/common/ShutdownHook.java


main/commons/src/main/java/org/cryptomator/common/SupplierThrowingException.java → src/main/java/org/cryptomator/common/SupplierThrowingException.java


main/commons/src/main/java/org/cryptomator/common/keychain/KeychainManager.java → src/main/java/org/cryptomator/common/keychain/KeychainManager.java


main/commons/src/main/java/org/cryptomator/common/keychain/KeychainModule.java → src/main/java/org/cryptomator/common/keychain/KeychainModule.java


main/commons/src/main/java/org/cryptomator/common/keychain/NoKeychainAccessProviderException.java → src/main/java/org/cryptomator/common/keychain/NoKeychainAccessProviderException.java


main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java → src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java


main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java → src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java


main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java → src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java


main/commons/src/main/java/org/cryptomator/common/mountpoint/InvalidMountPointException.java → src/main/java/org/cryptomator/common/mountpoint/InvalidMountPointException.java


main/commons/src/main/java/org/cryptomator/common/mountpoint/MacVolumeMountChooser.java → src/main/java/org/cryptomator/common/mountpoint/MacVolumeMountChooser.java


main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java → src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java


main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java → src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java


main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointHelper.java → src/main/java/org/cryptomator/common/mountpoint/MountPointHelper.java


main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java → src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java


main/commons/src/main/java/org/cryptomator/common/settings/KeychainBackend.java → src/main/java/org/cryptomator/common/settings/KeychainBackend.java


main/commons/src/main/java/org/cryptomator/common/settings/Settings.java → src/main/java/org/cryptomator/common/settings/Settings.java


main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java → src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java


main/commons/src/main/java/org/cryptomator/common/settings/SettingsProvider.java → src/main/java/org/cryptomator/common/settings/SettingsProvider.java


main/commons/src/main/java/org/cryptomator/common/settings/UiTheme.java → src/main/java/org/cryptomator/common/settings/UiTheme.java


main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java → src/main/java/org/cryptomator/common/settings/VaultSettings.java


main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java → src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java


main/commons/src/main/java/org/cryptomator/common/settings/VolumeImpl.java → src/main/java/org/cryptomator/common/settings/VolumeImpl.java


main/commons/src/main/java/org/cryptomator/common/settings/WebDavUrlScheme.java → src/main/java/org/cryptomator/common/settings/WebDavUrlScheme.java


main/commons/src/main/java/org/cryptomator/common/settings/WhenUnlocked.java → src/main/java/org/cryptomator/common/settings/WhenUnlocked.java


main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java → src/main/java/org/cryptomator/common/vaults/AbstractVolume.java


main/commons/src/main/java/org/cryptomator/common/vaults/AutoLocker.java → src/main/java/org/cryptomator/common/vaults/AutoLocker.java


main/commons/src/main/java/org/cryptomator/common/vaults/DefaultMountFlags.java → src/main/java/org/cryptomator/common/vaults/DefaultMountFlags.java


main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java → src/main/java/org/cryptomator/common/vaults/DokanyVolume.java


main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java → src/main/java/org/cryptomator/common/vaults/FuseVolume.java


main/commons/src/main/java/org/cryptomator/common/vaults/LockNotCompletedException.java → src/main/java/org/cryptomator/common/vaults/LockNotCompletedException.java


main/commons/src/main/java/org/cryptomator/common/vaults/MountPointRequirement.java → src/main/java/org/cryptomator/common/vaults/MountPointRequirement.java


main/commons/src/main/java/org/cryptomator/common/vaults/PerVault.java → src/main/java/org/cryptomator/common/vaults/PerVault.java


main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java → src/main/java/org/cryptomator/common/vaults/Vault.java


main/commons/src/main/java/org/cryptomator/common/vaults/VaultComponent.java → src/main/java/org/cryptomator/common/vaults/VaultComponent.java


main/commons/src/main/java/org/cryptomator/common/vaults/VaultListChangeListener.java → src/main/java/org/cryptomator/common/vaults/VaultListChangeListener.java


main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java → src/main/java/org/cryptomator/common/vaults/VaultListManager.java


main/commons/src/main/java/org/cryptomator/common/vaults/VaultListModule.java → src/main/java/org/cryptomator/common/vaults/VaultListModule.java


main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java → src/main/java/org/cryptomator/common/vaults/VaultModule.java


main/commons/src/main/java/org/cryptomator/common/vaults/VaultState.java → src/main/java/org/cryptomator/common/vaults/VaultState.java


main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java → src/main/java/org/cryptomator/common/vaults/VaultStats.java


main/commons/src/main/java/org/cryptomator/common/vaults/Volume.java → src/main/java/org/cryptomator/common/vaults/Volume.java


main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java → src/main/java/org/cryptomator/common/vaults/WebDavVolume.java


main/commons/src/main/java/org/cryptomator/common/vaults/WindowsDriveLetters.java → src/main/java/org/cryptomator/common/vaults/WindowsDriveLetters.java


main/launcher/src/main/java/org/cryptomator/launcher/Cryptomator.java → src/main/java/org/cryptomator/launcher/Cryptomator.java


main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorComponent.java → src/main/java/org/cryptomator/launcher/CryptomatorComponent.java


main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorModule.java → src/main/java/org/cryptomator/launcher/CryptomatorModule.java


main/launcher/src/main/java/org/cryptomator/launcher/FileOpenRequestHandler.java → src/main/java/org/cryptomator/launcher/FileOpenRequestHandler.java


main/launcher/src/main/java/org/cryptomator/launcher/IpcFactory.java → src/main/java/org/cryptomator/launcher/IpcFactory.java


main/launcher/src/main/java/org/cryptomator/launcher/IpcProtocol.java → src/main/java/org/cryptomator/launcher/IpcProtocol.java


main/launcher/src/main/java/org/cryptomator/launcher/IpcProtocolImpl.java → src/main/java/org/cryptomator/launcher/IpcProtocolImpl.java


main/launcher/src/main/java/org/cryptomator/logging/DebugMode.java → src/main/java/org/cryptomator/logging/DebugMode.java


main/launcher/src/main/java/org/cryptomator/logging/LaunchAndSizeBasedTriggerinPolicy.java → src/main/java/org/cryptomator/logging/LaunchAndSizeBasedTriggerinPolicy.java


main/launcher/src/main/java/org/cryptomator/logging/LaunchBasedTriggeringPolicy.java → src/main/java/org/cryptomator/logging/LaunchBasedTriggeringPolicy.java


main/launcher/src/main/java/org/cryptomator/logging/LoggerConfiguration.java → src/main/java/org/cryptomator/logging/LoggerConfiguration.java


main/launcher/src/main/java/org/cryptomator/logging/LoggerModule.java → src/main/java/org/cryptomator/logging/LoggerModule.java


main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java → src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java


main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultSuccessController.java → src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultSuccessController.java


main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWelcomeController.java → src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWelcomeController.java


main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java → src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java


main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardScoped.java → src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardScoped.java


main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardWindow.java → src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardWindow.java


main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java → src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java


main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java → src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java


main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java → src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java


main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java → src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java


main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultRecoveryKeyController.java → src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultRecoveryKeyController.java


main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java → src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java


main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java → src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java


+ 0 - 0
main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordComponent.java


部分文件因为文件数量过多而无法显示