diff --git a/LICENSE b/LICENSE index 78912a1..5221402 100644 --- a/LICENSE +++ b/LICENSE @@ -12,6 +12,14 @@ Martin Grotzke Rafael Winterhalter + - Kotlin - + [The Apache Software License, Version 2.0] + https://github.com/JetBrains/kotlin + Copyright 2020 + JetBrains s.r.o. and Kotlin Programming Language contributors + Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply + See: https://github.com/JetBrains/kotlin/blob/master/license/README.md + - Kryo - Fast and efficient binary object graph serialization framework for Java [BSD 3-Clause License] https://github.com/EsotericSoftware/kryo diff --git a/build.gradle.kts b/build.gradle.kts index e2bbd98..53e9991 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,6 +14,7 @@ * limitations under the License. */ +import dorkbox.gradle.kotlin import java.time.Instant /////////////////////////////// @@ -54,7 +55,6 @@ object Extras { /////////////////////////////// GradleUtils.load("$projectDir/../../gradle.properties", Extras) GradleUtils.defaults() -//GradleUtils.compileConfiguration(JavaVersion.VERSION_11) GradleUtils.compileConfiguration(JavaVersion.VERSION_1_8) GradleUtils.jpms(JavaVersion.VERSION_1_9) @@ -74,6 +74,15 @@ licensing { } } +sourceSets.main { + kotlin.include("**/*.java", "**/*.kt") // we have some java we depend on +} + +sourceSets.test { + kotlin.include("**/*.java", "**/*.kt") // we have some java we depend on for unit tests +} + + tasks.jar.get().apply { manifest { // https://docs.oracle.com/javase/tutorial/deployment/jar/packageman.html @@ -97,6 +106,11 @@ dependencies { // listed as compile only, since we will be using bouncy castle ANYWAYS if we use this project. **We don't want a hard dependency.** compileOnly("org.bouncycastle:bcprov-jdk15on:1.68") + + + testImplementation("com.esotericsoftware:kryo:5.1.1") + testImplementation("org.bouncycastle:bcprov-jdk15on:1.68") + testImplementation("junit:junit:4.13.2") } publishToSonatype {