Merge remote-tracking branch 'origin/master'
# Conflicts: # LICENSE # build.gradle.kts # src/dorkbox/util/collections/ConcurrentWeakIdentityHashMap.java
This commit is contained in:
commit
1fc31973c6
@ -232,7 +232,7 @@ dependencies {
|
|||||||
|
|
||||||
compileOnly("io.netty:netty-buffer:4.1.74.Final")
|
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:bcprov-jdk15on:$bcVersion")
|
||||||
compileOnly("org.bouncycastle:bcpg-jdk15on:$bcVersion")
|
compileOnly("org.bouncycastle:bcpg-jdk15on:$bcVersion")
|
||||||
compileOnly("org.bouncycastle:bcmail-jdk15on:$bcVersion")
|
compileOnly("org.bouncycastle:bcmail-jdk15on:$bcVersion")
|
||||||
|
@ -23,15 +23,14 @@ module dorkbox.utilities {
|
|||||||
exports dorkbox.util.swing;
|
exports dorkbox.util.swing;
|
||||||
exports dorkbox.util.userManagement;
|
exports dorkbox.util.userManagement;
|
||||||
|
|
||||||
requires dorkbox.executor;
|
requires transitive dorkbox.executor;
|
||||||
requires dorkbox.updates;
|
requires transitive dorkbox.updates;
|
||||||
|
|
||||||
|
requires transitive kotlin.stdlib;
|
||||||
|
|
||||||
requires static com.sun.jna;
|
requires static com.sun.jna;
|
||||||
requires static com.sun.jna.platform;
|
requires static com.sun.jna.platform;
|
||||||
|
|
||||||
requires static org.slf4j;
|
requires static org.slf4j;
|
||||||
requires static java.desktop;
|
requires static java.desktop;
|
||||||
|
|
||||||
requires java.base;
|
|
||||||
requires kotlin.stdlib;
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user