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

Upgrade to Kotlin 1.6.0, Gradle 7.3

Browse Source
This commit is contained in:
Edwin Jakobs
2021-11-17 20:52:38 +01:00
parent bae1f071c4
commit b03264fc2f
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle
View File

@@ -14,7 +14,7 @@ plugins {
// remember to update all the versions here when upgrading kotlin version // remember to update all the versions here when upgrading kotlin version
id 'org.jetbrains.kotlin.jvm' apply false id 'org.jetbrains.kotlin.jvm' apply false
id 'org.jetbrains.kotlin.multiplatform' apply false id 'org.jetbrains.kotlin.multiplatform' apply false
id 'org.jetbrains.kotlin.plugin.serialization' version '1.5.31' apply false id 'org.jetbrains.kotlin.plugin.serialization' version '1.6.0' apply false
} }
def multiplatformModules = [ def multiplatformModules = [
@@ -35,11 +35,11 @@ def multiplatformModules = [
] ]
project.ext { project.ext {
kotlinApiVersion = '1.4' kotlinApiVersion = '1.6'
kotlinLanguageVersion = '1.4' kotlinLanguageVersion = '1.6'
kotlinVersion = '1.5.31' kotlinVersion = '1.6.0'
kotlinLoggingVersion = '2.0.8' kotlinLoggingVersion = '2.0.8'
kotlinxSerializationVersion = '1.3.0-RC' kotlinxSerializationVersion = '1.3.1'
spekVersion = '2.0.15' spekVersion = '2.0.15'
kluentVersion = '1.65' kluentVersion = '1.65'
jsoupVersion = '1.13.1' jsoupVersion = '1.13.1'
@@ -56,7 +56,7 @@ ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
project.ext { project.ext {
openrndrVersion = openrndrUseSnapshot? "0.5.1-SNAPSHOT" : "0.4.0" openrndrVersion = openrndrUseSnapshot? "0.5.1-SNAPSHOT" : "0.4.0"
jvmTarget = "1.8" jvmTarget = "1.8"
kotlinVersion = "1.5.31" kotlinVersion = "1.6.0"
kotlinApiVersion = "1.4" kotlinApiVersion = "1.4"
spekVersion = "2.0.15" spekVersion = "2.0.15"
libfreenectVersion = "0.5.7-1.5.4" libfreenectVersion = "0.5.7-1.5.4"

2
buildSrc/build.gradle.kts
View File

@@ -22,7 +22,7 @@ repositories {
dependencies { dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0")
val preloadImplementation by configurations.getting { } val preloadImplementation by configurations.getting { }
preloadImplementation("org.openrndr:openrndr-application:0.5.1-SNAPSHOT") preloadImplementation("org.openrndr:openrndr-application:0.5.1-SNAPSHOT")
preloadImplementation("org.openrndr:openrndr-extensions:0.5.1-SNAPSHOT") preloadImplementation("org.openrndr:openrndr-extensions:0.5.1-SNAPSHOT")

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -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-7.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists