- fixed kool imports

bump up:

- kotlin 1.2.70
- gradle 4.10.2

build.gradle

@@ -11,7 +11,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
 
 buildscript {
 
-    ext.kotlinVersion = '1.2.60'
+    ext.kotlinVersion = '1.2.70'
 
     repositories {
         jcenter()   // shadow
@@ -23,7 +23,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
-        classpath "org.junit.platform:junit-platform-gradle-plugin:1.1.0"
+        classpath "org.junit.platform:junit-platform-gradle-plugin:1.2.0"
     }
 }
 
@@ -33,7 +33,8 @@ dependencies {
     ext.kotlin = "org.jetbrains.kotlin:kotlin"
     implementation "$kotlin-stdlib:$kotlinVersion"
     implementation "$kotlin-reflect:$kotlinVersion"
-    implementation 'com.github.kotlin-graphics:gli:6b16ea5d56'
+
+    implementation 'com.github.kotlin-graphics:gli:6938a4b6cffc5af7ef6344d2f86ccc0f827b1f3a'
 
     //testCompile 'io.kotlintest:kotlintest-runner-junit5:3.0.6'
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -4,22 +4,21 @@ package gln.buffer
 
 import glm_.BYTES
 import glm_.L
-import glm_.buffer.adr
-import glm_.buffer.cap
-import glm_.buffer.pos
-import glm_.buffer.rem
 import glm_.mat4x4.Mat4
 import glm_.set
 import glm_.vec4.Vec4
 import gln.buf
 import gln.bufAd
+import gln.buffer.BufferTarget.BufferTarget2
 import gln.get
+import kool.adr
+import kool.pos
+import kool.rem
 import org.lwjgl.opengl.GL15
 import org.lwjgl.opengl.GL30
 import org.lwjgl.opengl.GL31
 import org.lwjgl.system.MemoryUtil.NULL
 import java.nio.*
-import gln.buffer.BufferTarget.BufferTarget2
 
 
 inline fun initArrayBuffer(buffer: IntBuffer, block: Buffer.() -> Unit) {

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

@@ -4,8 +4,8 @@ package gln.buffer
 
 import glm_.BYTES
 import glm_.L
-import glm_.buffer.adr
-import glm_.buffer.free
+import kool.adr
+import kool.free
 import glm_.mat4x4.Mat4
 import glm_.size
 import gln.buf

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

@@ -1,8 +1,8 @@
 package gln.cap
 
-import glm_.buffer.cap
-import glm_.buffer.free
-import glm_.buffer.intBufferBig
+import kool.cap
+import kool.free
+import kool.intBufferBig
 import glm_.vec2.Vec2
 import gln.*
 import org.lwjgl.opengl.ATITextureCompression3DC.GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI

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

@@ -3,8 +3,8 @@
 package gln.draw
 
 import glm_.BYTES
-import glm_.buffer.cap
-import glm_.buffer.rem
+import kool.cap
+import kool.rem
 import glm_.size
 import org.lwjgl.opengl.*
 import java.nio.ByteBuffer

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

@@ -3,9 +3,9 @@
 package gln.framebuffer
 
 import glm_.BYTES
-import glm_.buffer.adr
-import glm_.buffer.pos
-import glm_.buffer.rem
+import kool.adr
+import kool.pos
+import kool.rem
 import gln.buf
 import gln.bufAd
 import gln.get

src/main/kotlin/gln/gln.kt

@@ -2,14 +2,15 @@
 
 package gln
 
-import glm_.BYTES
-import glm_.buffer.adr
 import glm_.vec2.Vec2
 import glm_.vec2.Vec2i
 import glm_.vec3.Vec3
 import glm_.vec4.Vec4
 import glm_.vec4.Vec4i
-import org.lwjgl.opengl.*
+import kool.adr
+import org.lwjgl.opengl.GL11
+import org.lwjgl.opengl.GL30
+import org.lwjgl.opengl.GL41
 import org.lwjgl.system.MemoryUtil
 import java.awt.Color
 import java.nio.ByteBuffer
@@ -88,4 +89,4 @@ fun checkError(location: String, throwError: Boolean = true): Boolean {
     return true
 }
 
-val VERSION = "0.4.4"
+val VERSION = "0.4.5"

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

@@ -3,10 +3,10 @@
 package gln.renderbuffer
 
 import glm_.BYTES
-import glm_.buffer.adr
-import glm_.buffer.cap
-import glm_.buffer.pos
-import glm_.buffer.rem
+import kool.adr
+import kool.cap
+import kool.pos
+import kool.rem
 import glm_.vec2.Vec2i
 import gln.buf
 import gln.bufAd

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

@@ -5,10 +5,10 @@ package gln.texture
 import gli_.gl
 import gli_.gli
 import glm_.BYTES
-import glm_.buffer.adr
-import glm_.buffer.cap
-import glm_.buffer.pos
-import glm_.buffer.rem
+import kool.adr
+import kool.cap
+import kool.pos
+import kool.rem
 import glm_.vec2.Vec2i
 import glm_.vec3.Vec3i
 import gln.buf

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

@@ -4,8 +4,8 @@ package gln.texture
 
 import gli_.gl
 import glm_.BYTES
-import glm_.buffer.adr
-import glm_.buffer.pos
+import kool.adr
+import kool.pos
 import glm_.vec2.Vec2i
 import glm_.vec3.Vec3i
 import glm_.vec4.Vec4

src/main/kotlin/gln/uniformBlock/block.kt

@@ -2,11 +2,10 @@ package gln.uniformBlock
 
 import glm_.BYTES
 import glm_.bool
-import glm_.buffer.cap
-import glm_.buffer.rem
 import glm_.glm
 import gln.buf
 import gln.bufAd
+import kool.rem
 import org.lwjgl.opengl.GL31
 import org.lwjgl.opengl.GL40
 import org.lwjgl.opengl.GL43