Merge remote-tracking branch 'origin/master'

# Conflicts:
#	LICENSE
#	build.gradle.kts
#	src/dorkbox/util/collections/ConcurrentWeakIdentityHashMap.java
This commit is contained in:
Robinson 2022-03-03 00:57:27 +01:00
commit 1fc31973c6
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
2 changed files with 5 additions and 6 deletions

View File

@ -232,7 +232,7 @@ dependencies {
compileOnly("io.netty:netty-buffer:4.1.74.Final")
val bcVersion = "1.70"
val bcVersion = "1.69"
compileOnly("org.bouncycastle:bcprov-jdk15on:$bcVersion")
compileOnly("org.bouncycastle:bcpg-jdk15on:$bcVersion")
compileOnly("org.bouncycastle:bcmail-jdk15on:$bcVersion")

View File

@ -23,15 +23,14 @@ module dorkbox.utilities {
exports dorkbox.util.swing;
exports dorkbox.util.userManagement;
requires dorkbox.executor;
requires dorkbox.updates;
requires transitive dorkbox.executor;
requires transitive dorkbox.updates;
requires transitive kotlin.stdlib;
requires static com.sun.jna;
requires static com.sun.jna.platform;
requires static org.slf4j;
requires static java.desktop;
requires java.base;
requires kotlin.stdlib;
}