Skip to content

Commit 1e35c8c

Browse files
elect86elect86
committed
- fixed kool imports
bump up: - kotlin 1.2.70 - gradle 4.10.2
1 parent 820ec8b commit 1e35c8c

File tree

12 files changed

+35
-35
lines changed

12 files changed

+35
-35
lines changed

‎build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
1111

1212
buildscript {
1313

14-
ext.kotlinVersion = '1.2.60'
14+
ext.kotlinVersion = '1.2.70'
1515

1616
repositories {
1717
jcenter() // shadow
@@ -23,7 +23,7 @@ buildscript {
2323
dependencies {
2424
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
2525
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
26-
classpath "org.junit.platform:junit-platform-gradle-plugin:1.1.0"
26+
classpath "org.junit.platform:junit-platform-gradle-plugin:1.2.0"
2727
}
2828
}
2929

@@ -33,7 +33,8 @@ dependencies {
3333
ext.kotlin = "org.jetbrains.kotlin:kotlin"
3434
implementation "$kotlin-stdlib:$kotlinVersion"
3535
implementation "$kotlin-reflect:$kotlinVersion"
36-
implementation 'com.github.kotlin-graphics:gli:6b16ea5d56'
36+
37+
implementation 'com.github.kotlin-graphics:gli:6938a4b6cffc5af7ef6344d2f86ccc0f827b1f3a'
3738

3839
//testCompile 'io.kotlintest:kotlintest-runner-junit5:3.0.6'
3940

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎src/main/kotlin/gln/buffer/block.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,21 @@ package gln.buffer
44

55
import glm_.BYTES
66
import glm_.L
7-
import glm_.buffer.adr
8-
import glm_.buffer.cap
9-
import glm_.buffer.pos
10-
import glm_.buffer.rem
117
import glm_.mat4x4.Mat4
128
import glm_.set
139
import glm_.vec4.Vec4
1410
import gln.buf
1511
import gln.bufAd
12+
import gln.buffer.BufferTarget.BufferTarget2
1613
import gln.get
14+
import kool.adr
15+
import kool.pos
16+
import kool.rem
1717
import org.lwjgl.opengl.GL15
1818
import org.lwjgl.opengl.GL30
1919
import org.lwjgl.opengl.GL31
2020
import org.lwjgl.system.MemoryUtil.NULL
2121
import java.nio.*
22-
import gln.buffer.BufferTarget.BufferTarget2
2322

2423

2524
inline fun initArrayBuffer(buffer: IntBuffer, block: Buffer.() -> Unit) {

‎src/main/kotlin/gln/buffer/buffer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ package gln.buffer
44

55
import glm_.BYTES
66
import glm_.L
7-
import glm_.buffer.adr
8-
import glm_.buffer.free
7+
import kool.adr
8+
import kool.free
99
import glm_.mat4x4.Mat4
1010
import glm_.size
1111
import gln.buf

‎src/main/kotlin/gln/cap/caps.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package gln.cap
22

3-
import glm_.buffer.cap
4-
import glm_.buffer.free
5-
import glm_.buffer.intBufferBig
3+
import kool.cap
4+
import kool.free
5+
import kool.intBufferBig
66
import glm_.vec2.Vec2
77
import gln.*
88
import org.lwjgl.opengl.ATITextureCompression3DC.GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI

‎src/main/kotlin/gln/draw/draw.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
package gln.draw
44

55
import glm_.BYTES
6-
import glm_.buffer.cap
7-
import glm_.buffer.rem
6+
import kool.cap
7+
import kool.rem
88
import glm_.size
99
import org.lwjgl.opengl.*
1010
import java.nio.ByteBuffer

‎src/main/kotlin/gln/framebuffer/block.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
package gln.framebuffer
44

55
import glm_.BYTES
6-
import glm_.buffer.adr
7-
import glm_.buffer.pos
8-
import glm_.buffer.rem
6+
import kool.adr
7+
import kool.pos
8+
import kool.rem
99
import gln.buf
1010
import gln.bufAd
1111
import gln.get

‎src/main/kotlin/gln/gln.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
package gln
44

5-
import glm_.BYTES
6-
import glm_.buffer.adr
75
import glm_.vec2.Vec2
86
import glm_.vec2.Vec2i
97
import glm_.vec3.Vec3
108
import glm_.vec4.Vec4
119
import glm_.vec4.Vec4i
12-
import org.lwjgl.opengl.*
10+
import kool.adr
11+
import org.lwjgl.opengl.GL11
12+
import org.lwjgl.opengl.GL30
13+
import org.lwjgl.opengl.GL41
1314
import org.lwjgl.system.MemoryUtil
1415
import java.awt.Color
1516
import java.nio.ByteBuffer
@@ -88,4 +89,4 @@ fun checkError(location: String, throwError: Boolean = true): Boolean {
8889
return true
8990
}
9091

91-
val VERSION = "0.4.4"
92+
val VERSION = "0.4.5"

‎src/main/kotlin/gln/renderbuffer/block.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
package gln.renderbuffer
44

55
import glm_.BYTES
6-
import glm_.buffer.adr
7-
import glm_.buffer.cap
8-
import glm_.buffer.pos
9-
import glm_.buffer.rem
6+
import kool.adr
7+
import kool.cap
8+
import kool.pos
9+
import kool.rem
1010
import glm_.vec2.Vec2i
1111
import gln.buf
1212
import gln.bufAd

‎src/main/kotlin/gln/texture/block.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ package gln.texture
55
import gli_.gl
66
import gli_.gli
77
import glm_.BYTES
8-
import glm_.buffer.adr
9-
import glm_.buffer.cap
10-
import glm_.buffer.pos
11-
import glm_.buffer.rem
8+
import kool.adr
9+
import kool.cap
10+
import kool.pos
11+
import kool.rem
1212
import glm_.vec2.Vec2i
1313
import glm_.vec3.Vec3i
1414
import gln.buf

0 commit comments

Comments
 (0)