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

Upgrade to Kotlin 1.9.20, Nebula release 18.0.3

Browse Source
This commit is contained in:
Edwin Jakobs
2023-11-02 15:16:01 +01:00
parent 5ccb6f2170
commit a8e23ad651
5 changed files with 8 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gradle/libs.versions.toml
View File

@@ -1,14 +1,14 @@
[versions] [versions]
kotlinApi = "1.9" kotlinApi = "1.9"
kotlinLanguage = "1.9" kotlinLanguage = "1.9"
kotlin = "1.9.10" kotlin = "1.9.20"
jvmTarget = "11" jvmTarget = "11"
openrndr = { require = "[0.4.2, 0.5.0)" } openrndr = { require = "[0.4.2, 0.5.0)" }
kotlinxCoroutines = "1.7.3" kotlinxCoroutines = "1.7.3"
kotlinLogging = "3.0.0" kotlinLogging = "3.0.0"
kotlinxSerialization = "1.6.0" kotlinxSerialization = "1.6.0"
dokka = "1.7.10" dokka = "1.7.10"
nebulaRelease = "17.2.2" nebulaRelease = "18.0.3"
gradleNexusPublish = "2.0.0-rc-1" gradleNexusPublish = "2.0.0-rc-1"
spek = "2.0.19" spek = "2.0.19"
boofcv = "1.0.0" boofcv = "1.0.0"

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

@@ -12,14 +12,12 @@ val embedShaders = tasks.register<EmbedShadersTask>("embedShaders") {
kotlin { kotlin {
kotlin.sourceSets.getByName("commonMain").kotlin.srcDir(embedShaders.outputDir)
sourceSets { sourceSets {
val shaderKotlin by creating { @Suppress("UNUSED_VARIABLE")
this.kotlin.srcDir(embedShaders.outputDir)
}
@Suppress("UNUSED_VARIABLE")
val commonMain by getting { val commonMain by getting {
dependencies { dependencies {
implementation(project(":orx-parameters")) implementation(project(":orx-parameters"))
implementation(project(":orx-shader-phrases")) implementation(project(":orx-shader-phrases"))
implementation(project(":orx-color")) implementation(project(":orx-color"))
@@ -27,9 +25,7 @@ kotlin {
implementation(libs.openrndr.draw) implementation(libs.openrndr.draw)
implementation(libs.openrndr.filter) implementation(libs.openrndr.filter)
implementation(libs.kotlin.reflect) implementation(libs.kotlin.reflect)
api(shaderKotlin.kotlin)
} }
dependsOn(shaderKotlin)
} }
@Suppress("UNUSED_VARIABLE") @Suppress("UNUSED_VARIABLE")

7
orx-jumpflood/build.gradle.kts
View File

@@ -11,11 +11,8 @@ val embedShaders = tasks.register<EmbedShadersTask>("embedShaders") {
}.get() }.get()
kotlin { kotlin {
kotlin.sourceSets.getByName("commonMain").kotlin.srcDir(embedShaders.outputDir)
sourceSets { sourceSets {
val shaderKotlin by creating {
this.kotlin.srcDir(embedShaders.outputDir)
}
@Suppress("UNUSED_VARIABLE") @Suppress("UNUSED_VARIABLE")
val commonMain by getting { val commonMain by getting {
dependencies { dependencies {
@@ -25,9 +22,7 @@ kotlin {
implementation(libs.openrndr.draw) implementation(libs.openrndr.draw)
implementation(libs.openrndr.filter) implementation(libs.openrndr.filter)
implementation(libs.kotlin.reflect) implementation(libs.kotlin.reflect)
api(shaderKotlin.kotlin)
} }
dependsOn(shaderKotlin)
} }
@Suppress("UNUSED_VARIABLE") @Suppress("UNUSED_VARIABLE")

8
orx-noise/build.gradle.kts
View File

@@ -19,11 +19,8 @@ kotlin {
} }
} }
kotlin.sourceSets.getByName("commonMain").kotlin.srcDir(embedShaders.outputDir)
sourceSets { sourceSets {
val shaderKotlin by creating {
this.kotlin.srcDir(embedShaders.outputDir)
}
@Suppress("UNUSED_VARIABLE") @Suppress("UNUSED_VARIABLE")
val commonMain by getting { val commonMain by getting {
dependencies { dependencies {
@@ -33,12 +30,9 @@ kotlin {
implementation(project(":orx-hash-grid")) implementation(project(":orx-hash-grid"))
implementation(project(":orx-parameters")) implementation(project(":orx-parameters"))
implementation(project(":orx-shader-phrases")) implementation(project(":orx-shader-phrases"))
api(shaderKotlin.kotlin)
} }
dependsOn(shaderKotlin)
} }
@Suppress("UNUSED_VARIABLE") @Suppress("UNUSED_VARIABLE")
val jvmTest by getting { val jvmTest by getting {
dependencies { dependencies {

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

@@ -16,23 +16,17 @@ kotlin {
} }
} }
} }
kotlin.sourceSets.getByName("commonMain").kotlin.srcDir(embedShaders.outputDir)
sourceSets { sourceSets {
val shaderKotlin by creating {
this.kotlin.srcDir(embedShaders.outputDir)
}
@Suppress("UNUSED_VARIABLE") @Suppress("UNUSED_VARIABLE")
val commonMain by getting { val commonMain by getting {
dependencies { dependencies {
implementation(libs.openrndr.application) implementation(libs.openrndr.application)
implementation(libs.openrndr.draw) implementation(libs.openrndr.draw)
implementation(libs.kotlin.reflect) implementation(libs.kotlin.reflect)
api(shaderKotlin.kotlin)
} }
dependsOn(shaderKotlin)
} }
@Suppress("UNUSED_VARIABLE") @Suppress("UNUSED_VARIABLE")
val jvmTest by getting { val jvmTest by getting {
dependencies { dependencies {