Updated java version, updated gradle util dependency
This commit is contained in:
parent
89d70f9255
commit
3cb78fe3fa
@ -16,12 +16,7 @@
|
|||||||
|
|
||||||
import Build_gradle.Extras.bcVersion
|
import Build_gradle.Extras.bcVersion
|
||||||
import java.time.Instant
|
import java.time.Instant
|
||||||
import java.util.*
|
|
||||||
import kotlin.collections.component1
|
|
||||||
import kotlin.collections.component2
|
|
||||||
import kotlin.collections.set
|
import kotlin.collections.set
|
||||||
import kotlin.reflect.KMutableProperty
|
|
||||||
import kotlin.reflect.full.declaredMemberProperties
|
|
||||||
|
|
||||||
///////////////////////////////
|
///////////////////////////////
|
||||||
////// PUBLISH TO SONATYPE / MAVEN CENTRAL
|
////// PUBLISH TO SONATYPE / MAVEN CENTRAL
|
||||||
@ -43,9 +38,10 @@ 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"
|
||||||
id("com.dorkbox.GradleUtils") version "1.0"
|
id("com.dorkbox.GradleUtils") version "1.2"
|
||||||
|
|
||||||
kotlin("jvm") version "1.3.31"
|
kotlin("jvm") version "1.3.31"
|
||||||
}
|
}
|
||||||
@ -63,7 +59,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_8.toString()
|
val JAVA_VERSION = JavaVersion.VERSION_11
|
||||||
|
|
||||||
const val bcVersion = "1.60"
|
const val bcVersion = "1.60"
|
||||||
|
|
||||||
@ -74,33 +70,11 @@ object Extras {
|
|||||||
///////////////////////////////
|
///////////////////////////////
|
||||||
///// assign 'Extras'
|
///// assign 'Extras'
|
||||||
///////////////////////////////
|
///////////////////////////////
|
||||||
|
GradleUtils.load("$projectDir/../../gradle.properties", Extras)
|
||||||
description = Extras.description
|
description = Extras.description
|
||||||
group = Extras.group
|
group = Extras.group
|
||||||
version = Extras.version
|
version = Extras.version
|
||||||
|
|
||||||
val propsFile = File("$projectDir/../../gradle.properties").normalize()
|
|
||||||
if (propsFile.canRead()) {
|
|
||||||
println("\tLoading custom property data from: [$propsFile]")
|
|
||||||
|
|
||||||
val props = Properties()
|
|
||||||
propsFile.inputStream().use {
|
|
||||||
props.load(it)
|
|
||||||
}
|
|
||||||
|
|
||||||
val extraProperties = Extras::class.declaredMemberProperties.filterIsInstance<KMutableProperty<String>>()
|
|
||||||
props.forEach { (k, v) -> run {
|
|
||||||
val key = k as String
|
|
||||||
val value = v as String
|
|
||||||
|
|
||||||
val member = extraProperties.find { it.name == key }
|
|
||||||
if (member != null) {
|
|
||||||
member.setter.call(Extras::class.objectInstance, value)
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
project.extra.set(k, v)
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
}
|
|
||||||
|
|
||||||
licensing {
|
licensing {
|
||||||
license(License.APACHE_2) {
|
license(License.APACHE_2) {
|
||||||
@ -246,15 +220,19 @@ repositories {
|
|||||||
///////////////////////////////
|
///////////////////////////////
|
||||||
////// Task defaults
|
////// Task defaults
|
||||||
///////////////////////////////
|
///////////////////////////////
|
||||||
|
java {
|
||||||
|
sourceCompatibility = Extras.JAVA_VERSION
|
||||||
|
targetCompatibility = Extras.JAVA_VERSION
|
||||||
|
}
|
||||||
|
|
||||||
tasks.compileJava.get().apply {
|
tasks.compileJava.get().apply {
|
||||||
println("\tCompiling classes to Java $sourceCompatibility")
|
println("\tCompiling classes to Java $sourceCompatibility")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType<JavaCompile> {
|
tasks.withType<JavaCompile> {
|
||||||
options.encoding = "UTF-8"
|
options.encoding = "UTF-8"
|
||||||
|
sourceCompatibility = Extras.JAVA_VERSION.toString()
|
||||||
sourceCompatibility = Extras.JAVA_VERSION
|
targetCompatibility = Extras.JAVA_VERSION.toString()
|
||||||
targetCompatibility = Extras.JAVA_VERSION
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType<Jar> {
|
tasks.withType<Jar> {
|
||||||
|
Loading…
Reference in New Issue
Block a user