Merge branch 'release/1.3.2'

Author: infeo

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>integrations-mac</artifactId>
-	<version>1.3.1</version>
+	<version>1.3.2</version>
 
 	<name>Cryptomator Integrations for macOS</name>
 	<description>Provides optional macOS services used by Cryptomator</description>
@@ -36,8 +36,8 @@
 		<slf4j.version>2.0.17</slf4j.version>
 
 		<!-- test dependencies -->
-		<junit.jupiter.version>5.12.0</junit.jupiter.version>
-		<mockito.version>5.15.2</mockito.version>
+		<junit.jupiter.version>5.12.1</junit.jupiter.version>
+		<mockito.version>5.16.1</mockito.version>
 
 		<!-- build plugin dependencies -->
 		<dependency-check.version>12.1.0</dependency-check.version>
@@ -150,6 +150,7 @@
 				<version>3.5.0</version>
 				<executions>
 					<execution>
+						<id>xcode-build-intel</id>
 						<goals>
 							<goal>exec</goal>
 						</goals>
@@ -164,15 +165,62 @@
 								<argument>Integrations</argument>
 								<argument>-configuration</argument>
 								<argument>Release</argument>
+								<argument>-arch</argument>
+								<argument>x86_64</argument>
 								<argument>-archivePath</argument>
-								<argument>${project.build.directory}/integrations.xcarchive</argument>
+								<argument>${project.build.directory}/integrations-x86_64.xcarchive</argument>
 								<argument>-quiet</argument>
 								<argument>clean</argument>
 								<argument>archive</argument>
 								<argument>JAVA_HOME="${java.home}"</argument>
 							</arguments>
 						</configuration>
 					</execution>
+					<execution>
+						<id>xcode-build-arm</id>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<phase>compile</phase>
+						<configuration>
+							<executable>xcodebuild</executable>
+							<workingDirectory>${project.basedir}/src/main/native</workingDirectory>
+							<arguments>
+								<argument>-project</argument>
+								<argument>Integrations.xcodeproj</argument>
+								<argument>-scheme</argument>
+								<argument>Integrations</argument>
+								<argument>-configuration</argument>
+								<argument>Release</argument>
+								<argument>-arch</argument>
+								<argument>arm64</argument>
+								<argument>-archivePath</argument>
+								<argument>${project.build.directory}/integrations-arm64.xcarchive</argument>
+								<argument>-quiet</argument>
+								<argument>clean</argument>
+								<argument>archive</argument>
+								<argument>JAVA_HOME="${java.home}"</argument>
+							</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>build-universal-binary</id>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<phase>compile</phase>
+						<configuration>
+							<executable>lipo</executable>
+							<workingDirectory>${project.build.directory}</workingDirectory>
+							<arguments>
+								<argument>-create</argument>
+								<argument>integrations-x86_64.xcarchive/Products/usr/local/lib/libIntegrations.dylib</argument>
+								<argument>integrations-arm64.xcarchive/Products/usr/local/lib/libIntegrations.dylib</argument>
+								<argument>-output</argument>
+								<argument>libIntegrations.dylib</argument>
+							</arguments>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
@@ -188,9 +236,9 @@
 							<outputDirectory>${project.build.directory}/classes</outputDirectory>
 							<resources>
 								<resource>
-									<directory>${project.build.directory}/integrations.xcarchive/Products/usr/local/lib</directory>
+									<directory>${project.build.directory}</directory>
 									<includes>
-										<include>*.dylib</include>
+										<include>libIntegrations.dylib</include>
 									</includes>
 								</resource>
 							</resources>
@@ -201,7 +249,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.5.2</version>
+				<version>3.5.3</version>
 			</plugin>
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>

src/main/resources/MacIntegrationsBundle_lv.properties

@@ -1 +1,2 @@
-org.cryptomator.macos.keychain.displayName=macOS Keychain
+org.cryptomator.macos.keychain.displayName=macOS Keychain
+org.cryptomator.macos.keychain.touchIdDisplayName=Touch ID