From b539590d7a29b1378bacfb415275584594af0993 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 17 Jan 2019 11:07:01 +0100 Subject: [PATCH 1/3] updated IDE settings and removed duplicate gitignore [ci skip] --- .idea/compiler.xml | 19 ++++++++++++++++++- main/ant-kit/.gitignore | 1 - 2 files changed, 18 insertions(+), 2 deletions(-) delete mode 100644 main/ant-kit/.gitignore diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 69fb739cd..eb6e630bd 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,10 +2,27 @@ - + + + + + + + + + + + + + + + + + + diff --git a/main/ant-kit/.gitignore b/main/ant-kit/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/main/ant-kit/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ From 9cc873a3447abdf1587df80bbd8a08ad683297f3 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 17 Jan 2019 11:38:48 +0100 Subject: [PATCH 2/3] No longer assigning drive letters A-C to fix problems with older Dokany versions --- .../org/cryptomator/ui/model/WindowsDriveLetters.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/WindowsDriveLetters.java b/main/ui/src/main/java/org/cryptomator/ui/model/WindowsDriveLetters.java index 41b6799ba..4c2c3111e 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/WindowsDriveLetters.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/WindowsDriveLetters.java @@ -22,11 +22,11 @@ import org.apache.commons.lang3.SystemUtils; @Singleton public final class WindowsDriveLetters { - private static final Set A_TO_Z; + private static final Set D_TO_Z; static { - try (IntStream stream = IntStream.rangeClosed('A', 'Z')) { - A_TO_Z = stream.mapToObj(i -> (char) i).collect(Collectors.toSet()); + try (IntStream stream = IntStream.rangeClosed('D', 'Z')) { + D_TO_Z = stream.mapToObj(i -> (char) i).collect(Collectors.toSet()); } } @@ -45,7 +45,7 @@ public final class WindowsDriveLetters { public Set getAvailableDriveLetters() { Set occupiedDriveLetters = getOccupiedDriveLetters(); Predicate isOccupiedDriveLetter = occupiedDriveLetters::contains; - return A_TO_Z.stream().filter(isOccupiedDriveLetter.negate()).collect(Collectors.toSet()); + return D_TO_Z.stream().filter(isOccupiedDriveLetter.negate()).collect(Collectors.toSet()); } } From 6167eeecb4d48b68132c65a791915b7cde48aeaf Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 17 Jan 2019 13:00:36 +0100 Subject: [PATCH 3/3] Preparing 1.4.2 --- main/ant-kit/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/keychain/pom.xml | 2 +- main/launcher/pom.xml | 2 +- main/pom.xml | 2 +- main/uber-jar/pom.xml | 2 +- main/ui/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml index 090e5142c..7b9301ebf 100644 --- a/main/ant-kit/pom.xml +++ b/main/ant-kit/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.2 ant-kit pom diff --git a/main/commons/pom.xml b/main/commons/pom.xml index 723568fa6..002de7da5 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.2 commons Cryptomator Commons diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index 8ae41d506..5e5e28e22 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.2 keychain System Keychain Access diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml index aef980622..e98029baa 100644 --- a/main/launcher/pom.xml +++ b/main/launcher/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.2 launcher Cryptomator Launcher diff --git a/main/pom.xml b/main/pom.xml index d50465fc2..1f792c630 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.2 pom Cryptomator diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml index fa28bfada..8b33a18f4 100644 --- a/main/uber-jar/pom.xml +++ b/main/uber-jar/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.2 uber-jar Single über jar with all dependencies diff --git a/main/ui/pom.xml b/main/ui/pom.xml index a613c2b01..b7a12ea50 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.2 ui Cryptomator GUI