Merge branch 'develop' into release/1.4.0

cryptomator · Oct 16, 2023 · 1805df1 · 1805df1
2 parents 5e789bd + abd4d70
commit 1805df1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -41,10 +41,10 @@
  <!-- runtime dependencies -->
 
  <api.version>1.3.0</api.version>
- <secret-service.version>1.8.1-jdk17</secret-service.version>
+ <secret-service.version>2.0.0-alpha</secret-service.version>
  <kdewallet.version>1.3.2</kdewallet.version>
  <appindicator.version>1.3.6</appindicator.version>
- <guava.version>32.1.2-jre</guava.version>
+ <guava.version>32.1.3-jre</guava.version>
  <slf4j.version>2.0.9</slf4j.version>
  <commons-lang3.version>3.13.0</commons-lang3.version>
 

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -14,7 +14,7 @@
  requires org.freedesktop.dbus;
  requires org.purejava.appindicator;
  requires org.purejava.kwallet;
- requires secret.service;
+ requires de.swiesend.secretservice;
 
  provides KeychainAccessProvider with SecretServiceKeychainAccess, KDEWalletKeychainAccess;
  provides RevealPathService with DBusSendRevealPathService;

diff --git a/src/main/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccess.java b/src/main/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccess.java
@@ -1,12 +1,11 @@
 package org.cryptomator.linux.keychain;
 
+import de.swiesend.secretservice.simple.SimpleCollection;
 import org.cryptomator.integrations.common.OperatingSystem;
 import org.cryptomator.integrations.common.Priority;
 import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
-import org.freedesktop.dbus.exceptions.DBusConnectionException;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
-import org.freedesktop.secret.simple.SimpleCollection;
 
 import java.io.IOException;
 import java.util.List;