From 1e35c8c7a5f0f1e61a77f0a2cb803111da5ef4df Mon Sep 17 00:00:00 2001
From: gBarbieri <elect86@gmail.com>
Date: Fri, 21 Sep 2018 12:28:30 +0200
Subject: [PATCH] - fixed kool imports

bump up:

- kotlin 1.2.70
- gradle 4.10.2
---
 build.gradle                              | 7 ++++---
 gradle/wrapper/gradle-wrapper.properties  | 2 +-
 src/main/kotlin/gln/buffer/block.kt       | 9 ++++-----
 src/main/kotlin/gln/buffer/buffer.kt      | 4 ++--
 src/main/kotlin/gln/cap/caps.kt           | 6 +++---
 src/main/kotlin/gln/draw/draw.kt          | 4 ++--
 src/main/kotlin/gln/framebuffer/block.kt  | 6 +++---
 src/main/kotlin/gln/gln.kt                | 9 +++++----
 src/main/kotlin/gln/renderbuffer/block.kt | 8 ++++----
 src/main/kotlin/gln/texture/block.kt      | 8 ++++----
 src/main/kotlin/gln/texture/texture.kt    | 4 ++--
 src/main/kotlin/gln/uniformBlock/block.kt | 3 +--
 12 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0797a54..58c2634 100644
--- a/build.gradle
+++ b/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'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a95009c..e0b3fb8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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
diff --git a/src/main/kotlin/gln/buffer/block.kt b/src/main/kotlin/gln/buffer/block.kt
index e04e1b1..aefb4fe 100644
--- a/src/main/kotlin/gln/buffer/block.kt
+++ b/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) {
diff --git a/src/main/kotlin/gln/buffer/buffer.kt b/src/main/kotlin/gln/buffer/buffer.kt
index 7e641c2..cb23a37 100644
--- a/src/main/kotlin/gln/buffer/buffer.kt
+++ b/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
diff --git a/src/main/kotlin/gln/cap/caps.kt b/src/main/kotlin/gln/cap/caps.kt
index a09398a..5aa44bf 100644
--- a/src/main/kotlin/gln/cap/caps.kt
+++ b/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
diff --git a/src/main/kotlin/gln/draw/draw.kt b/src/main/kotlin/gln/draw/draw.kt
index 14bce11..dcb84a1 100644
--- a/src/main/kotlin/gln/draw/draw.kt
+++ b/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
diff --git a/src/main/kotlin/gln/framebuffer/block.kt b/src/main/kotlin/gln/framebuffer/block.kt
index b79a139..e798ea6 100644
--- a/src/main/kotlin/gln/framebuffer/block.kt
+++ b/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
diff --git a/src/main/kotlin/gln/gln.kt b/src/main/kotlin/gln/gln.kt
index fafe052..89fe8b3 100644
--- a/src/main/kotlin/gln/gln.kt
+++ b/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"
\ No newline at end of file
+val VERSION = "0.4.5"
\ No newline at end of file
diff --git a/src/main/kotlin/gln/renderbuffer/block.kt b/src/main/kotlin/gln/renderbuffer/block.kt
index cfff5b6..3d5be32 100644
--- a/src/main/kotlin/gln/renderbuffer/block.kt
+++ b/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
diff --git a/src/main/kotlin/gln/texture/block.kt b/src/main/kotlin/gln/texture/block.kt
index 3f3ab42..0a193b0 100644
--- a/src/main/kotlin/gln/texture/block.kt
+++ b/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
diff --git a/src/main/kotlin/gln/texture/texture.kt b/src/main/kotlin/gln/texture/texture.kt
index bab7421..d0f3757 100644
--- a/src/main/kotlin/gln/texture/texture.kt
+++ b/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
diff --git a/src/main/kotlin/gln/uniformBlock/block.kt b/src/main/kotlin/gln/uniformBlock/block.kt
index ad358bb..e01cac4 100644
--- a/src/main/kotlin/gln/uniformBlock/block.kt
+++ b/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