Skip to content

Commit 2455098

Browse files
committed
v0.7.5
- lwjgl 3.2.1 - kotlin 1.3.11 - kotlintest 3.1.11 - shadow 4.0.3
1 parent dbc2c26 commit 2455098

File tree

5 files changed

+20
-15
lines changed

5 files changed

+20
-15
lines changed

build.gradle

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,28 @@ plugins {
44
id 'maven'
55
id 'java'
66
id 'java-library'
7-
id "org.jetbrains.kotlin.jvm" version "1.3.10"
8-
id "com.github.johnrengelman.shadow" version '2.0.4'
7+
id "org.jetbrains.kotlin.jvm" version "1.3.11"
8+
id "com.github.johnrengelman.shadow" version '4.0.3'
99
}
1010

1111
// jitpack
1212
group = 'com.github.kotlin-graphics'
1313

1414
ext{
1515
moduleName = 'com.github.kotlin_graphics.uno'
16-
kotlin_version = '1.3.10'
17-
kotlintest_version = '3.1.10'
18-
gln_version = 'f1e357953dd3dd8a5685d76ead6b2090376ad003'
19-
vkk_version = 'bc7ce78f4c56c1ad5869eb59bb3d6d9dcde269ad'
20-
lwjgl_version = "3.2.1-SNAPSHOT"
16+
kotlin = 'org.jetbrains.kotlin:kotlin'
17+
kotlin_version = '1.3.11'
18+
kotlintest_version = '3.1.11'
19+
gln_version = '39c1390fcbbbcfea7ad5fc3e80e19e0729373ecc'
20+
vkk_version = 'a0d037b48e'
21+
lwjgl_version = "3.2.1"
2122
lwjgl_natives = current() == WINDOWS ? "windows" : current() == LINUX ? "linux" : "macos"
2223
}
2324

2425
dependencies {
2526

26-
ext.kotlin = "org.jetbrains.kotlin:kotlin"
27-
implementation "$kotlin-stdlib:$kotlin_version".toString()
28-
implementation "$kotlin-reflect:$kotlin_version".toString()
27+
implementation "$kotlin-stdlib"
28+
implementation "$kotlin-reflect"
2929

3030
ext.kx = "com.github.kotlin-graphics"
3131
api "$kx:gln:$gln_version".toString()
@@ -42,6 +42,12 @@ dependencies {
4242
if (it != "-vulkan" && it != "-jawt")
4343
runtime "org.lwjgl:lwjgl$it:$lwjgl_version:natives-$lwjgl_natives"
4444
}
45+
46+
constraints {
47+
testImplementation("$kotlin-stdlib:$kotlin_version")
48+
testImplementation("$kotlin-stdlib-jdk7:$kotlin_version")
49+
testImplementation("$kotlin-reflect:$kotlin_version")
50+
}
4551
}
4652

4753
repositories {

src/main/kotlin/uno/buffer/of.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package uno.buffer
22

33
import glm_.BYTES
4+
import glm_.b
45
import glm_.i
56
import glm_.vec2.Vec2
67
import glm_.vec2.Vec2i
@@ -181,6 +182,6 @@ fun intBufferOf(vertices: Collection<*>): IntBuffer {
181182
fun bufferOf(charSequence: CharSequence): ByteBuffer {
182183
val buffer = Buffer(charSequence.length)
183184
for (i in charSequence.indices)
184-
buffer[i] = charSequence[i].i
185+
buffer[i] = charSequence[i].b
185186
return buffer
186187
}

src/main/kotlin/uno/kotlin/result.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
package uno.kotlin
44

5-
import gln.objects.GlProgram
6-
75
/** https://gist.github.com/elizarov/03425be1c4209d59ad813ddccab29313 */
86
class Result<T> private constructor(private val result: Any?) {
97
// discovery

src/main/kotlin/uno/kotlin/util.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,4 @@ operator fun IntBuffer.plusAssign(i: Int) {
7676
put(i)
7777
}
7878

79-
val version = "0.7.4"
79+
val version = "0.7.5"

src/test/kotlin/uno/AwtTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fun main(args: Array<String>) {
4242
override fun initGL() {
4343
System.out.println("OpenGL version: " + effective.majorVersion + "." + effective.minorVersion + " (Profile: " + effective.profile + ")")
4444
GL.createCapabilities()
45-
// glClearColor(0.3f, 0.4f, 0.5f, 1f)
45+
glClearColor(0.3f, 0.4f, 0.5f, 1f)
4646
gears.init()
4747
last = System.currentTimeMillis()
4848
}

0 commit comments

Comments
 (0)