Merge remote-tracking branch 'upstream/master' into feature/7/kinect1Support

# Conflicts:
#	settings.gradle
This commit is contained in:
Kazik Pogoda
2019-08-26 10:25:47 +02:00
8 changed files with 153 additions and 26 deletions

View File

@@ -10,7 +10,7 @@ buildscript {
plugins {
// plugin dependencies, load without applying them
id 'nebula.kotlin' version '1.3.41' apply false
id 'nebula.kotlin' version '1.3.50' apply false
id 'com.jfrog.artifactory' version '4.6.2' apply false
id 'nebula.contacts' version '4.1.1' apply false
@@ -38,7 +38,7 @@ plugins {
project.ext {
openrndrVersion = "0.3.35"
kotlinVersion = "1.3.41"
kotlinVersion = "1.3.50"
spekVersion = "2.0.6"
libfreenectVersion = "0.5.7-1.5.1"
}
@@ -66,16 +66,14 @@ allprojects {
repositories {
mavenCentral()
jcenter()
maven {
url = "https://dl.bintray.com/openrndr/openrndr"
}
maven {
url "https://dl.bintray.com/spekframework/spek"
}
}
dependencies {
@@ -83,11 +81,12 @@ allprojects {
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-RC2'
testImplementation "org.spekframework.spek2:spek-dsl-jvm:$spekVersion"
testImplementation "org.amshove.kluent:kluent:1.53"
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
testRuntimeOnly "org.spekframework.spek2:spek-runner-junit5:$spekVersion"
testRuntimeOnly "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
runtime "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
}
contacts {