Merge branch 'release/1.1.0'

.github/workflows/build.yml

@@ -8,23 +8,19 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2
         with:
-          java-version: 11
-      - uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'maven'
       - name: Ensure to use tagged version
         if: startsWith(github.ref, 'refs/tags/')
         shell: bash
         run: |
           mvn versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
       - name: Build and Test
         id: buildAndTest
-        run: mvn -B clean install
+        run: mvn -B clean install -Pdependency-check
       - uses: actions/upload-artifact@v2
         with:
           name: artifacts

.github/workflows/codeql-analysis.yml

@@ -18,15 +18,11 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 2
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
-        java-version: 11
-    - uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-
+        distribution: 'temurin'
+        java-version: 17
+        cache: 'maven'
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:

.github/workflows/publish-central.yml

@@ -13,25 +13,26 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: "refs/tags/${{ github.event.inputs.tag }}"
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'maven'
           server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
           server-username: MAVEN_USERNAME # env variable for username in deploy
           server-password: MAVEN_PASSWORD # env variable for token in deploy
           gpg-private-key: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
-      - uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
       - name: Enforce project version ${{ github.event.inputs.tag }}
         run: mvn versions:set -B -DnewVersion=${{ github.event.inputs.tag }}
       - name: Deploy
         run: mvn deploy -B -DskipTests -Psign,deploy-central --no-transfer-progress
         env:
+          MAVEN_OPTS: >
+            --add-opens=java.base/java.util=ALL-UNNAMED
+            --add-opens=java.base/java.lang.reflect=ALL-UNNAMED
+            --add-opens=java.base/java.text=ALL-UNNAMED
+            --add-opens=java.desktop/java.awt.font=ALL-UNNAMED
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}

.github/workflows/publish-github.yml

@@ -8,17 +8,13 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/') # only allow publishing tagged versions
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'maven'
           gpg-private-key: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
-      - uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
       - name: Enforce project version ${{ github.event.release.tag_name }}
         run: mvn versions:set -B -DnewVersion=${{ github.event.release.tag_name }}
       - name: Deploy

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>integrations-mac</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 
 	<name>Cryptomator Integrations for macOS</name>
 	<description>Provides optional macOS services used by Cryptomator</description>
@@ -27,16 +27,19 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.jdk.version>17</project.jdk.version>
 
 		<!-- runtime dependencies -->
-		<api.version>1.0.0</api.version>
-		<slf4j.version>1.7.32</slf4j.version>
-		<guava.version>31.0-jre</guava.version>
-		<gson.version>2.8.8</gson.version>
+		<api.version>1.1.0</api.version>
+		<slf4j.version>1.7.36</slf4j.version>
 
 		<!-- test dependencies -->
-		<junit.jupiter.version>5.8.1</junit.jupiter.version>
-		<mockito.version>3.12.4</mockito.version>
+		<junit.jupiter.version>5.8.2</junit.jupiter.version>
+		<mockito.version>4.4.0</mockito.version>
+
+		<!-- build plugin dependencies -->
+		<dependency-check.version>7.0.0</dependency-check.version>
+		<nexus-staging.version>1.6.8</nexus-staging.version>
 	</properties>
 
 	<licenses>
