dorkbox
/
Serializers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update libraries, WIP JPMS

master
Robinson 2022-01-06 23:43:22 -07:00
parent ae94895d56
commit 0666990273
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
build.gradle.kts
View File

@ -26,12 +26,12 @@ import java.time.Instant
gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS // always show the stacktrace!
plugins {
id("com.dorkbox.GradleUtils") version "2.9"
id("com.dorkbox.Licensing") version "2.9.2"
id("com.dorkbox.GradleUtils") version "2.16"
id("com.dorkbox.Licensing") version "2.10"
id("com.dorkbox.VersionUpdate") version "2.4"
id("com.dorkbox.GradlePublish") version "1.11"
id("com.dorkbox.GradlePublish") version "1.12"
kotlin("jvm") version "1.5.21"
kotlin("jvm") version "1.6.10"
}
object Extras {
@ -74,12 +74,25 @@ licensing {
}
}
sourceSets.main {
kotlin.include("**/*.java", "**/*.kt") // we have some java we depend on
}
kotlin {
sourceSets {
main {
kotlin {
// setSrcDirs(listOf("src"))
sourceSets.test {
kotlin.include("**/*.java", "**/*.kt") // we have some java we depend on for unit tests
// want to include kotlin files for the source. 'setSrcDirs' resets includes...
include("**/*.java", "**/*.kt")
}
}
test {
kotlin {
// setSrcDirs(listOf("src", "test"))
// want to include kotlin files for the source. 'setSrcDirs' resets includes...
include("**/*.java", "**/*.kt")
}
}
}
}
@ -99,12 +112,12 @@ tasks.jar.get().apply {
}
dependencies {
implementation("com.dorkbox:Updates:1.1")
api("com.dorkbox:Updates:1.1")
implementation("com.esotericsoftware:kryo:5.2.0")
api("com.esotericsoftware:kryo:5.2.1")
// listed as compile only, since we will be optionally be using bouncy castle if we use this project. **We don't want a hard dependency.**
compileOnly("org.bouncycastle:bcprov-jdk15on:1.69")
compileOnly("org.bouncycastle:bcprov-jdk15on:1.70")
testImplementation("org.bouncycastle:bcprov-jdk15on:1.69")
testImplementation("junit:junit:4.13.2")

10
src9/module-info.java
View File

@ -2,14 +2,12 @@ module dorkbox.serializers {
exports dorkbox.serializers;
exports dorkbox.serializers.bouncycastle;
requires dorkbox.updates;
requires transitive dorkbox.updates;
requires com.esotericsoftware.kryo;
requires com.esotericsoftware.reflectasm;
requires transitive com.esotericsoftware.kryo;
requires transitive com.esotericsoftware.reflectasm;
requires static org.bouncycastle.provider;
requires kotlin.stdlib;
requires java.base;
requires transitive kotlin.stdlib;
}