Skip to content

Commit

Permalink
v0.4.8
Browse files Browse the repository at this point in the history
- lwjgl 3.2.2-3
- kotlin 1.3.21
- kotlintest 3.2.1
- shadow 4.0.4
- gradle 5.2.1 with shadow workaround
  • Loading branch information
elect86 committed Feb 27, 2019
1 parent 980c4b2 commit 59182dd
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 15 deletions.
22 changes: 9 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
id 'java'
id 'java-library'
id "org.jetbrains.kotlin.jvm" version "1.3.21"
id "com.github.johnrengelman.shadow" version '4.0.3'
id "com.github.johnrengelman.shadow" version '4.0.4'
}

// jitpack
Expand All @@ -15,9 +15,9 @@ ext {
moduleName = 'com.github.kotlin_graphics.gln'
kotlin = 'org.jetbrains.kotlin:kotlin'
kotlin_version = '1.3.21'
kotlintest_version = '3.1.11'
gli_version = '42d5ecff1637632c823e230ae5cf3b618051e40f'
lwjgl_version = "3.2.1"
kotlintest_version = '3.2.1'
gli_version = '968eb79758bf3475e8cf1a93f138b2a19aadd7a5'
lwjgl_version = "3.2.2-SNAPSHOT"
lwjgl_natives = current() == WINDOWS ? "windows" : current() == LINUX ? "linux" : "macos"
}

Expand All @@ -32,12 +32,6 @@ dependencies {
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 {
Expand All @@ -48,19 +42,19 @@ repositories {
}

task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
archiveClassifier = 'sources'
from sourceSets.main.allSource
}

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
archiveClassifier = 'javadoc'
from javadoc.destinationDir
}

compileKotlin {
kotlinOptions {
freeCompilerArgs = ["-XXLanguage:+InlineClasses", "-Xjvm-default=enable"]
jvmTarget = "1.6"
// jvmTarget = "1.6"
}
}

Expand All @@ -73,3 +67,5 @@ jar {
inputs.property("moduleName", moduleName)
manifest.attributes('Automatic-Module-Name': moduleName)
}

shadowJar.archiveClassifier = 'all'
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
2 changes: 1 addition & 1 deletion src/main/kotlin/gln/gln.kt
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ fun checkError(location: String = "", throws: Boolean = true): Boolean {
}
}

val VERSION = "0.4.7"
val VERSION = "0.4.8"


val Buffer.glType: Int
Expand Down

0 comments on commit 59182dd

Please sign in to comment.