Updated libraries

This commit is contained in:
nathan 2020-09-19 22:08:41 +02:00
parent 637b369d17
commit e24e3c62ac
1 changed files with 38 additions and 64 deletions

View File

@ -23,14 +23,16 @@ import java.time.Instant
////// RELEASE : (to sonatype/maven central), <'publish and release' - 'publishToSonatypeAndRelease'> ////// RELEASE : (to sonatype/maven central), <'publish and release' - 'publishToSonatypeAndRelease'>
/////////////////////////////// ///////////////////////////////
gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS // always show the stacktrace!
gradle.startParameter.warningMode = WarningMode.All
plugins { plugins {
java java
id("com.dorkbox.GradleUtils") version "1.8" id("com.dorkbox.GradleUtils") version "1.9"
id("com.dorkbox.CrossCompile") version "1.0.1" id("com.dorkbox.Licensing") version "2.2"
id("com.dorkbox.Licensing") version "1.4" id("com.dorkbox.VersionUpdate") version "2.0"
id("com.dorkbox.VersionUpdate") version "1.4.1" id("com.dorkbox.GradlePublish") version "1.4"
id("com.dorkbox.GradlePublish") version "1.2"
kotlin("jvm") version "1.3.72" kotlin("jvm") version "1.3.72"
} }
@ -48,11 +50,6 @@ object Extras {
const val vendorUrl = "https://dorkbox.com" const val vendorUrl = "https://dorkbox.com"
const val url = "https://git.dorkbox.com/dorkbox/Console" const val url = "https://git.dorkbox.com/dorkbox/Console"
val buildDate = Instant.now().toString() val buildDate = Instant.now().toString()
val JAVA_VERSION = JavaVersion.VERSION_1_6.toString()
var sonatypeUserName = ""
var sonatypePassword = ""
} }
/////////////////////////////// ///////////////////////////////
@ -60,48 +57,36 @@ object Extras {
/////////////////////////////// ///////////////////////////////
GradleUtils.load("$projectDir/../../gradle.properties", Extras) GradleUtils.load("$projectDir/../../gradle.properties", Extras)
GradleUtils.fixIntellijPaths() GradleUtils.fixIntellijPaths()
GradleUtils.defaultResolutionStrategy()
GradleUtils.compileConfiguration(JavaVersion.VERSION_11)
licensing { licensing {
license(License.APACHE_2) { license(License.APACHE_2) {
author(Extras.vendor) description(Extras.description)
url(Extras.url) url(Extras.url)
note(Extras.description)
}
license("Dorkbox Utils", License.APACHE_2) {
author(Extras.vendor) author(Extras.vendor)
url("https://git.dorkbox.com/dorkbox/Utilities") extra("FastThreadLocal", License.BSD_3) {
} it.copyright(2014)
it.author("Lightweight Java Game Library Project")
license("JAnsi", License.APACHE_2) { it.author("Riven")
copyright(2009) it.url("https://github.com/LWJGL/lwjgl3/blob/5819c9123222f6ce51f208e022cb907091dd8023/modules/core/src/main/java/org/lwjgl/system/FastThreadLocal.java")
author("Progress Software Corporation") }
author("Joris Kuipers") extra("JAnsi", License.APACHE_2) {
author("Jason Dillon") it.copyright(2009)
author("Hiram Chirino") it.author("Progress Software Corporation")
url("https://github.com/fusesource/jansi") it.author("Joris Kuipers")
} it.author("Jason Dillon")
it.author("Hiram Chirino")
license("JLine2", License.BSD_2) { it.url("https://github.com/fusesource/jansi")
copyright(2012) }
author("'Marc Prud\'hommeaux <mwp1@cornell.edu>'") extra("JLine2", License.BSD_2) {
author("Daniel Doubrovkine") it.copyright(2012)
author("Torbjorn Granlund") it.author("Marc Prud\'hommeaux <mwp1@cornell.edu>")
author("David MacKenzie") it.author("Daniel Doubrovkine")
url("https://github.com/jline/jline2") it.author("Torbjorn Granlund")
} it.author("David MacKenzie")
it.url("https://github.com/jline/jline2")
license("JNA", License.APACHE_2) { }
copyright(2011)
author("Timothy Wall")
url("https://github.com/twall/jna")
}
license("SLF4J", License.MIT) {
copyright(2008)
author("QOS.ch")
url("http://www.slf4j.org")
} }
} }
@ -121,16 +106,6 @@ repositories {
jcenter() jcenter()
} }
///////////////////////////////
////// Task defaults
///////////////////////////////
tasks.withType<JavaCompile> {
options.encoding = "UTF-8"
sourceCompatibility = Extras.JAVA_VERSION
targetCompatibility = Extras.JAVA_VERSION
}
tasks.jar.get().apply { tasks.jar.get().apply {
manifest { manifest {
// https://docs.oracle.com/javase/tutorial/deployment/jar/packageman.html // https://docs.oracle.com/javase/tutorial/deployment/jar/packageman.html
@ -148,16 +123,15 @@ tasks.jar.get().apply {
} }
} }
tasks.compileJava.get().apply {
println("\tCompiling classes to Java $sourceCompatibility")
}
dependencies { dependencies {
implementation("org.slf4j:slf4j-api:1.7.25") implementation("org.slf4j:slf4j-api:1.7.30")
implementation("com.dorkbox:JnaUtilities:1.1") val jnaVersion = "5.5.0"
implementation("com.dorkbox:Utilities:1.2") implementation("net.java.dev.jna:jna:$jnaVersion")
implementation("net.java.dev.jna:jna-platform:$jnaVersion")
implementation("com.dorkbox:Utilities:1.6")
} }
publishToSonatype { publishToSonatype {