Merge branch 'release/1.4.0'

Author: infeo

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 24
           cache: 'maven'
       - name: Ensure to use tagged version
         if: startsWith(github.ref, 'refs/tags/')

.github/workflows/codeql-analysis.yml

@@ -22,7 +22,7 @@ jobs:
     - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 24
         cache: 'maven'
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3

.github/workflows/dependency-check.yml

@@ -14,7 +14,7 @@ jobs:
     with:
       runner-os: 'macos-latest'
       java-distribution: 'temurin'
-      java-version: 21
+      java-version: 24
     secrets:
       nvd-api-key: ${{ secrets.NVD_API_KEY }}
       slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/publish-central.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 24
           cache: 'maven'
           server-id: central
           server-username: MAVEN_CENTRAL_USERNAME

.github/workflows/publish-github.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 24
           cache: 'maven'
       - name: Enforce project version ${{ github.event.release.tag_name }}
         run: mvn versions:set -B -DnewVersion=${{ github.event.release.tag_name }}

.idea/misc.xml

@@ -6,6 +6,6 @@ macOS-specific implementations of [integrations-api](https://github.com/cryptoma
 
 Since this project involves JNI, you need Java as well as Xcode build tools:
 
-* JDK 17
+* JDK 24
 * Maven
 * XCode Command Line Tools (run `xcode-select --install`)

README.md

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>integrations-mac</artifactId>
-	<version>1.3.2</version>
+	<version>1.4.0</version>
 
 	<name>Cryptomator Integrations for macOS</name>
 	<description>Provides optional macOS services used by Cryptomator</description>
@@ -29,18 +29,18 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.jdk.version>17</project.jdk.version>
+		<project.jdk.version>24</project.jdk.version>
 
 		<!-- runtime dependencies -->
-		<api.version>1.5.1</api.version>
+		<api.version>1.6.0</api.version>
 		<slf4j.version>2.0.17</slf4j.version>
 
 		<!-- test dependencies -->
-		<junit.jupiter.version>5.12.1</junit.jupiter.version>
-		<mockito.version>5.16.1</mockito.version>
+		<junit.jupiter.version>5.12.2</junit.jupiter.version>
+		<mockito.version>5.17.0</mockito.version>
 
 		<!-- build plugin dependencies -->
-		<dependency-check.version>12.1.0</dependency-check.version>
+		<dependency-check.version>12.1.1</dependency-check.version>
 		<central-publishing.version>0.7.0</central-publishing.version>
 	</properties>
 

pom.xml

@@ -1,10 +1,10 @@
 package org.cryptomator.macos.keychain;
 
+import org.cryptomator.integrations.common.LocalizedDisplayName;
 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.cryptomator.macos.common.Localization;
 
 /**
  * Stores passwords in the macOS system keychain.
@@ -14,6 +14,7 @@
  */
 @Priority(1000)
 @OperatingSystem(OperatingSystem.Value.MAC)
+@LocalizedDisplayName(bundle = "MacIntegrationsBundle", key = "org.cryptomator.macos.keychain.displayName")
 public class MacSystemKeychainAccess implements KeychainAccessProvider {
 
 	private static final String SERVICE_NAME = System.getProperty("cryptomator.integrationsMac.keychainServiceName", "Cryptomator");
@@ -29,21 +30,11 @@ public MacSystemKeychainAccess() {
 		this.keychain = keychain;
 	}
 
-	@Override
-	public String displayName() {
-		return Localization.get().getString("org.cryptomator.macos.keychain.displayName");
-	}
-
 	@Override
 	public void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
 		keychain.storePassword(SERVICE_NAME, key, passphrase, false);
 	}
 
-	@Override
-	public void storePassphrase(String key, String displayName, CharSequence passphrase, boolean requireOsAuthentication) throws KeychainAccessException {
-		keychain.storePassword(SERVICE_NAME, key, passphrase, requireOsAuthentication);
-	}
-
 	@Override
 	public char[] loadPassphrase(String key) {
 		return keychain.loadPassword(SERVICE_NAME, key);

src/main/java/org/cryptomator/macos/keychain/MacSystemKeychainAccess.java

@@ -1,10 +1,10 @@
 package org.cryptomator.macos.keychain;
 
+import org.cryptomator.integrations.common.LocalizedDisplayName;
 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.cryptomator.macos.common.Localization;
 
 /**
  * Stores passwords in the macOS system keychain. Requires an authenticated user to do so.
@@ -15,6 +15,7 @@
  */
 @Priority(1010)
 @OperatingSystem(OperatingSystem.Value.MAC)
+@LocalizedDisplayName(bundle = "MacIntegrationsBundle", key = "org.cryptomator.macos.keychain.touchIdDisplayName")
 public class TouchIdKeychainAccess implements KeychainAccessProvider {
 
 	private static final String SERVICE_NAME = System.getProperty("cryptomator.integrationsMac.keychainServiceName", "Cryptomator");
@@ -30,21 +31,11 @@ public TouchIdKeychainAccess() {
 		this.keychain = keychain;
 	}
 
-	@Override
-	public String displayName() {
-		return Localization.get().getString("org.cryptomator.macos.keychain.touchIdDisplayName");
-	}
-
 	@Override
 	public void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
 		keychain.storePassword(SERVICE_NAME, key, passphrase, true);
 	}
 
-	@Override
-	public void storePassphrase(String key, String displayName, CharSequence passphrase, boolean requireOsAuthentication) throws KeychainAccessException {
-		keychain.storePassword(SERVICE_NAME, key, passphrase, requireOsAuthentication);
-	}
-
 	@Override
 	public char[] loadPassphrase(String key) {
 		return keychain.loadPassword(SERVICE_NAME, key);