v0.2.0

Kotlin 1.2.51 Gradle 4.9 Shadow 2.0.4 - added VERSION
kotlin-graphics · Jul 18, 2018 · f38685c · f38685c
1 parent efc1b71
commit f38685c
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 38 deletions.
diff --git a/.idea/libraries/Gradle__com_github_kotlin_graphics_appBuffer_84c9312.xml b/.idea/libraries/Gradle__com_github_kotlin_graphics_appBuffer_84c9312.xml
diff --git a/.idea/libraries/Gradle__com_github_kotlin_graphics_gli_6fcc778.xml b/.idea/libraries/Gradle__com_github_kotlin_graphics_gli_6fcc778.xml
diff --git a/.idea/libraries/Gradle__com_github_kotlin_graphics_glm_fb0b292.xml b/.idea/libraries/Gradle__com_github_kotlin_graphics_glm_fb0b292.xml
diff --git a/...__com_github_kotlin_graphics_kotlin_unsigned_0f6b48ccb2adb3a0c30e811cd75b4f2e66e1660b.xml b/...__com_github_kotlin_graphics_kotlin_unsigned_0f6b48ccb2adb3a0c30e811cd75b4f2e66e1660b.xml
diff --git a/.idea/libraries/Gradle__com_github_kotlin_graphics_kotlin_unsigned_a455438.xml b/.idea/libraries/Gradle__com_github_kotlin_graphics_kotlin_unsigned_a455438.xml
diff --git a/...etbrains_kotlin_kotlin_reflect_1_2_50.xml → ...etbrains_kotlin_kotlin_reflect_1_2_51.xml b/...etbrains_kotlin_kotlin_reflect_1_2_50.xml → ...etbrains_kotlin_kotlin_reflect_1_2_51.xml
diff --git a/...jetbrains_kotlin_kotlin_stdlib_1_2_50.xml → ...jetbrains_kotlin_kotlin_stdlib_1_2_51.xml b/...jetbrains_kotlin_kotlin_stdlib_1_2_50.xml → ...jetbrains_kotlin_kotlin_stdlib_1_2_51.xml
diff --git a/...ns_kotlin_kotlin_stdlib_common_1_2_50.xml → ...ns_kotlin_kotlin_stdlib_common_1_2_51.xml b/...ns_kotlin_kotlin_stdlib_common_1_2_50.xml → ...ns_kotlin_kotlin_stdlib_common_1_2_51.xml
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
 
 buildscript {
 
-    ext.kotlinVersion = '1.2.50'
+    ext.kotlinVersion = '1.2.51'
 
     repositories {
         jcenter()   // shadow
@@ -22,7 +22,7 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.3'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
         classpath "org.junit.platform:junit-platform-gradle-plugin:1.1.0"
     }
 }
@@ -35,8 +35,8 @@ dependencies {
     implementation "$kotlin-reflect:$kotlinVersion"
 
     ext.kx = "com.github.kotlin-graphics"
-    implementation "$kx:gli:e885226c97b78946e4a31677399b0014ac732a4d"
-    implementation "$kx:appBuffer:aff415e3566ab5a9da28efcd569fd55b92a16070"
+    implementation "$kx:gli:6fcc778"
+    implementation "$kx:appBuffer:84c9312"
 
     //testCompile 'io.kotlintest:kotlintest-runner-junit5:3.0.6'
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
diff --git a/src/main/kotlin/vkk/vk.kt b/src/main/kotlin/vkk/vk.kt
@@ -1,5 +1,8 @@
 package vkk
 
+import ab.advance
+import ab.appBuffer
+import ab.appBuffer.ptr
 import glm_.*
 import glm_.vec2.Vec2i
 import org.lwjgl.system.MemoryUtil
@@ -9,19 +12,14 @@ import org.lwjgl.system.Struct
 import org.lwjgl.vulkan.*
 import org.lwjgl.vulkan.VK10.VK_QUEUE_FAMILY_IGNORED
 import vkk.VkPhysicalDeviceArrayList.resize
-import ab.advance
-import ab.appBuffer
-import ab.appBuffer.ptr
 import java.nio.ByteBuffer
 import java.nio.LongBuffer
 import kotlin.reflect.KMutableProperty0
 
 
 object vk {
 
-    /*
-        *Info constructor functions
-     */
+    /*  Info constructor functions     */
 
     inline fun ApplicationInfo(block: VkApplicationInfo.() -> Unit): VkApplicationInfo {
         val res = VkApplicationInfo.create(ptr.advance(VkApplicationInfo.SIZEOF))
@@ -1848,4 +1846,6 @@ object vk {
         return VK10.nvkUpdateDescriptorSets(device, descriptorWrites.remaining(), descriptorWrites.adr,
                 descriptorCopies?.remaining() ?: 0, descriptorCopies?.adr ?: NULL)
     }
+
+    val VERSION = "0.2.0"
 }
diff --git a/vkk.iml b/vkk.iml
@@ -35,12 +35,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: com.github.kotlin-graphics:appBuffer:aff415e3566ab5a9da28efcd569fd55b92a16070" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.2.50" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.kotlin-graphics:gli:e885226c97b78946e4a31677399b0014ac732a4d" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.kotlin-graphics:glm:1b99fb5661dd9fc224178b80835fc8edec7b835a" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.kotlin-graphics:kotlin-unsigned:0f6b48ccb2adb3a0c30e811cd75b4f2e66e1660b" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.50" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.kotlin-graphics:appBuffer:84c9312" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.2.51" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.kotlin-graphics:gli:6fcc778" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.kotlin-graphics:glm:fb0b292" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.kotlin-graphics:kotlin-unsigned:a455438" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.51" level="project" />
     <orderEntry type="library" name="Gradle: org.lwjgl:lwjgl-glfw:3.1.7-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Gradle: org.lwjgl:lwjgl-glfw:3.1.7-SNAPSHOT:natives-linux" level="project" />
     <orderEntry type="library" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.1.7-SNAPSHOT" level="project" />
@@ -56,7 +56,7 @@
     <orderEntry type="library" name="Gradle: org.lwjgl:lwjgl:3.1.7-SNAPSHOT:natives-linux" level="project" />
     <orderEntry type="library" name="Gradle: graphics.scenery:spirvcrossj:0.4.0" level="project" />
     <orderEntry type="library" name="Gradle: graphics.scenery:spirvcrossj:0.4.0:natives-linux" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.2.50" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.2.51" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-glfw:3.1.7-SNAPSHOT:natives-windows" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.1.7-SNAPSHOT:natives-windows" level="project" />