Changed from Java6 to Java8
This commit is contained in:
nathan
parent
a1f6d29740
commit
5f31d67c07
209
build.gradle.kts
209
build.gradle.kts
@ -15,20 +15,15 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import Build_gradle.Extras.bcVersion
|
import Build_gradle.Extras.bcVersion
|
||||||
import java.nio.file.Paths
|
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
|
||||||
import java.time.Instant
|
import java.time.Instant
|
||||||
import java.util.Properties
|
import java.util.Properties
|
||||||
import kotlin.reflect.full.declaredMemberProperties
|
import kotlin.collections.ArrayList
|
||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
import kotlin.collections.component1
|
||||||
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
|
import kotlin.collections.component2
|
||||||
import org.gradle.plugins.ide.idea.model.*
|
import kotlin.collections.set
|
||||||
import org.gradle.plugins.ide.idea.model.Dependency
|
|
||||||
import org.gradle.plugins.ide.idea.model.ModuleDependency
|
|
||||||
import org.jetbrains.kotlin.backend.common.onlyIf
|
|
||||||
import java.io.*
|
|
||||||
import java.net.*
|
|
||||||
import java.nio.charset.StandardCharsets.UTF_8
|
|
||||||
import kotlin.reflect.KMutableProperty
|
import kotlin.reflect.KMutableProperty
|
||||||
|
import kotlin.reflect.full.declaredMemberProperties
|
||||||
|
|
||||||
///////////////////////////////
|
///////////////////////////////
|
||||||
////// PUBLISH TO SONATYPE / MAVEN CENTRAL
|
////// PUBLISH TO SONATYPE / MAVEN CENTRAL
|
||||||
@ -48,7 +43,6 @@ plugins {
|
|||||||
// close and release on sonatype
|
// close and release on sonatype
|
||||||
id("io.codearte.nexus-staging") version "0.20.0"
|
id("io.codearte.nexus-staging") version "0.20.0"
|
||||||
|
|
||||||
id("com.dorkbox.CrossCompile") version "1.0.1"
|
|
||||||
id("com.dorkbox.Licensing") version "1.4"
|
id("com.dorkbox.Licensing") version "1.4"
|
||||||
id("com.dorkbox.VersionUpdate") version "1.4.1"
|
id("com.dorkbox.VersionUpdate") version "1.4.1"
|
||||||
|
|
||||||
@ -71,7 +65,7 @@ object Extras {
|
|||||||
const val url = "https://git.dorkbox.com/dorkbox/Network"
|
const val url = "https://git.dorkbox.com/dorkbox/Network"
|
||||||
val buildDate = Instant.now().toString()
|
val buildDate = Instant.now().toString()
|
||||||
|
|
||||||
val JAVA_VERSION = JavaVersion.VERSION_1_6.toString()
|
val JAVA_VERSION = JavaVersion.VERSION_1_8.toString()
|
||||||
|
|
||||||
const val bcVersion = "1.60"
|
const val bcVersion = "1.60"
|
||||||
|
|
||||||
@ -247,28 +241,10 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
mavenLocal() // this must be first!
|
||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////////////////
|
|
||||||
////// Task defaults
|
|
||||||
///////////////////////////////
|
|
||||||
tasks.withType<JavaCompile> {
|
|
||||||
options.encoding = "UTF-8"
|
|
||||||
|
|
||||||
sourceCompatibility = Extras.JAVA_VERSION
|
|
||||||
targetCompatibility = Extras.JAVA_VERSION
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType<Jar> {
|
|
||||||
duplicatesStrategy = DuplicatesStrategy.FAIL
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.compileJava.get().apply {
|
|
||||||
println("\tCompiling classes to Java $sourceCompatibility")
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////
|
///////////////////////////////
|
||||||
////// UTILITIES COMPILE
|
////// UTILITIES COMPILE
|
||||||
///////////////////////////////
|
///////////////////////////////
|
||||||
@ -286,94 +262,110 @@ fun javaFile(vararg fileNames: String): Iterable<String> {
|
|||||||
return fileList
|
return fileList
|
||||||
}
|
}
|
||||||
|
|
||||||
task<JavaCompile>("compileUtilsJava8") {
|
|
||||||
// we don't want the default include of **/*.java
|
|
||||||
includes.clear()
|
|
||||||
|
|
||||||
source = fileTree("../Utilities/src")
|
|
||||||
|
|
||||||
// this class must be compiled java 8+
|
|
||||||
include(javaFile("dorkbox.util.generics.DefaultMethodHelper"))
|
|
||||||
|
|
||||||
sourceCompatibility = JavaVersion.VERSION_1_8.toString()
|
|
||||||
targetCompatibility = JavaVersion.VERSION_1_8.toString()
|
|
||||||
|
|
||||||
|
|
||||||
classpath = files()
|
|
||||||
destinationDir = file("$rootDir/build/classes_utilities")
|
|
||||||
|
|
||||||
println("\tCompiling $includes to Java $sourceCompatibility")
|
|
||||||
}
|
|
||||||
|
|
||||||
task<JavaCompile>("compileUtils") {
|
task<JavaCompile>("compileUtils") {
|
||||||
val utilsJava8 = tasks["compileUtilsJava8"]
|
|
||||||
dependsOn(utilsJava8)
|
|
||||||
|
|
||||||
// we don't want the default include of **/*.java
|
// we don't want the default include of **/*.java
|
||||||
includes.clear()
|
includes.clear()
|
||||||
|
|
||||||
source = fileTree("../Utilities/src")
|
source = fileTree("../Utilities/src")
|
||||||
include(javaFile(
|
include(javaFile(
|
||||||
"dorkbox.util.OS",
|
"dorkbox.util.OS",
|
||||||
"dorkbox.util.OSType",
|
"dorkbox.util.OSType",
|
||||||
"dorkbox.util.Property",
|
"dorkbox.util.Property",
|
||||||
"dorkbox.util.NamedThreadFactory",
|
"dorkbox.util.NamedThreadFactory",
|
||||||
"dorkbox.util.DelayTimer",
|
"dorkbox.util.DelayTimer",
|
||||||
"dorkbox.util.IO",
|
"dorkbox.util.IO",
|
||||||
"dorkbox.util.FileUtil",
|
"dorkbox.util.FileUtil",
|
||||||
"dorkbox.util.Base64Fast",
|
"dorkbox.util.Base64Fast",
|
||||||
"dorkbox.util.RandomUtil",
|
"dorkbox.util.RandomUtil",
|
||||||
"dorkbox.util.Sys",
|
"dorkbox.util.Sys",
|
||||||
"dorkbox.util.HashUtil",
|
"dorkbox.util.HashUtil",
|
||||||
"dorkbox.util.NativeLoader",
|
"dorkbox.util.NativeLoader",
|
||||||
|
|
||||||
"dorkbox.util.FastThreadLocal",
|
"dorkbox.util.FastThreadLocal",
|
||||||
"dorkbox.util.LocationResolver",
|
"dorkbox.util.LocationResolver",
|
||||||
"dorkbox.util.MathUtil",
|
"dorkbox.util.MathUtil",
|
||||||
"dorkbox.util.MersenneTwisterFast",
|
"dorkbox.util.MersenneTwisterFast",
|
||||||
"dorkbox.util.NativeLoader",
|
"dorkbox.util.NativeLoader",
|
||||||
|
|
||||||
"dorkbox.util.generics.TypeResolver",
|
"dorkbox.util.generics.TypeResolver",
|
||||||
// "dorkbox.util.generics.DefaultMethodHelper", // this class must be compiled java 8+
|
"dorkbox.util.generics.DefaultMethodHelper",
|
||||||
"dorkbox.util.generics.ClassHelper",
|
"dorkbox.util.generics.ClassHelper",
|
||||||
|
|
||||||
"dorkbox.util.bytes.BigEndian",
|
"dorkbox.util.bytes.BigEndian",
|
||||||
"dorkbox.util.bytes.UByte",
|
"dorkbox.util.bytes.UByte",
|
||||||
"dorkbox.util.bytes.UInteger",
|
"dorkbox.util.bytes.UInteger",
|
||||||
"dorkbox.util.bytes.ULong",
|
"dorkbox.util.bytes.ULong",
|
||||||
"dorkbox.util.bytes.Unsigned",
|
"dorkbox.util.bytes.Unsigned",
|
||||||
"dorkbox.util.bytes.UNumber",
|
"dorkbox.util.bytes.UNumber",
|
||||||
"dorkbox.util.bytes.UShort",
|
"dorkbox.util.bytes.UShort",
|
||||||
"dorkbox.util.bytes.ByteArrayWrapper",
|
"dorkbox.util.bytes.ByteArrayWrapper",
|
||||||
"dorkbox.util.bytes.OptimizeUtilsByteArray",
|
"dorkbox.util.bytes.OptimizeUtilsByteArray",
|
||||||
"dorkbox.util.bytes.OptimizeUtilsByteBuf",
|
"dorkbox.util.bytes.OptimizeUtilsByteBuf",
|
||||||
|
|
||||||
"dorkbox.util.exceptions.SecurityException",
|
"dorkbox.util.exceptions.SecurityException",
|
||||||
"dorkbox.util.exceptions.InitializationException",
|
"dorkbox.util.exceptions.InitializationException",
|
||||||
|
|
||||||
|
|
||||||
"dorkbox.util.collections.ObjectIntMap",
|
"dorkbox.util.collections.ObjectIntMap",
|
||||||
"dorkbox.util.collections.IntMap",
|
"dorkbox.util.collections.IntMap",
|
||||||
"dorkbox.util.collections.IntArray",
|
"dorkbox.util.collections.IntArray",
|
||||||
"dorkbox.util.collections.ConcurrentIterator",
|
"dorkbox.util.collections.ConcurrentIterator",
|
||||||
"dorkbox.util.collections.ConcurrentEntry",
|
"dorkbox.util.collections.ConcurrentEntry",
|
||||||
"dorkbox.util.collections.LockFreeHashMap",
|
"dorkbox.util.collections.LockFreeHashMap",
|
||||||
"dorkbox.util.collections.LockFreeIntMap",
|
"dorkbox.util.collections.LockFreeIntMap",
|
||||||
"dorkbox.util.collections.LockFreeIntBiMap",
|
"dorkbox.util.collections.LockFreeIntBiMap",
|
||||||
"dorkbox.util.collections.LockFreeObjectIntBiMap",
|
"dorkbox.util.collections.LockFreeObjectIntBiMap",
|
||||||
|
|
||||||
"dorkbox.util.crypto.CryptoECC",
|
"dorkbox.util.crypto.CryptoECC",
|
||||||
"dorkbox.util.crypto.CryptoAES"))
|
"dorkbox.util.crypto.CryptoAES"
|
||||||
|
))
|
||||||
|
|
||||||
// entire packages/directories
|
// entire packages/directories
|
||||||
include("dorkbox/util/serialization/**/*.java")
|
include("dorkbox/util/serialization/**/*.java")
|
||||||
include("dorkbox/util/entropy/**/*.java")
|
include("dorkbox/util/entropy/**/*.java")
|
||||||
include("dorkbox/util/storage/**/*.java")
|
include("dorkbox/util/storage/**/*.java")
|
||||||
|
|
||||||
classpath = files(utils, utilsJava8.outputs)
|
classpath = files(utils)
|
||||||
destinationDir = file("$rootDir/build/classes_utilities")
|
destinationDir = file("$rootDir/build/classes_utilities")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
///////////////////////////////
|
||||||
|
////// Task defaults
|
||||||
|
///////////////////////////////
|
||||||
|
tasks.withType<JavaCompile> {
|
||||||
|
options.encoding = "UTF-8"
|
||||||
|
|
||||||
|
sourceCompatibility = Extras.JAVA_VERSION
|
||||||
|
targetCompatibility = Extras.JAVA_VERSION
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.withType<Jar> {
|
||||||
|
duplicatesStrategy = DuplicatesStrategy.FAIL
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.jar.get().apply {
|
||||||
|
// include applicable class files from subset of Utilities project
|
||||||
|
from((tasks["compileUtils"] as JavaCompile).outputs)
|
||||||
|
|
||||||
|
manifest {
|
||||||
|
// https://docs.oracle.com/javase/tutorial/deployment/jar/packageman.html
|
||||||
|
attributes["Name"] = Extras.name
|
||||||
|
|
||||||
|
attributes["Specification-Title"] = Extras.name
|
||||||
|
attributes["Specification-Version"] = Extras.version
|
||||||
|
attributes["Specification-Vendor"] = Extras.vendor
|
||||||
|
|
||||||
|
attributes["Implementation-Title"] = "${Extras.group}.${Extras.id}"
|
||||||
|
attributes["Implementation-Version"] = Extras.buildDate
|
||||||
|
attributes["Implementation-Vendor"] = Extras.vendor
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.compileJava.get().apply {
|
||||||
|
println("\tCompiling classes to Java $sourceCompatibility")
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
val netty = api("io.netty:netty-all:4.1.32.Final")
|
val netty = api("io.netty:netty-all:4.1.32.Final")
|
||||||
@ -398,29 +390,6 @@ dependencies {
|
|||||||
utils.dependencies += listOf(netty, kryo, slf4j, bc)
|
utils.dependencies += listOf(netty, kryo, slf4j, bc)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////
|
|
||||||
////// Jar Tasks
|
|
||||||
///////////////////////////////
|
|
||||||
tasks.jar.get().apply {
|
|
||||||
// include applicable class files from subset of Utilities project
|
|
||||||
from((tasks["compileUtils"] as JavaCompile).outputs)
|
|
||||||
|
|
||||||
manifest {
|
|
||||||
// https://docs.oracle.com/javase/tutorial/deployment/jar/packageman.html
|
|
||||||
attributes["Name"] = Extras.name
|
|
||||||
|
|
||||||
attributes["Specification-Title"] = Extras.name
|
|
||||||
attributes["Specification-Version"] = Extras.version
|
|
||||||
attributes["Specification-Vendor"] = Extras.vendor
|
|
||||||
|
|
||||||
attributes["Implementation-Title"] = "${Extras.group}.${Extras.id}"
|
|
||||||
attributes["Implementation-Version"] = Extras.buildDate
|
|
||||||
attributes["Implementation-Vendor"] = Extras.vendor
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////
|
///////////////////////////////
|
||||||
////// PUBLISH TO SONATYPE / MAVEN CENTRAL
|
////// PUBLISH TO SONATYPE / MAVEN CENTRAL
|
||||||
//////
|
//////
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user