Skip to content

Commit e79d078

Browse files
committed
- fixed kool dependencies
- removed deprecated gln.buff - commented out temporarily vkk stuff bump up: - kotlin 1.2.70 - gradle 4.10.2 - kotlintest 3.1.10 - uno
1 parent 43698e0 commit e79d078

File tree

16 files changed

+1274
-1273
lines changed

16 files changed

+1274
-1273
lines changed

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ group = 'com.github.kotlin-graphics'
1313

1414
buildscript {
1515

16-
ext.kotlinVersion = '1.2.60'
16+
ext.kotlinVersion = '1.2.70'
1717

1818
repositories {
1919
jcenter() // shadow
@@ -25,17 +25,17 @@ buildscript {
2525
dependencies {
2626
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
2727
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
28-
classpath "org.junit.platform:junit-platform-gradle-plugin:1.1.0"
28+
classpath "org.junit.platform:junit-platform-gradle-plugin:1.2.0"
2929
}
3030
}
3131

3232
dependencies {
3333

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

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

38-
testImplementation 'io.kotlintest:kotlintest-runner-junit5:3.0.6'
38+
testImplementation 'io.kotlintest:kotlintest-runner-junit5:3.1.10'
3939

4040
def joglVersion = '2.3.2'
4141
implementation "org.jogamp.gluegen:gluegen-rt-main:$joglVersion"

gradle/wrapper/gradle-wrapper.properties

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

src/main/kotlin/imgui/font.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package imgui
22

33

44
import glm_.*
5-
import glm_.buffer.bufferBig
6-
import glm_.buffer.free
5+
import kool.bufferBig
6+
import kool.free
77
import glm_.vec2.Vec2
88
import glm_.vec2.Vec2i
99
import glm_.vec2.operators.div

src/main/kotlin/imgui/imgui.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ object ImGui :
8282
imgui_internal {
8383

8484
// Version
85-
val beta = 1
85+
val beta = 2
8686
/** get the compiled version string e.g. "1.23" */
8787
val version = "1.63.$beta"
8888
/** Integer encoded as XYYZZ for use in #if preprocessor conditionals.

src/main/kotlin/imgui/impl/ImplGL3.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package imgui.impl
22

33
import glm_.*
4-
import glm_.buffer.bufferBig
5-
import glm_.buffer.free
6-
import glm_.buffer.intBufferBig
4+
import kool.bufferBig
5+
import kool.free
6+
import kool.intBufferBig
77
import glm_.vec2.Vec2
88
import gln.*
99
import gln.buffer.BufferTarget

0 commit comments

Comments
 (0)