Skip to content

Commit f7cabd4

Browse files
authored
Update to dbus-java 4.2.1
Removes JNR-Dependency
2 parents 2c95e73 + d487356 commit f7cabd4

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@
3939
<project.jdk.version>19</project.jdk.version>
4040

4141
<!-- runtime dependencies -->
42+
4243
<api.version>1.2.0-beta4</api.version>
43-
<secret-service.version>1.7.0</secret-service.version>
44-
<kdewallet.version>1.2.6</kdewallet.version>
44+
<secret-service.version>1.8.1-jdk17</secret-service.version>
45+
<kdewallet.version>1.2.8</kdewallet.version>
4546
<guava.version>31.1-jre</guava.version>
4647
<slf4j.version>1.7.36</slf4j.version>
4748

@@ -94,7 +95,7 @@
9495
<artifactId>maven-compiler-plugin</artifactId>
9596
<version>3.9.0</version>
9697
<configuration>
97-
<release>17</release>
98+
<release>19</release>
9899
</configuration>
99100
</plugin>
100101
<plugin>

src/main/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccess.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.cryptomator.integrations.keychain.KeychainAccessException;
77
import org.cryptomator.integrations.keychain.KeychainAccessProvider;
88
import org.freedesktop.dbus.connections.impl.DBusConnection;
9+
import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder;
910
import org.freedesktop.dbus.exceptions.DBusConnectionException;
1011
import org.freedesktop.dbus.exceptions.DBusException;
1112
import org.kde.KWallet;
@@ -89,11 +90,11 @@ static Optional<ConnectedWallet> connect() {
8990

9091
private static DBusConnection getNewConnection() throws DBusException {
9192
try {
92-
return DBusConnection.newConnection(DBusConnection.DBusBusType.SESSION);
93+
return DBusConnectionBuilder.forSessionBus().withShared(false).build();
9394
} catch (DBusConnectionException ce) {
9495
LOG.warn("SESSION DBus not found, falling back to SYSTEM DBus");
9596
try {
96-
return DBusConnection.newConnection(DBusConnection.DBusBusType.SYSTEM);
97+
return DBusConnectionBuilder.forSystemBus().build();
9798
} catch (DBusException e) {
9899
throw e;
99100
}

0 commit comments

Comments
 (0)