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

Upgrade to Kotlin 1.5.30, fix implicit task dependencies

Browse Source
This commit is contained in:
Edwin Jakobs
2021-08-27 15:04:03 +02:00
parent 701f14400a
commit b24054c3e7
5 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@@ -12,9 +12,9 @@ buildscript {
plugins { 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' version '1.5.20' apply false id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
id 'org.jetbrains.kotlin.multiplatform' version '1.5.20' apply false id 'org.jetbrains.kotlin.multiplatform' version '1.5.30' apply false
id 'org.jetbrains.kotlin.plugin.serialization' version '1.5.20' apply false id 'org.jetbrains.kotlin.plugin.serialization' version '1.5.30' apply false
} }
def multiplatformModules = [ def multiplatformModules = [
@@ -38,7 +38,7 @@ def multiplatformModules = [
project.ext { project.ext {
kotlinApiVersion = '1.4' kotlinApiVersion = '1.4'
kotlinLanguageVersion = '1.4' kotlinLanguageVersion = '1.4'
kotlinVersion = '1.5.20' kotlinVersion = '1.5.30'
kotlinLoggingVersion = '2.0.8' kotlinLoggingVersion = '2.0.8'
kotlinxSerializationVersion = '1.1.0' kotlinxSerializationVersion = '1.1.0'
spekVersion = '2.0.15' spekVersion = '2.0.15'
@@ -57,7 +57,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.20" kotlinVersion = "1.5.30"
kotlinApiVersion = "1.4" kotlinApiVersion = "1.4"
spekVersion = "2.0.15" spekVersion = "2.0.15"
libfreenectVersion = "0.5.7-1.5.5" libfreenectVersion = "0.5.7-1.5.5"

1
gradle.properties Normal file
View File

@@ -0,0 +1 @@
org.gradle.parallel=true

3
orx-fx/build.gradle.kts
View File

@@ -114,3 +114,6 @@ val embedShaders = tasks.register<EmbedShadersTask>("embedShaders") {
tasks.getByName("compileKotlinJvm").dependsOn(embedShaders) tasks.getByName("compileKotlinJvm").dependsOn(embedShaders)
tasks.getByName("compileKotlinJs").dependsOn(embedShaders) tasks.getByName("compileKotlinJs").dependsOn(embedShaders)
tasks.getByName("compileKotlinMetadata").dependsOn(embedShaders)
tasks.getByName("jvmSourcesJar").dependsOn(embedShaders)
tasks.getByName("sourcesJar").dependsOn(embedShaders)

3
orx-jvm/orx-keyframer/build.gradle
View File

@@ -48,4 +48,5 @@ dependencies {
demoImplementation(sourceSets.getByName("main").output) demoImplementation(sourceSets.getByName("main").output)
} }
tasks.getByName("compileKotlin").dependsOn("generateGrammarSource") tasks.getByName("compileKotlin").dependsOn("generateGrammarSource")
tasks.getByName("compileTestKotlin").dependsOn("generateTestGrammarSource")

3
orx-shader-phrases/build.gradle.kts
View File

@@ -110,3 +110,6 @@ val embedShaders = tasks.register<EmbedShadersTask>("embedShaders") {
tasks.getByName("compileKotlinJvm").dependsOn(embedShaders) tasks.getByName("compileKotlinJvm").dependsOn(embedShaders)
tasks.getByName("compileKotlinJs").dependsOn(embedShaders) tasks.getByName("compileKotlinJs").dependsOn(embedShaders)
tasks.getByName("compileKotlinMetadata").dependsOn(embedShaders)
tasks.getByName("jvmSourcesJar").dependsOn(embedShaders)
tasks.getByName("sourcesJar").dependsOn(embedShaders)