Merge branch 'release/2.0.0' into release/2.1.0

Author: overheadhunter

pom.xml

@@ -18,20 +18,20 @@
 		<maven.compiler.release>16</maven.compiler.release>
 
 		<!-- dependencies -->
-		<cryptolib.version>2.0.0-rc2</cryptolib.version>
+		<cryptolib.version>2.0.0-rc5</cryptolib.version>
 		<jwt.version>3.15.0</jwt.version>
-		<dagger.version>2.35.1</dagger.version>
+		<dagger.version>2.37</dagger.version>
 		<guava.version>30.1.1-jre</guava.version>
-		<slf4j.version>1.7.30</slf4j.version>
+		<slf4j.version>1.7.31</slf4j.version>
 
 		<!-- test dependencies -->
 		<junit.jupiter.version>5.7.2</junit.jupiter.version>
-		<mockito.version>3.10.0</mockito.version>
+		<mockito.version>3.11.2</mockito.version>
 		<hamcrest.version>2.2</hamcrest.version>
 
 		<!-- build plugin dependencies -->
-		<dependency-check.version>6.1.6</dependency-check.version>
-		<jacoco.version>0.8.6</jacoco.version>
+		<dependency-check.version>6.2.2</dependency-check.version>
+		<jacoco.version>0.8.7</jacoco.version>
 		<nexus-staging.version>1.6.8</nexus-staging.version>
 	</properties>
 

src/main/java/module-info.java

@@ -8,11 +8,16 @@
 	requires transitive org.cryptomator.cryptolib;
 	requires com.google.common;
 	requires org.slf4j;
+	requires dagger;
 
 	/* TODO: filename-based modules: */
 	requires java.jwt;
-	requires dagger;
-	requires static javax.inject; // probably no longer needed if dagger is an automatic module (but might require --patch-module in case of split packages)
+
+	// filename-based module required by dagger
+	// we will probably need to live with this for a while:
+	// https://github.com/javax-inject/javax-inject/issues/33
+	// May be provided by another lib during runtime
+	requires static javax.inject;
 
 	exports org.cryptomator.cryptofs;
 	exports org.cryptomator.cryptofs.common;