Browse Source

include system integration lib automatically depending on current OS

Sebastian Stenzel 4 years ago
parent
commit
51e43a0567
2 changed files with 73 additions and 2 deletions
  1. 4 0
      main/commons/pom.xml
  2. 69 2
      main/pom.xml

+ 4 - 0
main/commons/pom.xml

@@ -27,6 +27,10 @@
 			<groupId>org.cryptomator</groupId>
 			<artifactId>webdav-nio-adapter</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>integrations-api</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.cryptomator</groupId>
 			<artifactId>jni</artifactId>

+ 69 - 2
main/pom.xml

@@ -25,6 +25,10 @@
 
 		<!-- cryptomator dependencies -->
 		<cryptomator.cryptofs.version>1.9.12</cryptomator.cryptofs.version>
+		<cryptomator.integrations.version>0.1.4</cryptomator.integrations.version>
+		<cryptomator.integrations.win.version>0.1.0-beta1</cryptomator.integrations.win.version>
+		<cryptomator.integrations.mac.version>0.1.0-beta1</cryptomator.integrations.mac.version>
+		<cryptomator.integrations.linux.version>0.1.0-beta1</cryptomator.integrations.linux.version>
 		<cryptomator.jni.version>2.2.3</cryptomator.jni.version>
 		<cryptomator.fuse.version>1.2.5</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.1.15</cryptomator.dokany.version>
@@ -107,6 +111,26 @@
 				<version>${cryptomator.webdav.version}</version>
 			</dependency>
 			<dependency>
+				<groupId>org.cryptomator</groupId>
+				<artifactId>integrations-api</artifactId>
+				<version>${cryptomator.integrations.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.cryptomator</groupId>
+				<artifactId>integrations-win</artifactId>
+				<version>${cryptomator.integrations.win.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.cryptomator</groupId>
+				<artifactId>integrations-mac</artifactId>
+				<version>${cryptomator.integrations.mac.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.cryptomator</groupId>
+				<artifactId>integrations-linux</artifactId>
+				<version>${cryptomator.integrations.linux.version}</version>
+			</dependency>
+			<dependency> <!-- deprecated: will be replaced by integrations-api -->
 				<groupId>org.cryptomator</groupId>
 				<artifactId>jni</artifactId>
 				<version>${cryptomator.jni.version}</version>
@@ -164,12 +188,12 @@
 			</dependency>
 
 			<!-- Linux System Keychain -->
-			<dependency>
+			<dependency> <!-- deprecated: will be replaced by integrations-api -->
 				<groupId>de.swiesend</groupId>
 				<artifactId>secret-service</artifactId>
 				<version>${secret-service.version}</version>
 			</dependency>
-			<dependency>
+			<dependency> <!-- deprecated: will be replaced by integrations-api -->
 				<groupId>org.purejava</groupId>
 				<artifactId>kdewallet</artifactId>
 				<version>${kdewallet.version}</version>
@@ -279,6 +303,49 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>mac</id>
+			<activation>
+				<os>
+					<family>mac</family>
+				</os>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.cryptomator</groupId>
+					<artifactId>integrations-mac</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>linux</id>
+			<activation>
+				<os>
+					<family>unix</family>
+					<name>Linux</name>
+				</os>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.cryptomator</groupId>
+					<artifactId>integrations-linux</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>windows</id>
+			<activation>
+				<os>
+					<family>windows</family>
+				</os>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.cryptomator</groupId>
+					<artifactId>integrations-win</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
 	</profiles>
 
 	<build>