From b24054c3e789429fbe9184838338b8bae02d10a5 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Fri, 27 Aug 2021 15:04:03 +0200 Subject: [PATCH] Upgrade to Kotlin 1.5.30, fix implicit task dependencies --- build.gradle | 10 +++++----- gradle.properties | 1 + orx-fx/build.gradle.kts | 3 +++ orx-jvm/orx-keyframer/build.gradle | 3 ++- orx-shader-phrases/build.gradle.kts | 3 +++ 5 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 gradle.properties diff --git a/build.gradle b/build.gradle index 5b2a2790..3c3b5dac 100644 --- a/build.gradle +++ b/build.gradle @@ -12,9 +12,9 @@ buildscript { plugins { // 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.multiplatform' version '1.5.20' apply false - id 'org.jetbrains.kotlin.plugin.serialization' 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.30' apply false + id 'org.jetbrains.kotlin.plugin.serialization' version '1.5.30' apply false } def multiplatformModules = [ @@ -38,7 +38,7 @@ def multiplatformModules = [ project.ext { kotlinApiVersion = '1.4' kotlinLanguageVersion = '1.4' - kotlinVersion = '1.5.20' + kotlinVersion = '1.5.30' kotlinLoggingVersion = '2.0.8' kotlinxSerializationVersion = '1.1.0' spekVersion = '2.0.15' @@ -57,7 +57,7 @@ ext.isReleaseVersion = !version.endsWith("SNAPSHOT") project.ext { openrndrVersion = openrndrUseSnapshot? "0.5.1-SNAPSHOT" : "0.4.0" jvmTarget = "1.8" - kotlinVersion = "1.5.20" + kotlinVersion = "1.5.30" kotlinApiVersion = "1.4" spekVersion = "2.0.15" libfreenectVersion = "0.5.7-1.5.5" diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..af82e006 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +org.gradle.parallel=true \ No newline at end of file diff --git a/orx-fx/build.gradle.kts b/orx-fx/build.gradle.kts index ea793285..5b01c490 100644 --- a/orx-fx/build.gradle.kts +++ b/orx-fx/build.gradle.kts @@ -114,3 +114,6 @@ val embedShaders = tasks.register("embedShaders") { tasks.getByName("compileKotlinJvm").dependsOn(embedShaders) tasks.getByName("compileKotlinJs").dependsOn(embedShaders) +tasks.getByName("compileKotlinMetadata").dependsOn(embedShaders) +tasks.getByName("jvmSourcesJar").dependsOn(embedShaders) +tasks.getByName("sourcesJar").dependsOn(embedShaders) diff --git a/orx-jvm/orx-keyframer/build.gradle b/orx-jvm/orx-keyframer/build.gradle index 00c02bdc..fab19d0a 100644 --- a/orx-jvm/orx-keyframer/build.gradle +++ b/orx-jvm/orx-keyframer/build.gradle @@ -48,4 +48,5 @@ dependencies { demoImplementation(sourceSets.getByName("main").output) } -tasks.getByName("compileKotlin").dependsOn("generateGrammarSource") \ No newline at end of file +tasks.getByName("compileKotlin").dependsOn("generateGrammarSource") +tasks.getByName("compileTestKotlin").dependsOn("generateTestGrammarSource") \ No newline at end of file diff --git a/orx-shader-phrases/build.gradle.kts b/orx-shader-phrases/build.gradle.kts index 4f32a59b..15851e16 100644 --- a/orx-shader-phrases/build.gradle.kts +++ b/orx-shader-phrases/build.gradle.kts @@ -110,3 +110,6 @@ val embedShaders = tasks.register("embedShaders") { tasks.getByName("compileKotlinJvm").dependsOn(embedShaders) tasks.getByName("compileKotlinJs").dependsOn(embedShaders) +tasks.getByName("compileKotlinMetadata").dependsOn(embedShaders) +tasks.getByName("jvmSourcesJar").dependsOn(embedShaders) +tasks.getByName("sourcesJar").dependsOn(embedShaders)