From a8e23ad651c1f8fe9e7bd183a345ec3c3e65935a Mon Sep 17 00:00:00 2001
From: Edwin Jakobs <edwin@rndr.studio>
Date: Thu, 2 Nov 2023 15:16:01 +0100
Subject: [PATCH] Upgrade to Kotlin 1.9.20, Nebula release 18.0.3

---
 gradle/libs.versions.toml           |  4 ++--
 orx-fx/build.gradle.kts             | 10 +++-------
 orx-jumpflood/build.gradle.kts      |  7 +------
 orx-noise/build.gradle.kts          |  8 +-------
 orx-shader-phrases/build.gradle.kts |  8 +-------
 5 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3aa09db7..2df8dc1e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
 kotlinApi = "1.9"
 kotlinLanguage = "1.9"
-kotlin = "1.9.10"
+kotlin = "1.9.20"
 jvmTarget = "11"
 openrndr = { require = "[0.4.2, 0.5.0)" }
 kotlinxCoroutines = "1.7.3"
 kotlinLogging = "3.0.0"
 kotlinxSerialization = "1.6.0"
 dokka = "1.7.10"
-nebulaRelease = "17.2.2"
+nebulaRelease = "18.0.3"
 gradleNexusPublish = "2.0.0-rc-1"
 spek = "2.0.19"
 boofcv = "1.0.0"
diff --git a/orx-fx/build.gradle.kts b/orx-fx/build.gradle.kts
index 9a6894a7..d0389489 100644
--- a/orx-fx/build.gradle.kts
+++ b/orx-fx/build.gradle.kts
@@ -12,14 +12,12 @@ val embedShaders = tasks.register<EmbedShadersTask>("embedShaders") {
 
 
 kotlin {
+    kotlin.sourceSets.getByName("commonMain").kotlin.srcDir(embedShaders.outputDir)
     sourceSets {
-        val shaderKotlin by creating {
-            this.kotlin.srcDir(embedShaders.outputDir)
-        }
-
-        @Suppress("UNUSED_VARIABLE")
+@Suppress("UNUSED_VARIABLE")
         val commonMain by getting {
             dependencies {
+
                 implementation(project(":orx-parameters"))
                 implementation(project(":orx-shader-phrases"))
                 implementation(project(":orx-color"))
@@ -27,9 +25,7 @@ kotlin {
                 implementation(libs.openrndr.draw)
                 implementation(libs.openrndr.filter)
                 implementation(libs.kotlin.reflect)
-                api(shaderKotlin.kotlin)
             }
-            dependsOn(shaderKotlin)
         }
 
         @Suppress("UNUSED_VARIABLE")
diff --git a/orx-jumpflood/build.gradle.kts b/orx-jumpflood/build.gradle.kts
index 16d5f9ef..06f86ff9 100644
--- a/orx-jumpflood/build.gradle.kts
+++ b/orx-jumpflood/build.gradle.kts
@@ -11,11 +11,8 @@ val embedShaders = tasks.register<EmbedShadersTask>("embedShaders") {
 }.get()
 
 kotlin {
+    kotlin.sourceSets.getByName("commonMain").kotlin.srcDir(embedShaders.outputDir)
     sourceSets {
-        val shaderKotlin by creating {
-            this.kotlin.srcDir(embedShaders.outputDir)
-        }
-
         @Suppress("UNUSED_VARIABLE")
         val commonMain by getting {
             dependencies {
@@ -25,9 +22,7 @@ kotlin {
                 implementation(libs.openrndr.draw)
                 implementation(libs.openrndr.filter)
                 implementation(libs.kotlin.reflect)
-                api(shaderKotlin.kotlin)
             }
-            dependsOn(shaderKotlin)
         }
 
         @Suppress("UNUSED_VARIABLE")
diff --git a/orx-noise/build.gradle.kts b/orx-noise/build.gradle.kts
index b905e7d7..464e02f5 100644
--- a/orx-noise/build.gradle.kts
+++ b/orx-noise/build.gradle.kts
@@ -19,11 +19,8 @@ kotlin {
         }
     }
 
+    kotlin.sourceSets.getByName("commonMain").kotlin.srcDir(embedShaders.outputDir)
     sourceSets {
-        val shaderKotlin by creating {
-            this.kotlin.srcDir(embedShaders.outputDir)
-        }
-
         @Suppress("UNUSED_VARIABLE")
         val commonMain by getting {
             dependencies {
@@ -33,12 +30,9 @@ kotlin {
                 implementation(project(":orx-hash-grid"))
                 implementation(project(":orx-parameters"))
                 implementation(project(":orx-shader-phrases"))
-                api(shaderKotlin.kotlin)
             }
-            dependsOn(shaderKotlin)
         }
 
-
         @Suppress("UNUSED_VARIABLE")
         val jvmTest by getting {
             dependencies {
diff --git a/orx-shader-phrases/build.gradle.kts b/orx-shader-phrases/build.gradle.kts
index b103ce57..cbb3dea3 100644
--- a/orx-shader-phrases/build.gradle.kts
+++ b/orx-shader-phrases/build.gradle.kts
@@ -16,23 +16,17 @@ kotlin {
             }
         }
     }
+    kotlin.sourceSets.getByName("commonMain").kotlin.srcDir(embedShaders.outputDir)
     sourceSets {
-        val shaderKotlin by creating {
-            this.kotlin.srcDir(embedShaders.outputDir)
-        }
-
         @Suppress("UNUSED_VARIABLE")
         val commonMain by getting {
             dependencies {
                 implementation(libs.openrndr.application)
                 implementation(libs.openrndr.draw)
                 implementation(libs.kotlin.reflect)
-                api(shaderKotlin.kotlin)
             }
-            dependsOn(shaderKotlin)
         }
 
-
         @Suppress("UNUSED_VARIABLE")
         val jvmTest by getting {
             dependencies {