Skip to content

Commit 75018b4

Browse files
committed
v4.0 beta 13
bump up - Kotlin 1.2.70 - Gradle 4.10.2 - Kotlintest 3.1.10 - Kotlinlogging 1.6.10 - uno
1 parent af88f9d commit 75018b4

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

build.gradle

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

1010
buildscript {
1111

12-
ext.kotlinVersion = '1.2.60'
12+
ext.kotlinVersion = '1.2.70'
1313

1414
repositories {
1515
jcenter()
@@ -21,7 +21,7 @@ buildscript {
2121
dependencies {
2222
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
2323
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
24-
classpath "org.junit.platform:junit-platform-gradle-plugin:1.1.0"
24+
classpath "org.junit.platform:junit-platform-gradle-plugin:1.2.0"
2525
}
2626
}
2727

@@ -33,11 +33,11 @@ dependencies {
3333
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
3434
implementation "org.jetbrains.kotlin:kotlin-reflect"
3535

36-
implementation 'com.github.kotlin-graphics:uno-sdk:v0.7.3'
36+
implementation 'com.github.kotlin-graphics:uno-sdk:v0.7.4'
3737

38-
testCompile 'io.kotlintest:kotlintest-runner-junit5:3.1.5'
38+
testCompile 'io.kotlintest:kotlintest-runner-junit5:3.1.10'
3939

40-
implementation 'io.github.microutils:kotlin-logging:1.4.6'
40+
implementation 'io.github.microutils:kotlin-logging:1.6.10'
4141

4242
// compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.10.0'
4343
// compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.10.0'

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.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

src/main/kotlin/assimp/format/fbx/fbxParser.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import assimp.ASSIMP.DEBUG
4545
import assimp.AiMatrix4x4
4646
import assimp.AiVector3D
4747
import glm_.*
48-
import glm_.buffer.bufferBig
48+
import kool.bufferBig
4949
import java.nio.ByteBuffer
5050
import java.util.zip.Inflater
5151
import kotlin.reflect.KMutableProperty0
@@ -358,7 +358,7 @@ class Element(val keyToken: Token, parser: Parser) {
358358
}
359359

360360
val fullLength = stride * count
361-
val buff = bufferBig(fullLength)
361+
val buff = bufferBig(fullLength) // TODO free?
362362

363363
if (encMode == 0) {
364364
assert(fullLength == compLen)

src/main/kotlin/assimp/version.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,13 @@ val versionMajor = 4
7272
val versionRevision = 0xee56ffa1
7373
val branch = "master"
7474

75+
/** JVM custom */
76+
val build = 13
77+
7578
/** @brief Returns assimp's compile flags
7679
* @return Any bitwise combination of the ASSIMP_CFLAGS_xxx constants.
7780
*/
7881
val compileFlags = ASSIMP.DEBUG.i
7982

8083
/** JVM custom */
81-
val version = "4.0.12"
84+
val version = "$versionMajor.$versionMinor.$build"

0 commit comments

Comments
 (0)