export shaded bouncycastle packages that are exposed to public API

Author: overheadhunter

pom.xml

@@ -41,10 +41,10 @@
 
 		<!-- test dependencies -->
 		<junit.version>5.7.1</junit.version>
-		<mockito.version>3.7.7</mockito.version>
-		<jmh.version>1.27</jmh.version>
+		<mockito.version>3.10.0</mockito.version>
+		<jmh.version>1.31</jmh.version>
 		<hamcrest.version>2.2</hamcrest.version>
-		<guava.version>30.1-jre</guava.version>
+		<guava.version>30.1.1-jre</guava.version>
 	</properties>
 
 	<dependencies>

src/main/java/org/cryptomator/siv/SivMode.java

@@ -17,7 +17,6 @@
 
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.SecretKey;
-import java.nio.ByteBuffer;
 import java.security.Provider;
 import java.util.Arrays;
 

src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/Placeholder.java

@@ -0,0 +1,8 @@
+package org.cryptomator.siv.org.bouncycastle.crypto;
+
+/**
+ * module-info will be evaluated before maven-shade-plugin, so we need this placeholder
+ * to avoid complaints about this package being empty.
+ */
+class Placeholder {
+}

src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/macs/Placeholder.java

@@ -0,0 +1,8 @@
+package org.cryptomator.siv.org.bouncycastle.crypto.macs;
+
+/**
+ * module-info will be evaluated before maven-shade-plugin, so we need this placeholder
+ * to avoid complaints about this package being empty.
+ */
+class Placeholder {
+}

src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/modes/Placeholder.java

@@ -0,0 +1,8 @@
+package org.cryptomator.siv.org.bouncycastle.crypto.modes;
+
+/**
+ * module-info will be evaluated before maven-shade-plugin, so we need this placeholder
+ * to avoid complaints about this package being empty.
+ */
+class Placeholder {
+}

src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/paddings/Placeholder.java

@@ -0,0 +1,8 @@
+package org.cryptomator.siv.org.bouncycastle.crypto.paddings;
+
+/**
+ * module-info will be evaluated before maven-shade-plugin, so we need this placeholder
+ * to avoid complaints about this package being empty.
+ */
+class Placeholder {
+}

src/main/java/org/cryptomator/siv/org/bouncycastle/crypto/params/Placeholder.java

@@ -0,0 +1,8 @@
+package org.cryptomator.siv.org.bouncycastle.crypto.params;
+
+/**
+ * module-info will be evaluated before maven-shade-plugin, so we need this placeholder
+ * to avoid complaints about this package being empty.
+ */
+class Placeholder {
+}

src/main/java/org/cryptomator/siv/org/bouncycastle/util/Placeholder.java

@@ -0,0 +1,8 @@
+package org.cryptomator.siv.org.bouncycastle.util;
+
+/**
+ * module-info will be evaluated before maven-shade-plugin, so we need this placeholder
+ * to avoid complaints about this package being empty.
+ */
+class Placeholder {
+}

src/main/java9/module-info.java

@@ -1,4 +1,11 @@
 module org.cryptomator.siv {
-	exports org.cryptomator.siv;
 	requires static org.bouncycastle.provider;
+
+	exports org.cryptomator.siv;
+	exports org.cryptomator.siv.org.bouncycastle.crypto;
+	exports org.cryptomator.siv.org.bouncycastle.crypto.macs;
+	exports org.cryptomator.siv.org.bouncycastle.crypto.modes;
+	exports org.cryptomator.siv.org.bouncycastle.crypto.paddings;
+	exports org.cryptomator.siv.org.bouncycastle.crypto.params;
+	exports org.cryptomator.siv.org.bouncycastle.util;
 }