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

Code polish, updated deps

master
nathan 2019-06-15 00:24:24 +02:00
parent a68dbab7d1
commit f8fb5a541a
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build.gradle.kts
View File

@ -24,7 +24,7 @@ plugins {
id("com.gradle.plugin-publish") version "0.10.0"
id("com.dorkbox.Licensing") version "1.4"
id("com.dorkbox.GradleUtils") version "1.0"
id("com.dorkbox.GradleUtils") version "1.2"
kotlin("jvm") version "1.3.11"
}
@ -56,7 +56,7 @@ object Extras {
val tags = listOf("crosscompile", "compile", "java", "kotlin", "groovy")
val buildDate = Instant.now().toString()
val JAVA_VERSION = JavaVersion.VERSION_1_8.toString()
val JAVA_VERSION = JavaVersion.VERSION_1_8
}
// assign everything to project or project.ext
Extras::class.declaredMemberProperties.forEach {
@ -125,17 +125,21 @@ dependencies {
runtime("ch.qos.logback:logback-classic:1.1.6")
}
java {
sourceCompatibility = Extras.JAVA_VERSION
targetCompatibility = Extras.JAVA_VERSION
}
tasks.withType<JavaCompile> {
options.encoding = "UTF-8"
options.isIncremental = true
sourceCompatibility = Extras.JAVA_VERSION
targetCompatibility = Extras.JAVA_VERSION
sourceCompatibility = Extras.JAVA_VERSION.toString()
targetCompatibility = Extras.JAVA_VERSION.toString()
}
tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = Extras.JAVA_VERSION
kotlinOptions.jvmTarget = Extras.JAVA_VERSION.toString()
}
tasks.withType<Jar> {
@ -183,12 +187,3 @@ pluginBundle {
}
}
}
///////////////////////////////
////// Gradle Wrapper Configuration.
///// Run this task, then refresh the gradle project
///////////////////////////////
val wrapperUpdate by tasks.creating(Wrapper::class) {
gradleVersion = "5.1.1"
distributionUrl = distributionUrl.replace("bin", "all")
}