Merge branch 'master' into feature/7/kinect1Support

# Conflicts:
#	build.gradle

build.gradle

@@ -37,7 +37,9 @@ plugins {
 //}
 
 project.ext {
-    openrndrVersion = "0.3.35-rc1"
+    openrndrVersion = "0.3.35"
+    kotlinVersion = "1.3.41"
+    spekVersion = "2.0.6"
     libfreenectVersion = "0.5.7-1.5.1"
 }
 
@@ -67,13 +69,25 @@ allprojects {
         maven {
             url = "https://dl.bintray.com/openrndr/openrndr"
         }
+
+
+        maven {
+            url "https://dl.bintray.com/spekframework/spek"
+        }
+
+
     }
 
     dependencies {
         compile "org.openrndr:openrndr-core:$openrndrVersion"
         compile "org.openrndr:openrndr-filter:$openrndrVersion"
         compile "org.openrndr:openrndr-shape:$openrndrVersion"
-        compile group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: '1.3.0-RC'
+        compile group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: '1.3.0-RC2'
+
+        testImplementation "org.spekframework.spek2:spek-dsl-jvm:$spekVersion"
+        testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
+        testRuntimeOnly "org.spekframework.spek2:spek-runner-junit5:$spekVersion"
+        testRuntimeOnly "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
     }
 
     contacts {
@@ -97,4 +111,9 @@ allprojects {
         }
     }
 
+    test {
+        useJUnitPlatform {
+            includeEngines 'spek2'
+        }
+    }
 }