Skip to content

Commit

Permalink
v4.0 beta 13
Browse files Browse the repository at this point in the history
bump up
- Kotlin 1.2.70
- Gradle 4.10.2
- Kotlintest 3.1.10
- Kotlinlogging 1.6.10
- uno
  • Loading branch information
elect86 committed Sep 21, 2018
1 parent af88f9d commit 75018b4
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ group = 'com.github.kotlin-graphics'

buildscript {

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

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

Expand All @@ -33,11 +33,11 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
implementation "org.jetbrains.kotlin:kotlin-reflect"

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

testCompile 'io.kotlintest:kotlintest-runner-junit5:3.1.5'
testCompile 'io.kotlintest:kotlintest-runner-junit5:3.1.10'

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

// compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.10.0'
// compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.10.0'
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
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.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
4 changes: 2 additions & 2 deletions src/main/kotlin/assimp/format/fbx/fbxParser.kt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import assimp.ASSIMP.DEBUG
import assimp.AiMatrix4x4
import assimp.AiVector3D
import glm_.*
import glm_.buffer.bufferBig
import kool.bufferBig
import java.nio.ByteBuffer
import java.util.zip.Inflater
import kotlin.reflect.KMutableProperty0
Expand Down Expand Up @@ -358,7 +358,7 @@ class Element(val keyToken: Token, parser: Parser) {
}

val fullLength = stride * count
val buff = bufferBig(fullLength)
val buff = bufferBig(fullLength) // TODO free?

if (encMode == 0) {
assert(fullLength == compLen)
Expand Down
5 changes: 4 additions & 1 deletion src/main/kotlin/assimp/version.kt
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,13 @@ val versionMajor = 4
val versionRevision = 0xee56ffa1
val branch = "master"

/** JVM custom */
val build = 13

/** @brief Returns assimp's compile flags
* @return Any bitwise combination of the ASSIMP_CFLAGS_xxx constants.
*/
val compileFlags = ASSIMP.DEBUG.i

/** JVM custom */
val version = "4.0.12"
val version = "$versionMajor.$versionMinor.$build"

0 comments on commit 75018b4

Please sign in to comment.