Skip to content

Commit 59182dd

Browse files
committed
v0.4.8
- lwjgl 3.2.2-3 - kotlin 1.3.21 - kotlintest 3.2.1 - shadow 4.0.4 - gradle 5.2.1 with shadow workaround
1 parent 980c4b2 commit 59182dd

File tree

3 files changed

+11
-15
lines changed

3 files changed

+11
-15
lines changed

build.gradle

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
id 'java'
66
id 'java-library'
77
id "org.jetbrains.kotlin.jvm" version "1.3.21"
8-
id "com.github.johnrengelman.shadow" version '4.0.3'
8+
id "com.github.johnrengelman.shadow" version '4.0.4'
99
}
1010

1111
// jitpack
@@ -15,9 +15,9 @@ ext {
1515
moduleName = 'com.github.kotlin_graphics.gln'
1616
kotlin = 'org.jetbrains.kotlin:kotlin'
1717
kotlin_version = '1.3.21'
18-
kotlintest_version = '3.1.11'
19-
gli_version = '42d5ecff1637632c823e230ae5cf3b618051e40f'
20-
lwjgl_version = "3.2.1"
18+
kotlintest_version = '3.2.1'
19+
gli_version = '968eb79758bf3475e8cf1a93f138b2a19aadd7a5'
20+
lwjgl_version = "3.2.2-SNAPSHOT"
2121
lwjgl_natives = current() == WINDOWS ? "windows" : current() == LINUX ? "linux" : "macos"
2222
}
2323

@@ -32,12 +32,6 @@ dependencies {
3232
implementation "org.lwjgl:lwjgl$it:$lwjgl_version"
3333
runtime "org.lwjgl:lwjgl$it:$lwjgl_version:natives-$lwjgl_natives"
3434
}
35-
36-
constraints {
37-
testImplementation("$kotlin-stdlib:$kotlin_version")
38-
testImplementation("$kotlin-stdlib-jdk7:$kotlin_version")
39-
testImplementation("$kotlin-reflect:$kotlin_version")
40-
}
4135
}
4236

4337
repositories {
@@ -48,19 +42,19 @@ repositories {
4842
}
4943

5044
task sourcesJar(type: Jar, dependsOn: classes) {
51-
classifier = 'sources'
45+
archiveClassifier = 'sources'
5246
from sourceSets.main.allSource
5347
}
5448

5549
task javadocJar(type: Jar, dependsOn: javadoc) {
56-
classifier = 'javadoc'
50+
archiveClassifier = 'javadoc'
5751
from javadoc.destinationDir
5852
}
5953

6054
compileKotlin {
6155
kotlinOptions {
6256
freeCompilerArgs = ["-XXLanguage:+InlineClasses", "-Xjvm-default=enable"]
63-
jvmTarget = "1.6"
57+
// jvmTarget = "1.6"
6458
}
6559
}
6660

@@ -73,3 +67,5 @@ jar {
7367
inputs.property("moduleName", moduleName)
7468
manifest.attributes('Automatic-Module-Name': moduleName)
7569
}
70+
71+
shadowJar.archiveClassifier = 'all'

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip

src/main/kotlin/gln/gln.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ fun checkError(location: String = "", throws: Boolean = true): Boolean {
8484
}
8585
}
8686

87-
val VERSION = "0.4.7"
87+
val VERSION = "0.4.8"
8888

8989

9090
val Buffer.glType: Int

0 commit comments

Comments
 (0)