@@ -58,16 +61,6 @@
 			<artifactId>slf4j-api</artifactId>
 			<version>${slf4j.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>${gson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>${guava.version}</version>
-		</dependency>
 
 		<!-- JUnit / Mockito / Hamcrest -->
 		<dependency>
@@ -111,13 +104,13 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
+				<version>3.10.1</version>
 				<configuration>
 					<compilerArgs>
 						<arg>-h</arg>
 						<arg>${project.basedir}/src/main/headers</arg>
 					</compilerArgs>
-					<release>11</release>
+					<release>${project.jdk.version}</release>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -222,7 +215,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.3.1</version>
+				<version>3.3.2</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -233,7 +226,7 @@
 				</executions>
 				<configuration>
 					<quiet>true</quiet>
-					<release>11</release>
+					<release>${project.jdk.version}</release>
 					<tags>
 						<!-- workaround for "unknown tag: implNote", see https://blog.codefx.org/java/new-javadoc-tags/#Maven  -->
 						<tag>
@@ -279,6 +272,33 @@
 	</build>
 
 	<profiles>
+		<profile>
+			<id>dependency-check</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.owasp</groupId>
+						<artifactId>dependency-check-maven</artifactId>
+						<version>${dependency-check.version}</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>
+
 		<profile>
 			<id>sign</id>
 			<build>
@@ -312,19 +332,19 @@
 				<repository>
 					<id>ossrh</id>
 					<name>Maven Central</name>
-					<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+					<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
 				</repository>
 			</distributionManagement>
 			<build>
 				<plugins>
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
 						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.6.8</version>
+						<version>${nexus-staging.version}</version>
 						<extensions>true</extensions>
 						<configuration>
 							<serverId>ossrh</serverId>
-							<nexusUrl>https://oss.sonatype.org/</nexusUrl>
+							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
 							<autoReleaseAfterClose>true</autoReleaseAfterClose>
 						</configuration>
 					</plugin>

src/main/java/module-info.java

@@ -0,0 +1,18 @@
+import org.cryptomator.integrations.autostart.AutoStartProvider;
+import org.cryptomator.integrations.keychain.KeychainAccessProvider;
+import org.cryptomator.integrations.tray.TrayIntegrationProvider;
+import org.cryptomator.integrations.uiappearance.UiAppearanceProvider;
+import org.cryptomator.macos.autostart.MacAutoStartProvider;
+import org.cryptomator.macos.keychain.MacSystemKeychainAccess;
+import org.cryptomator.macos.tray.MacTrayIntegrationProvider;
+import org.cryptomator.macos.uiappearance.MacUiAppearanceProvider;
+
+module org.cryptomator.integrations.mac {
+	requires org.cryptomator.integrations.api;
+	requires org.slf4j;
+
+	provides AutoStartProvider with MacAutoStartProvider;
+	provides KeychainAccessProvider with MacSystemKeychainAccess;
+	provides TrayIntegrationProvider with MacTrayIntegrationProvider;
+	provides UiAppearanceProvider with MacUiAppearanceProvider;
+}

src/main/java/org/cryptomator/macos/autostart/MacAutoStartProvider.java

@@ -2,7 +2,11 @@
 
 import org.cryptomator.integrations.autostart.AutoStartProvider;
 import org.cryptomator.integrations.autostart.ToggleAutoStartFailedException;
+import org.cryptomator.integrations.common.OperatingSystem;
+import org.cryptomator.integrations.common.Priority;
 
+@Priority(1000)
+@OperatingSystem(OperatingSystem.Value.MAC)
 public class MacAutoStartProvider implements AutoStartProvider {
 
 	private final MacLaunchServices launchServices;

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

@@ -1,9 +1,13 @@
 package org.cryptomator.macos.keychain;
 
+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;
 
+@Priority(1000)
+@OperatingSystem(OperatingSystem.Value.MAC)
 public class MacSystemKeychainAccess implements KeychainAccessProvider {
 
 	private final MacKeychain keychain;
@@ -23,7 +27,7 @@ public String displayName() {
 	}
 
 	@Override
-	public void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
+	public void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
 		keychain.storePassword(key, passphrase);
 	}
 
@@ -48,7 +52,7 @@ public void deletePassphrase(String key) throws KeychainAccessException {
 	}
 
 	@Override
-	public void changePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
+	public void changePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
 		if (keychain.deletePassword(key)) {
 			keychain.storePassword(key, passphrase);
 		}

src/main/java/org/cryptomator/macos/tray/MacTrayIntegrationProvider.java

@@ -1,7 +1,11 @@
 package org.cryptomator.macos.tray;
 
+import org.cryptomator.integrations.common.OperatingSystem;
+import org.cryptomator.integrations.common.Priority;
 import org.cryptomator.integrations.tray.TrayIntegrationProvider;
 
+@Priority(1000)
+@OperatingSystem(OperatingSystem.Value.MAC)
 public class MacTrayIntegrationProvider implements TrayIntegrationProvider {
 
 	private final ActivationPolicy activationPolicy;

src/main/java/org/cryptomator/macos/uiappearance/MacUiAppearanceProvider.java

@@ -1,5 +1,7 @@
 package org.cryptomator.macos.uiappearance;
 
+import org.cryptomator.integrations.common.OperatingSystem;
+import org.cryptomator.integrations.common.Priority;
 import org.cryptomator.integrations.uiappearance.Theme;
 import org.cryptomator.integrations.uiappearance.UiAppearanceException;
 import org.cryptomator.integrations.uiappearance.UiAppearanceListener;
@@ -8,6 +10,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+@Priority(1000)
+@OperatingSystem(OperatingSystem.Value.MAC)
 public class MacUiAppearanceProvider implements UiAppearanceProvider {
 
 	private final MacSystemAppearance systemAppearance;

src/main/resources/MacIntegrationsBundle_bn.properties

@@ -0,0 +1 @@
+org.cryptomator.macos.keychain.displayName=macOS এর কী চেইন

src/main/resources/MacIntegrationsBundle_he.properties

@@ -0,0 +1 @@
+org.cryptomator.macos.keychain.displayName=צרור מפתחות של macOS

src/main/resources/MacIntegrationsBundle_mk.properties

@@ -0,0 +1 @@
+org.cryptomator.macos.keychain.displayName=macOS ланец со клучеви

src/main/resources/MacIntegrationsBundle_nb.properties

@@ -1 +1 @@
-org.cryptomator.macos.keychain.displayName=macOS Keychain
+org.cryptomator.macos.keychain.displayName=macOS-nøkkelring

src/main/resources/MacIntegrationsBundle_uk.properties

@@ -0,0 +1 @@
+org.cryptomator.macos.keychain.displayName=Зв'язка ключів macOS

src/test/java/org/cryptomator/macos/keychain/KeychainAccessProviderTest.java

@@ -1,24 +1,18 @@
 package org.cryptomator.macos.keychain;
 
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
-import org.cryptomator.macos.keychain.MacSystemKeychainAccess;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-import java.util.ServiceLoader;
-
 public class KeychainAccessProviderTest {
 
 	@Test
 	@DisplayName("MacSystemKeychainAccess can be loaded")
 	public void testLoadMacSystemKeychainAccess() {
-		var loadedProviders = ServiceLoader.load(KeychainAccessProvider.class);
-		var provider = loadedProviders.stream()
-				.filter(p -> p.type().equals(MacSystemKeychainAccess.class))
-				.map(ServiceLoader.Provider::get)
-				.findAny();
+		var provider = KeychainAccessProvider.get().findAny();
 		Assertions.assertTrue(provider.isPresent());
+		Assertions.assertInstanceOf(MacSystemKeychainAccess.class, provider.get());
 	}
 
 }