Upgrade to Kotlin 1.4.30, Gradle 6.8.2
This commit is contained in:
12
build.gradle
12
build.gradle
@@ -10,7 +10,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
plugins {
|
plugins {
|
||||||
id 'org.jetbrains.kotlin.jvm' version '1.4.21'
|
id 'org.jetbrains.kotlin.jvm' version '1.4.30'
|
||||||
}
|
}
|
||||||
|
|
||||||
def openrndrUseSnapshot = false
|
def openrndrUseSnapshot = false
|
||||||
@@ -19,12 +19,12 @@ apply plugin: 'org.jetbrains.dokka'
|
|||||||
|
|
||||||
project.ext {
|
project.ext {
|
||||||
openrndrVersion = openrndrUseSnapshot? "0.4.0-SNAPSHOT" : "0.3.45-rc.9"
|
openrndrVersion = openrndrUseSnapshot? "0.4.0-SNAPSHOT" : "0.3.45-rc.9"
|
||||||
kotlinVersion = "1.4.21"
|
kotlinVersion = "1.4.30"
|
||||||
spekVersion = "2.0.12"
|
spekVersion = "2.0.15"
|
||||||
libfreenectVersion = "0.5.7-1.5.4"
|
libfreenectVersion = "0.5.7-1.5.4"
|
||||||
librealsense2Version = "2.29.0-1.5.4"
|
librealsense2Version = "2.29.0-1.5.4"
|
||||||
gsonVersion = "2.8.6"
|
gsonVersion = "2.8.6"
|
||||||
antlrVersion = "4.8-1"
|
antlrVersion = "4.9.1"
|
||||||
tensorflowVersion = "0.2.0"
|
tensorflowVersion = "0.2.0"
|
||||||
mklDnnVersion = "0.21.5-1.5.4"
|
mklDnnVersion = "0.21.5-1.5.4"
|
||||||
}
|
}
|
||||||
@@ -81,13 +81,13 @@ allprojects {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
|
||||||
implementation 'io.github.microutils:kotlin-logging-jvm:2.0.2'
|
implementation 'io.github.microutils:kotlin-logging-jvm:2.0.4'
|
||||||
implementation "org.openrndr:openrndr-core:$openrndrVersion"
|
implementation "org.openrndr:openrndr-core:$openrndrVersion"
|
||||||
implementation "org.openrndr:openrndr-filter:$openrndrVersion"
|
implementation "org.openrndr:openrndr-filter:$openrndrVersion"
|
||||||
implementation "org.openrndr:openrndr-shape:$openrndrVersion"
|
implementation "org.openrndr:openrndr-shape:$openrndrVersion"
|
||||||
implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: '1.4.2'
|
implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: '1.4.2'
|
||||||
testImplementation "org.spekframework.spek2:spek-dsl-jvm:$spekVersion"
|
testImplementation "org.spekframework.spek2:spek-dsl-jvm:$spekVersion"
|
||||||
testImplementation "org.amshove.kluent:kluent:1.64"
|
testImplementation "org.amshove.kluent:kluent:1.65"
|
||||||
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
|
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
|
||||||
testRuntimeOnly "org.spekframework.spek2:spek-runner-junit5:$spekVersion"
|
testRuntimeOnly "org.spekframework.spek2:spek-runner-junit5:$spekVersion"
|
||||||
testRuntimeOnly "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
|
testRuntimeOnly "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
|
||||||
|
|||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
def boofcvVersion = "0.36"
|
def boofcvVersion = "0.37"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
||||||
|
|||||||
@@ -20,11 +20,11 @@ private fun testFile(path: String) : File {
|
|||||||
}
|
}
|
||||||
private fun testName(path: String) : String {
|
private fun testName(path: String) : String {
|
||||||
val test = File(".")
|
val test = File(".")
|
||||||
return if (test.absolutePath.endsWith("orx-keyframer/.")) {
|
return (if (test.absolutePath.endsWith("orx-keyframer/.")) {
|
||||||
path
|
path
|
||||||
} else {
|
} else {
|
||||||
"orx-keyframer/$path"
|
"orx-keyframer/$path"
|
||||||
}
|
}).replace("/", File.separator)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -55,6 +55,8 @@ object TestKeyframerErrors : Spek({
|
|||||||
println(this.absolutePath)
|
println(this.absolutePath)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
val animation = Animation()
|
val animation = Animation()
|
||||||
it("should throw an exception") {
|
it("should throw an exception") {
|
||||||
invoking {
|
invoking {
|
||||||
@@ -65,7 +67,10 @@ object TestKeyframerErrors : Spek({
|
|||||||
} `should throw` ExpressionException::class `with message` "Error loading from '${testName("src/test/resources/error-reporting/time-01.json")}': error in keys[0].'time': parser error in expression: ')('; [line: 1, character: 0 , near: [@0,0:0=')',<21>,1:0] ]"
|
} `should throw` ExpressionException::class `with message` "Error loading from '${testName("src/test/resources/error-reporting/time-01.json")}': error in keys[0].'time': parser error in expression: ')('; [line: 1, character: 0 , near: [@0,0:0=')',<21>,1:0] ]"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Paths.sep
|
||||||
|
//
|
||||||
|
//Expected <Error loading from 'orx-keyframer/src\test\resources\error-reporting\time-01.json': error in keys[0].'time': parser error in expression: ')('; [line: 1, character: 0 , near: [@0,0:0=')',<21>,1:0] ]>,
|
||||||
|
// actual <Error loading from 'orx-keyframer\src\test\resources\error-reporting\time-01.json': error in keys[0].'time': parser error in expression: ')('; [line: 1, character: 0 , near: [@0,0:0=')',<21>,1:0] ]>.
|
||||||
describe("loading a json with a faulty time expression (2) ") {
|
describe("loading a json with a faulty time expression (2) ") {
|
||||||
val animation = Animation()
|
val animation = Animation()
|
||||||
it("should throw an exception") {
|
it("should throw an exception") {
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
dependencies {
|
dependencies {
|
||||||
api project(":orx-kinect-common")
|
api project(":orx-kinect-common")
|
||||||
implementation "io.github.microutils:kotlin-logging:1.7.2"
|
|
||||||
api "org.bytedeco:libfreenect:$libfreenectVersion"
|
api "org.bytedeco:libfreenect:$libfreenectVersion"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,3 @@
|
|||||||
repositories {
|
|
||||||
maven { url 'https://jitpack.io' }
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
demo {
|
demo {
|
||||||
java {
|
java {
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ sourceSets {
|
|||||||
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation "io.github.microutils:kotlin-logging:1.7.2"
|
|
||||||
api "org.bytedeco:librealsense2:$librealsense2Version"
|
api "org.bytedeco:librealsense2:$librealsense2Version"
|
||||||
|
|
||||||
demoImplementation("org.openrndr:openrndr-core:$openrndrVersion")
|
demoImplementation("org.openrndr:openrndr-core:$openrndrVersion")
|
||||||
|
|||||||
Reference in New Issue
Block a user