diff --git a/build.gradle b/build.gradle index abf5ba86..9ff8e18c 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { } } plugins { - id 'org.jetbrains.kotlin.jvm' version '1.4.21' + id 'org.jetbrains.kotlin.jvm' version '1.4.30' } def openrndrUseSnapshot = false @@ -19,12 +19,12 @@ apply plugin: 'org.jetbrains.dokka' project.ext { openrndrVersion = openrndrUseSnapshot? "0.4.0-SNAPSHOT" : "0.3.45-rc.9" - kotlinVersion = "1.4.21" - spekVersion = "2.0.12" + kotlinVersion = "1.4.30" + spekVersion = "2.0.15" libfreenectVersion = "0.5.7-1.5.4" librealsense2Version = "2.29.0-1.5.4" gsonVersion = "2.8.6" - antlrVersion = "4.8-1" + antlrVersion = "4.9.1" tensorflowVersion = "0.2.0" mklDnnVersion = "0.21.5-1.5.4" } @@ -81,13 +81,13 @@ allprojects { dependencies { 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-filter:$openrndrVersion" implementation "org.openrndr:openrndr-shape:$openrndrVersion" implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: '1.4.2' 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" testRuntimeOnly "org.spekframework.spek2:spek-runner-junit5:$spekVersion" testRuntimeOnly "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 80cf08e7..2a563242 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME 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 zipStorePath=wrapper/dists diff --git a/orx-boofcv/build.gradle b/orx-boofcv/build.gradle index bd8358e6..909edf3b 100644 --- a/orx-boofcv/build.gradle +++ b/orx-boofcv/build.gradle @@ -8,7 +8,7 @@ sourceSets { } } -def boofcvVersion = "0.36" +def boofcvVersion = "0.37" dependencies { diff --git a/orx-keyframer/src/test/kotlin/TestKeyframerErrors.kt b/orx-keyframer/src/test/kotlin/TestKeyframerErrors.kt index e1e6e87b..9044bc21 100644 --- a/orx-keyframer/src/test/kotlin/TestKeyframerErrors.kt +++ b/orx-keyframer/src/test/kotlin/TestKeyframerErrors.kt @@ -20,11 +20,11 @@ private fun testFile(path: String) : File { } private fun testName(path: String) : String { val test = File(".") - return if (test.absolutePath.endsWith("orx-keyframer/.")) { + return (if (test.absolutePath.endsWith("orx-keyframer/.")) { path } else { "orx-keyframer/$path" - } + }).replace("/", File.separator) } @@ -55,6 +55,8 @@ object TestKeyframerErrors : Spek({ println(this.absolutePath) } + + val animation = Animation() it("should throw an exception") { 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] ]" } } - + // Paths.sep + // + //Expected ,1:0] ]>, + // actual ,1:0] ]>. describe("loading a json with a faulty time expression (2) ") { val animation = Animation() it("should throw an exception") { diff --git a/orx-kinect-v1/build.gradle b/orx-kinect-v1/build.gradle index 6f6c62e0..38e109b1 100644 --- a/orx-kinect-v1/build.gradle +++ b/orx-kinect-v1/build.gradle @@ -1,5 +1,4 @@ dependencies { api project(":orx-kinect-common") - implementation "io.github.microutils:kotlin-logging:1.7.2" api "org.bytedeco:libfreenect:$libfreenectVersion" } diff --git a/orx-rabbit-control/build.gradle b/orx-rabbit-control/build.gradle index 75bd38f9..49e093ab 100644 --- a/orx-rabbit-control/build.gradle +++ b/orx-rabbit-control/build.gradle @@ -1,7 +1,3 @@ -repositories { - maven { url 'https://jitpack.io' } -} - sourceSets { demo { java { diff --git a/orx-realsense2/build.gradle b/orx-realsense2/build.gradle index 2919e113..153450a2 100644 --- a/orx-realsense2/build.gradle +++ b/orx-realsense2/build.gradle @@ -11,7 +11,6 @@ sourceSets { dependencies { - implementation "io.github.microutils:kotlin-logging:1.7.2" api "org.bytedeco:librealsense2:$librealsense2Version" demoImplementation("org.openrndr:openrndr-core:$openrndrVersion")