Skip to content

Commit

Permalink
- fixed kool dependencies
Browse files Browse the repository at this point in the history
- removed deprecated gln.buff
- commented out temporarily vkk stuff

bump up:
- kotlin 1.2.70
- gradle 4.10.2
- kotlintest 3.1.10
- uno
  • Loading branch information
elect86 committed Sep 21, 2018
1 parent 43698e0 commit e79d078
Show file tree
Hide file tree
Showing 16 changed files with 1,274 additions and 1,273 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Expand Up @@ -13,7 +13,7 @@ group = 'com.github.kotlin-graphics'

buildscript {

ext.kotlinVersion = '1.2.60'
ext.kotlinVersion = '1.2.70'

repositories {
jcenter() // shadow
Expand All @@ -25,17 +25,17 @@ 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"
}
}

dependencies {

implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"

implementation 'com.github.kotlin-graphics:uno-sdk:869ee1b'
implementation 'com.github.kotlin-graphics:uno-sdk:c74defd9f15267646ae0205e8a3525d581ec2d9e'

testImplementation 'io.kotlintest:kotlintest-runner-junit5:3.0.6'
testImplementation 'io.kotlintest:kotlintest-runner-junit5:3.1.10'

def joglVersion = '2.3.2'
implementation "org.jogamp.gluegen:gluegen-rt-main:$joglVersion"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Expand Up @@ -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.9-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
4 changes: 2 additions & 2 deletions src/main/kotlin/imgui/font.kt
Expand Up @@ -2,8 +2,8 @@ package imgui


import glm_.*
import glm_.buffer.bufferBig
import glm_.buffer.free
import kool.bufferBig
import kool.free
import glm_.vec2.Vec2
import glm_.vec2.Vec2i
import glm_.vec2.operators.div
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/imgui/imgui.kt
Expand Up @@ -82,7 +82,7 @@ object ImGui :
imgui_internal {

// Version
val beta = 1
val beta = 2
/** get the compiled version string e.g. "1.23" */
val version = "1.63.$beta"
/** Integer encoded as XYYZZ for use in #if preprocessor conditionals.
Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/imgui/impl/ImplGL3.kt
@@ -1,9 +1,9 @@
package imgui.impl

import glm_.*
import glm_.buffer.bufferBig
import glm_.buffer.free
import glm_.buffer.intBufferBig
import kool.bufferBig
import kool.free
import kool.intBufferBig
import glm_.vec2.Vec2
import gln.*
import gln.buffer.BufferTarget
Expand Down

0 comments on commit e79d078

Please sign in to comment.