From 39c1390fcbbbcfea7ad5fc3e80e19e0729373ecc Mon Sep 17 00:00:00 2001 From: gbarbieri Date: Mon, 10 Dec 2018 13:41:56 +0100 Subject: [PATCH] v0.4.7 - lwjgl 3.2.1 - kotlin 1.3.11 - kotlintest 3.1.11 - shadow 4.0.3 --- build.gradle | 26 +++++++++++++++----------- src/main/kotlin/gln/gln.kt | 2 +- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 04636d9..221d5c4 100644 --- a/build.gradle +++ b/build.gradle @@ -4,8 +4,8 @@ plugins { id 'maven' id 'java' id 'java-library' - id "org.jetbrains.kotlin.jvm" version "1.3.10" - id "com.github.johnrengelman.shadow" version '2.0.4' + id "org.jetbrains.kotlin.jvm" version "1.3.11" + id "com.github.johnrengelman.shadow" version '4.0.3' } // jitpack @@ -13,27 +13,31 @@ group = 'com.github.kotlin-graphics' ext{ moduleName = 'com.github.kotlin_graphics.gln' - kotlin_version = '1.3.10' - kotlintest_version = '3.1.10' - gli_version = '6db30b00a6d3f6fc911842cf86973ec8a407aa79' - lwjgl_version = "3.2.1-SNAPSHOT" + kotlin = 'org.jetbrains.kotlin:kotlin' + kotlin_version = '1.3.11' + kotlintest_version = '3.1.11' + gli_version = '42d5ecff1637632c823e230ae5cf3b618051e40f' + lwjgl_version = "3.2.1" lwjgl_natives = current() == WINDOWS ? "windows" : current() == LINUX ? "linux" : "macos" } dependencies { - ext.kotlin = "org.jetbrains.kotlin:kotlin" - implementation "$kotlin-stdlib:$kotlin_version".toString() - implementation "$kotlin-reflect:$kotlin_version".toString() + implementation "$kotlin-stdlib" + implementation "$kotlin-reflect" api "com.github.kotlin-graphics:gli:$gli_version".toString() - //testCompile 'io.kotlintest:kotlintest-runner-junit5:3.0.6' - ["", "-glfw", "-jemalloc", "-openal", "-opengl", "-stb"].each { implementation "org.lwjgl:lwjgl$it:$lwjgl_version" runtime "org.lwjgl:lwjgl$it:$lwjgl_version:natives-$lwjgl_natives" } + + constraints { + testImplementation("$kotlin-stdlib:$kotlin_version") + testImplementation("$kotlin-stdlib-jdk7:$kotlin_version") + testImplementation("$kotlin-reflect:$kotlin_version") + } } repositories { diff --git a/src/main/kotlin/gln/gln.kt b/src/main/kotlin/gln/gln.kt index 175fd92..1fdd8bd 100644 --- a/src/main/kotlin/gln/gln.kt +++ b/src/main/kotlin/gln/gln.kt @@ -83,7 +83,7 @@ fun checkError(location: String = "", throws: Boolean = true): Boolean { } } -val VERSION = "0.4.6" +val VERSION = "0.4.7" fun main(args: Array) {