Merge branch 'develop' into release/2.1.0

pom.xml

@@ -156,22 +156,6 @@
 					<encoding>UTF-8</encoding>
 					<showWarnings>true</showWarnings>
 				</configuration>
-				<executions>
-					<execution>
-						<id>java9</id>
-						<phase>compile</phase>
-						<goals>
-							<goal>compile</goal>
-						</goals>
-						<configuration>
-							<release>9</release>
-							<compileSourceRoots>
-								<compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
-							</compileSourceRoots>
-							<multiReleaseOutput>true</multiReleaseOutput>
-						</configuration>
-					</execution>
-				</executions>
 			</plugin>
 			<plugin>
 				<artifactId>maven-shade-plugin</artifactId>
@@ -210,6 +194,47 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.moditect</groupId>
+				<artifactId>moditect-maven-plugin</artifactId>
+				<version>1.0.0.RC1</version>
+				<executions>
+					<execution>
+						<id>add-module-infos</id>
+						<phase>package</phase>
+						<goals>
+							<goal>add-module-info</goal>
+						</goals>
+						<configuration>
+							<jvmVersion>9</jvmVersion>
+							<overwriteExistingFiles>true</overwriteExistingFiles>
+							<module>
+								<moduleInfoSource>
+									module org.cryptomator.cryptolib {
+										requires org.cryptomator.siv;
+										requires com.google.gson;
+										requires com.google.common;
+										requires org.slf4j;
+
+										exports org.cryptomator.cryptolib.api;
+										exports org.cryptomator.cryptolib.common;
+
+										opens org.cryptomator.cryptolib.common to com.google.gson;
+
+										uses org.cryptomator.cryptolib.api.CryptorProvider;
+
+										provides org.cryptomator.cryptolib.api.CryptorProvider
+											with org.cryptomator.cryptolib.v1.CryptorProviderImpl, org.cryptomator.cryptolib.v2.CryptorProviderImpl;
+									}
+								</moduleInfoSource>
+							</module>
+							<jdepsExtraArgs>
+								<arg>--multi-release=9</arg>
+							</jdepsExtraArgs>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>