Skip to content

Commit e5131b3

Browse files
committed
v0.5.0
1 parent 880960a commit e5131b3

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

build.gradle

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import static org.gradle.internal.os.OperatingSystem.*
22

33
plugins {
4-
id 'maven'
54
id 'java'
65
id 'java-library'
7-
id "org.jetbrains.kotlin.jvm" version "1.3.61"
6+
id "org.jetbrains.kotlin.jvm" version "1.3.70"
87
id "com.github.johnrengelman.shadow" version '5.2.0'
98
}
109

@@ -14,12 +13,12 @@ group = 'com.github.kotlin_graphics'
1413
ext {
1514
moduleName = "${group}.gln"
1615
kotlin = 'org.jetbrains.kotlin:kotlin'
17-
kotlin_version = '1.3.61'
16+
kotlin_version = '1.3.70'
1817
kotlintest_version = '3.4.2'
19-
gli_version = '57d313a2c7691b3b65168fe21eb50433a1358656'
20-
glm_version = '1b4ac18dd1a3c23440d3f33596688aac60bc0141'
21-
unsigned_version = '18131d0fe0b7465a145a4502d31452c5ae0e59a1'
22-
kool_version = 'fcf04b2c03b8949d9d9a8b0a580082e927903510'
18+
gli_version = '4845dd2c6e235826cb0dfc5f5426d49041f85c55'
19+
glm_version = 'b1cc153f5fe3f684f0d2adca4d609b90df368727'
20+
unsigned_version = '2b60945e2c17f1e20b1ee6c96f1695d0df06eed7'
21+
kool_version = '2bf4b991f361a386a08762f3203d5b8ba26cd5fa'
2322
lwjgl_version = "3.2.3"
2423
lwjgl_natives = current() == WINDOWS ? "windows" : current() == LINUX ? "linux" : "macos"
2524
}
@@ -37,7 +36,7 @@ dependencies {
3736

3837
["", "-glfw", "-jemalloc", "-openal", "-opengl", "-opengles", "-stb"].each {
3938
implementation "org.lwjgl:lwjgl$it:$lwjgl_version"
40-
runtime "org.lwjgl:lwjgl$it:$lwjgl_version:natives-$lwjgl_natives"
39+
runtimeOnly "org.lwjgl:lwjgl$it:$lwjgl_version:natives-$lwjgl_natives"
4140
}
4241
}
4342

@@ -66,7 +65,7 @@ compileKotlin {
6665
}
6766
// As per https://stackoverflow.com/a/47669720
6867
// See also https://discuss.kotlinlang.org/t/kotlin-support-for-java-9-module-system/2499/9
69-
destinationDir = compileJava.destinationDir
68+
// destinationDir = compileJava.destinationDir
7069
}
7170

7271
compileTestKotlin {
@@ -79,7 +78,9 @@ compileTestKotlin {
7978
compileJava {
8079
dependsOn(':compileKotlin')
8180
doFirst {
82-
options.compilerArgs = ['--module-path', classpath.asPath,]
81+
options.compilerArgs = [
82+
'--module-path', classpath.asPath,
83+
'--patch-module', "$moduleName=${sourceSets["main"].output.asPath}"]
8384
classpath = files()
8485
}
8586
}

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-6.0.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip

src/main/kotlin/gln/gln.kt

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

8787
var DSA = false
8888

89-
val VERSION = "0.4.9"
89+
val VERSION = "0.5.0"
9090

9191

9292
val Buffer.glType: Int

0 commit comments

Comments
 (0)