kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade kotlin to 1.4.21, openrndr to 0.3.45-rc.8

Browse Source
This commit is contained in:
Edwin Jakobs
2021-01-10 21:44:56 +01:00
parent 4996a7fb5f
commit 1659700b0b
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build.gradle
View File

@@ -10,7 +10,7 @@ buildscript {
} }
} }
plugins { plugins {
id 'org.jetbrains.kotlin.jvm' version '1.4.0' id 'org.jetbrains.kotlin.jvm' version '1.4.21'
} }
def openrndrUseSnapshot = false def openrndrUseSnapshot = false
@@ -18,8 +18,8 @@ def openrndrUseSnapshot = false
apply plugin: 'org.jetbrains.dokka' apply plugin: 'org.jetbrains.dokka'
project.ext { project.ext {
openrndrVersion = openrndrUseSnapshot? "0.4.0-SNAPSHOT" : "0.3.45-rc.6" openrndrVersion = openrndrUseSnapshot? "0.4.0-SNAPSHOT" : "0.3.45-rc.8"
kotlinVersion = "1.4.0" kotlinVersion = "1.4.21"
spekVersion = "2.0.12" spekVersion = "2.0.12"
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"
@@ -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:1.7.9' implementation 'io.github.microutils:kotlin-logging-jvm:2.0.2'
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.3.9' 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.61" testImplementation "org.amshove.kluent:kluent:1.64"
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"
@@ -98,7 +98,6 @@ allprojects {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8
} }
javadoc { javadoc {
options.addBooleanOption 'Xdoclint:none', true options.addBooleanOption 'Xdoclint:none', true
} }
@@ -115,6 +114,11 @@ allprojects {
includeEngines 'spek2' includeEngines 'spek2'
} }
} }
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
kotlinOptions {
jvmTarget = "1.8"
}
}
} }
task buildMainReadme { task buildMainReadme {