From f836d8685710e56b2bfb34c75c048f8910b85aeb Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Fri, 19 Sep 2025 21:17:24 -0700 Subject: [PATCH] Reflect changes in openrndr (#377) --- build-logic/orx-convention/build.gradle.kts | 2 +- .../org/openrndr/extra/convention/kotlin-jvm.gradle.kts | 4 ++-- .../extra/convention/kotlin-multiplatform.gradle.kts | 6 +++--- gradle/libs.versions.toml | 2 +- orx-camera/build.gradle.kts | 2 +- orx-color/build.gradle.kts | 2 +- orx-composition/build.gradle.kts | 2 +- orx-compositor/build.gradle.kts | 2 +- orx-delegate-magic/build.gradle.kts | 2 +- orx-depth-camera/build.gradle.kts | 2 +- orx-easing/build.gradle.kts | 2 +- orx-envelopes/build.gradle.kts | 2 +- orx-expression-evaluator-typed/build.gradle.kts | 2 +- orx-expression-evaluator/build.gradle.kts | 2 +- orx-fcurve/build.gradle.kts | 2 +- orx-fx/build.gradle.kts | 2 +- orx-gradient-descent/build.gradle.kts | 2 +- orx-hash-grid/build.gradle.kts | 2 +- orx-image-fit/build.gradle.kts | 2 +- orx-integral-image/build.gradle.kts | 2 +- orx-jumpflood/build.gradle.kts | 2 +- orx-jvm/orx-axidraw/build.gradle.kts | 2 +- orx-jvm/orx-boofcv/build.gradle.kts | 2 +- orx-jvm/orx-chataigne/build.gradle.kts | 2 +- orx-jvm/orx-depth-camera-calibrator/build.gradle.kts | 2 +- orx-jvm/orx-dnk3/build.gradle.kts | 2 +- orx-jvm/orx-file-watcher/build.gradle.kts | 2 +- orx-jvm/orx-git-archiver/build.gradle.kts | 2 +- orx-jvm/orx-gui/build.gradle.kts | 2 +- orx-jvm/orx-keyframer/build.gradle.kts | 2 +- orx-jvm/orx-kinect-common/build.gradle.kts | 2 +- orx-jvm/orx-kinect-v1-demo/build.gradle.kts | 4 ++-- orx-jvm/orx-kinect-v1/build.gradle.kts | 2 +- orx-jvm/orx-midi/build.gradle.kts | 2 +- orx-jvm/orx-minim/build.gradle.kts | 2 +- orx-jvm/orx-olive/build.gradle.kts | 2 +- orx-jvm/orx-panel/build.gradle.kts | 2 +- orx-jvm/orx-poisson-fill/build.gradle.kts | 2 +- orx-jvm/orx-processing/build.gradle.kts | 2 +- orx-jvm/orx-rabbit-control/build.gradle.kts | 2 +- orx-jvm/orx-realsense2/build.gradle.kts | 2 +- orx-jvm/orx-syphon/build.gradle.kts | 2 +- orx-kdtree/build.gradle.kts | 2 +- orx-mesh-generators/build.gradle.kts | 2 +- orx-mesh-noise/build.gradle.kts | 2 +- orx-mesh/build.gradle.kts | 2 +- orx-no-clear/build.gradle.kts | 2 +- orx-obj-loader/build.gradle.kts | 2 +- orx-palette/build.gradle.kts | 2 +- orx-parameters/build.gradle.kts | 2 +- orx-property-watchers/build.gradle.kts | 2 +- orx-quadtree/build.gradle.kts | 2 +- orx-shade-styles/build.gradle.kts | 2 +- orx-shader-phrases/build.gradle.kts | 2 +- orx-shapes/build.gradle.kts | 2 +- orx-temporal-blur/build.gradle.kts | 2 +- orx-text-on-contour/build.gradle.kts | 2 +- orx-text-writer/build.gradle.kts | 2 +- orx-time-operators/build.gradle.kts | 2 +- orx-timer/build.gradle.kts | 2 +- orx-view-box/build.gradle.kts | 2 +- 61 files changed, 65 insertions(+), 65 deletions(-) diff --git a/build-logic/orx-convention/build.gradle.kts b/build-logic/orx-convention/build.gradle.kts index 03fade28..127fc548 100644 --- a/build-logic/orx-convention/build.gradle.kts +++ b/build-logic/orx-convention/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { implementation(project(":orx-variant-plugin")) implementation(libs.findLibrary("kotlin-gradle-plugin").get()) implementation(libs.findLibrary("dokka-gradle-plugin").get()) - "preloadImplementation"(openrndr.application) + "preloadImplementation"(openrndr.application.core) "preloadImplementation"(openrndr.orextensions) } kotlin { diff --git a/build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts b/build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts index 8c493363..56f40f13 100644 --- a/build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts +++ b/build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts @@ -57,10 +57,10 @@ dependencies { testImplementation(sharedLibs.findLibrary("kotlin-test").get()) testRuntimeOnly(sharedLibs.findLibrary("slf4j-simple").get()) "demoImplementation"(main.output.classesDirs + main.runtimeClasspath) - "demoImplementation"(openrndr.findLibrary("application").get()) + "demoImplementation"(openrndr.findLibrary("application-core").get()) "demoImplementation"(openrndr.findLibrary("orextensions").get()) - "demoRuntimeOnly"(openrndr.findLibrary("gl3").get()) + "demoRuntimeOnly"(openrndr.findLibrary("application-glfw").get()) "demoRuntimeOnly"(sharedLibs.findLibrary("slf4j-simple").get()) } diff --git a/build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts b/build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts index 5e281f2c..60dd134b 100644 --- a/build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts +++ b/build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts @@ -64,7 +64,7 @@ kotlin { dependsOn(compileTaskProvider) } dependencies { - runtimeOnly(openrndr.findLibrary("gl3").get()) + runtimeOnly(openrndr.findLibrary("application-glfw").get()) } } @@ -109,9 +109,9 @@ kotlin { val jvmDemo by getting { dependencies { - implementation(openrndr.findLibrary("application").get()) + implementation(openrndr.findLibrary("application-core").get()) implementation(openrndr.findLibrary("orextensions").get()) - runtimeOnly(openrndr.findLibrary("gl3").get()) + runtimeOnly(openrndr.findLibrary("application-glfw").get()) runtimeOnly(sharedLibs.findLibrary("slf4j-simple").get()) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d7b86274..ab4b1426 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlinApi = "2.2" kotlinLanguage = "2.2" -kotlin = "2.2.10" +kotlin = "2.2.20" jvmTarget = "17" openrndr = { require = "[0.5,0.6.0)" } kotest = "5.9.1" diff --git a/orx-camera/build.gradle.kts b/orx-camera/build.gradle.kts index 7dcb411e..5578f0f9 100644 --- a/orx-camera/build.gradle.kts +++ b/orx-camera/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { dependencies { implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.draw) implementation(openrndr.filter) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-color/build.gradle.kts b/orx-color/build.gradle.kts index b8db0997..a198d217 100644 --- a/orx-color/build.gradle.kts +++ b/orx-color/build.gradle.kts @@ -12,7 +12,7 @@ kotlin { implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) implementation(sharedLibs.kotlin.serialization.core) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.draw) implementation(openrndr.filter) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-composition/build.gradle.kts b/orx-composition/build.gradle.kts index 3a10684a..af4f8055 100644 --- a/orx-composition/build.gradle.kts +++ b/orx-composition/build.gradle.kts @@ -8,7 +8,7 @@ kotlin { @Suppress("UNUSED_VARIABLE") val commonMain by getting { dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.draw) implementation(openrndr.filter) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-compositor/build.gradle.kts b/orx-compositor/build.gradle.kts index 78cf4f4a..a62892c6 100644 --- a/orx-compositor/build.gradle.kts +++ b/orx-compositor/build.gradle.kts @@ -10,7 +10,7 @@ kotlin { implementation(project(":orx-fx")) implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.draw) implementation(openrndr.filter) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-delegate-magic/build.gradle.kts b/orx-delegate-magic/build.gradle.kts index c760a41a..7713770d 100644 --- a/orx-delegate-magic/build.gradle.kts +++ b/orx-delegate-magic/build.gradle.kts @@ -8,7 +8,7 @@ kotlin { val commonMain by getting { dependencies { implementation(project(":orx-parameters")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.draw) implementation(openrndr.filter) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-depth-camera/build.gradle.kts b/orx-depth-camera/build.gradle.kts index 4cdcf4a0..e84da1f8 100644 --- a/orx-depth-camera/build.gradle.kts +++ b/orx-depth-camera/build.gradle.kts @@ -7,7 +7,7 @@ kotlin { @Suppress("UNUSED_VARIABLE") val commonMain by getting { dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) } } diff --git a/orx-easing/build.gradle.kts b/orx-easing/build.gradle.kts index e72dd101..9a82c702 100644 --- a/orx-easing/build.gradle.kts +++ b/orx-easing/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { val commonMain by getting { dependencies { implementation(project(":orx-parameters")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.draw) implementation(openrndr.filter) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-envelopes/build.gradle.kts b/orx-envelopes/build.gradle.kts index 01327cd8..30d05825 100644 --- a/orx-envelopes/build.gradle.kts +++ b/orx-envelopes/build.gradle.kts @@ -8,7 +8,7 @@ kotlin { val commonMain by getting { dependencies { implementation(project(":orx-parameters")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.draw) implementation(openrndr.filter) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-expression-evaluator-typed/build.gradle.kts b/orx-expression-evaluator-typed/build.gradle.kts index be23d1c9..0ed23705 100644 --- a/orx-expression-evaluator-typed/build.gradle.kts +++ b/orx-expression-evaluator-typed/build.gradle.kts @@ -7,7 +7,7 @@ kotlin { val commonMain by getting { dependencies { implementation(libs.antlr.kotlin.runtime) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(sharedLibs.kotlin.coroutines) implementation(project(":orx-property-watchers")) diff --git a/orx-expression-evaluator/build.gradle.kts b/orx-expression-evaluator/build.gradle.kts index e334fbdd..d1dfb39b 100644 --- a/orx-expression-evaluator/build.gradle.kts +++ b/orx-expression-evaluator/build.gradle.kts @@ -32,7 +32,7 @@ kotlin { val commonMain by getting { dependencies { implementation(libs.antlr.kotlin.runtime) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(sharedLibs.kotlin.coroutines) implementation(project(":orx-property-watchers")) diff --git a/orx-fcurve/build.gradle.kts b/orx-fcurve/build.gradle.kts index f00c0ec4..c738682c 100644 --- a/orx-fcurve/build.gradle.kts +++ b/orx-fcurve/build.gradle.kts @@ -10,7 +10,7 @@ kotlin { dependencies { implementation(project(":orx-parameters")) implementation(project(":orx-expression-evaluator")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.draw) implementation(openrndr.filter) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-fx/build.gradle.kts b/orx-fx/build.gradle.kts index a7d97d55..0df4f6cd 100644 --- a/orx-fx/build.gradle.kts +++ b/orx-fx/build.gradle.kts @@ -21,7 +21,7 @@ kotlin { implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) implementation(project(":orx-color")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.draw) implementation(openrndr.filter) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-gradient-descent/build.gradle.kts b/orx-gradient-descent/build.gradle.kts index 5d4b20b4..a5640c12 100644 --- a/orx-gradient-descent/build.gradle.kts +++ b/orx-gradient-descent/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { dependencies { implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.draw) implementation(openrndr.filter) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-hash-grid/build.gradle.kts b/orx-hash-grid/build.gradle.kts index a2b1f9eb..d322b652 100644 --- a/orx-hash-grid/build.gradle.kts +++ b/orx-hash-grid/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { dependencies { implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.draw) implementation(openrndr.filter) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-image-fit/build.gradle.kts b/orx-image-fit/build.gradle.kts index 1c6ae7cd..3a84ef1c 100644 --- a/orx-image-fit/build.gradle.kts +++ b/orx-image-fit/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { dependencies { implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.draw) implementation(openrndr.filter) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-integral-image/build.gradle.kts b/orx-integral-image/build.gradle.kts index 64de2327..a2404108 100644 --- a/orx-integral-image/build.gradle.kts +++ b/orx-integral-image/build.gradle.kts @@ -4,7 +4,7 @@ plugins { dependencies { implementation(project(":orx-fx")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) demoImplementation(project(":orx-image-fit")) } \ No newline at end of file diff --git a/orx-jumpflood/build.gradle.kts b/orx-jumpflood/build.gradle.kts index 7b97f0a0..eb6c9fc1 100644 --- a/orx-jumpflood/build.gradle.kts +++ b/orx-jumpflood/build.gradle.kts @@ -18,7 +18,7 @@ kotlin { dependencies { implementation(project(":orx-parameters")) implementation(project(":orx-fx")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.draw) implementation(openrndr.filter) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-jvm/orx-axidraw/build.gradle.kts b/orx-jvm/orx-axidraw/build.gradle.kts index 80ac5657..1392407a 100644 --- a/orx-jvm/orx-axidraw/build.gradle.kts +++ b/orx-jvm/orx-axidraw/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.dialogs) implementation(project(":orx-jvm:orx-gui")) api(project(":orx-composition")) diff --git a/orx-jvm/orx-boofcv/build.gradle.kts b/orx-jvm/orx-boofcv/build.gradle.kts index d2a760ab..9b0fa324 100644 --- a/orx-jvm/orx-boofcv/build.gradle.kts +++ b/orx-jvm/orx-boofcv/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) demoImplementation(project(":orx-shapes")) api(libs.boofcv) diff --git a/orx-jvm/orx-chataigne/build.gradle.kts b/orx-jvm/orx-chataigne/build.gradle.kts index 6fbfa8e7..3a9e7eba 100644 --- a/orx-jvm/orx-chataigne/build.gradle.kts +++ b/orx-jvm/orx-chataigne/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) api(project(":orx-jvm:orx-osc")) implementation(libs.gson) diff --git a/orx-jvm/orx-depth-camera-calibrator/build.gradle.kts b/orx-jvm/orx-depth-camera-calibrator/build.gradle.kts index 541fa4a4..94435b2c 100644 --- a/orx-jvm/orx-depth-camera-calibrator/build.gradle.kts +++ b/orx-jvm/orx-depth-camera-calibrator/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(project(":orx-fx")) api(project(":orx-depth-camera")) diff --git a/orx-jvm/orx-dnk3/build.gradle.kts b/orx-jvm/orx-dnk3/build.gradle.kts index 3c3749ab..d5d0d22a 100644 --- a/orx-jvm/orx-dnk3/build.gradle.kts +++ b/orx-jvm/orx-dnk3/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { implementation(project(":orx-easing")) implementation(project(":orx-shader-phrases")) implementation(project(":orx-mesh-generators")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(sharedLibs.kotlin.coroutines) demoImplementation(project(":orx-mesh-generators")) diff --git a/orx-jvm/orx-file-watcher/build.gradle.kts b/orx-jvm/orx-file-watcher/build.gradle.kts index d63cb69c..059fc78c 100644 --- a/orx-jvm/orx-file-watcher/build.gradle.kts +++ b/orx-jvm/orx-file-watcher/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(sharedLibs.kotlin.coroutines) } \ No newline at end of file diff --git a/orx-jvm/orx-git-archiver/build.gradle.kts b/orx-jvm/orx-git-archiver/build.gradle.kts index f88dc2a2..9d9b978c 100644 --- a/orx-jvm/orx-git-archiver/build.gradle.kts +++ b/orx-jvm/orx-git-archiver/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(libs.jgit) demoImplementation(project(":orx-mesh-generators")) diff --git a/orx-jvm/orx-gui/build.gradle.kts b/orx-jvm/orx-gui/build.gradle.kts index aaf8ada0..ca8d9d00 100644 --- a/orx-jvm/orx-gui/build.gradle.kts +++ b/orx-jvm/orx-gui/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { api(project(":orx-noise")) demoImplementation(project(":orx-property-watchers")) implementation(sharedLibs.kotlin.coroutines) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(openrndr.filter) implementation(openrndr.dialogs) diff --git a/orx-jvm/orx-keyframer/build.gradle.kts b/orx-jvm/orx-keyframer/build.gradle.kts index c6e15716..146367c5 100644 --- a/orx-jvm/orx-keyframer/build.gradle.kts +++ b/orx-jvm/orx-keyframer/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(libs.gson) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-jvm/orx-kinect-common/build.gradle.kts b/orx-jvm/orx-kinect-common/build.gradle.kts index 28841844..84da91a0 100644 --- a/orx-jvm/orx-kinect-common/build.gradle.kts +++ b/orx-jvm/orx-kinect-common/build.gradle.kts @@ -3,6 +3,6 @@ plugins { } dependencies { api(project(":orx-depth-camera")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) } \ No newline at end of file diff --git a/orx-jvm/orx-kinect-v1-demo/build.gradle.kts b/orx-jvm/orx-kinect-v1-demo/build.gradle.kts index 04104046..d566af50 100644 --- a/orx-jvm/orx-kinect-v1-demo/build.gradle.kts +++ b/orx-jvm/orx-kinect-v1-demo/build.gradle.kts @@ -3,12 +3,12 @@ plugins { } dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(project(":orx-jvm:orx-kinect-v1")) implementation(project(":orx-jvm:orx-depth-camera-calibrator")) implementation(project(":orx-fx")) implementation(project(":orx-jvm:orx-gui")) runtimeOnly(project(":orx-jvm:orx-kinect-v1")) - runtimeOnly(openrndr.gl3) + runtimeOnly(openrndr.application.glfw) } \ No newline at end of file diff --git a/orx-jvm/orx-kinect-v1/build.gradle.kts b/orx-jvm/orx-kinect-v1/build.gradle.kts index b5f5ac94..4f80a155 100644 --- a/orx-jvm/orx-kinect-v1/build.gradle.kts +++ b/orx-jvm/orx-kinect-v1/build.gradle.kts @@ -24,7 +24,7 @@ variants { } } dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(sharedLibs.kotlin.coroutines) api(project(":orx-jvm:orx-kinect-common")) diff --git a/orx-jvm/orx-midi/build.gradle.kts b/orx-jvm/orx-midi/build.gradle.kts index 1522447d..5f2f811f 100644 --- a/orx-jvm/orx-midi/build.gradle.kts +++ b/orx-jvm/orx-midi/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(sharedLibs.kotlin.reflect) implementation(sharedLibs.kotlin.coroutines) diff --git a/orx-jvm/orx-minim/build.gradle.kts b/orx-jvm/orx-minim/build.gradle.kts index 5eb4441f..9950a88c 100644 --- a/orx-jvm/orx-minim/build.gradle.kts +++ b/orx-jvm/orx-minim/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { api(libs.minim) { exclude(group = "org.apache.maven.plugins", module = "maven-javadoc-plugin") } - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(sharedLibs.kotlin.reflect) demoRuntimeOnly(sharedLibs.slf4j.simple) diff --git a/orx-jvm/orx-olive/build.gradle.kts b/orx-jvm/orx-olive/build.gradle.kts index 3eed8779..d6de6176 100644 --- a/orx-jvm/orx-olive/build.gradle.kts +++ b/orx-jvm/orx-olive/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { implementation(project(":orx-jvm:orx-file-watcher")) implementation(project(":orx-jvm:orx-kotlin-parser")) demoImplementation(project(":orx-jvm:orx-gui")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(libs.kotlin.scriptingJvm) implementation(libs.kotlin.scriptingJvmHost) diff --git a/orx-jvm/orx-panel/build.gradle.kts b/orx-jvm/orx-panel/build.gradle.kts index 13748987..a3050edc 100644 --- a/orx-jvm/orx-panel/build.gradle.kts +++ b/orx-jvm/orx-panel/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { implementation(project(":orx-expression-evaluator")) implementation(project(":orx-color")) implementation(project(":orx-text-writer")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(sharedLibs.kotlin.coroutines) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-jvm/orx-poisson-fill/build.gradle.kts b/orx-jvm/orx-poisson-fill/build.gradle.kts index 002a6e1f..814513ce 100644 --- a/orx-jvm/orx-poisson-fill/build.gradle.kts +++ b/orx-jvm/orx-poisson-fill/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(project(":orx-fx")) implementation(project(":orx-noise")) diff --git a/orx-jvm/orx-processing/build.gradle.kts b/orx-jvm/orx-processing/build.gradle.kts index 8e10eaf3..102296ca 100644 --- a/orx-jvm/orx-processing/build.gradle.kts +++ b/orx-jvm/orx-processing/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { exclude(group = "org.jogamp.gluegen") exclude(group = "org.jogamp.jogl") } - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(sharedLibs.kotlin.reflect) demoRuntimeOnly(sharedLibs.slf4j.simple) diff --git a/orx-jvm/orx-rabbit-control/build.gradle.kts b/orx-jvm/orx-rabbit-control/build.gradle.kts index ba2eb9d1..c1c1e333 100644 --- a/orx-jvm/orx-rabbit-control/build.gradle.kts +++ b/orx-jvm/orx-rabbit-control/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { implementation(project(":orx-compositor")) implementation(project(":orx-image-fit")) implementation(project(":orx-fx")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(libs.rabbitcontrol.rcp) implementation(libs.netty.all) diff --git a/orx-jvm/orx-realsense2/build.gradle.kts b/orx-jvm/orx-realsense2/build.gradle.kts index 164b7397..9fdd71d6 100644 --- a/orx-jvm/orx-realsense2/build.gradle.kts +++ b/orx-jvm/orx-realsense2/build.gradle.kts @@ -23,7 +23,7 @@ variants { } } dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) api(libs.librealsense) demoRuntimeOnly(project(":orx-jvm:orx-realsense2")) diff --git a/orx-jvm/orx-syphon/build.gradle.kts b/orx-jvm/orx-syphon/build.gradle.kts index ebc2318b..13a3b45a 100644 --- a/orx-jvm/orx-syphon/build.gradle.kts +++ b/orx-jvm/orx-syphon/build.gradle.kts @@ -3,6 +3,6 @@ plugins { } dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.gl3) } \ No newline at end of file diff --git a/orx-kdtree/build.gradle.kts b/orx-kdtree/build.gradle.kts index a041d4f5..fe0a65fd 100644 --- a/orx-kdtree/build.gradle.kts +++ b/orx-kdtree/build.gradle.kts @@ -7,7 +7,7 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) api(openrndr.math) implementation(sharedLibs.kotlin.coroutines) api(openrndr.utils) diff --git a/orx-mesh-generators/build.gradle.kts b/orx-mesh-generators/build.gradle.kts index f029b428..590084e0 100644 --- a/orx-mesh-generators/build.gradle.kts +++ b/orx-mesh-generators/build.gradle.kts @@ -7,7 +7,7 @@ kotlin { @Suppress("UNUSED_VARIABLE") val commonMain by getting { dependencies { - api(openrndr.application) + api(openrndr.application.core) api(openrndr.math) implementation(project(":orx-shapes")) api(project(":orx-mesh")) diff --git a/orx-mesh-noise/build.gradle.kts b/orx-mesh-noise/build.gradle.kts index 3b68382e..879be46e 100644 --- a/orx-mesh-noise/build.gradle.kts +++ b/orx-mesh-noise/build.gradle.kts @@ -6,7 +6,7 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - api(openrndr.application) + api(openrndr.application.core) api(openrndr.math) api(openrndr.shape) api(project(":orx-mesh")) diff --git a/orx-mesh/build.gradle.kts b/orx-mesh/build.gradle.kts index c3f85178..a2c76f1d 100644 --- a/orx-mesh/build.gradle.kts +++ b/orx-mesh/build.gradle.kts @@ -6,7 +6,7 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - api(openrndr.application) + api(openrndr.application.core) api(openrndr.math) api(openrndr.shape) implementation(project(":orx-shapes")) diff --git a/orx-no-clear/build.gradle.kts b/orx-no-clear/build.gradle.kts index ec04f870..4618a74f 100644 --- a/orx-no-clear/build.gradle.kts +++ b/orx-no-clear/build.gradle.kts @@ -7,7 +7,7 @@ kotlin { @Suppress("UNUSED_VARIABLE") val commonMain by getting { dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(openrndr.shape) implementation(openrndr.draw) diff --git a/orx-obj-loader/build.gradle.kts b/orx-obj-loader/build.gradle.kts index 7a7146da..54b3ac6f 100644 --- a/orx-obj-loader/build.gradle.kts +++ b/orx-obj-loader/build.gradle.kts @@ -6,7 +6,7 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) api(project(":orx-mesh")) } diff --git a/orx-palette/build.gradle.kts b/orx-palette/build.gradle.kts index 050e0907..240d9f83 100644 --- a/orx-palette/build.gradle.kts +++ b/orx-palette/build.gradle.kts @@ -6,7 +6,7 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) } } val jvmMain by getting { diff --git a/orx-parameters/build.gradle.kts b/orx-parameters/build.gradle.kts index 79ee4568..7deae2b2 100644 --- a/orx-parameters/build.gradle.kts +++ b/orx-parameters/build.gradle.kts @@ -8,7 +8,7 @@ kotlin { @Suppress("UNUSED_VARIABLE") val commonMain by getting { dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-property-watchers/build.gradle.kts b/orx-property-watchers/build.gradle.kts index be9b61dc..918c2a83 100644 --- a/orx-property-watchers/build.gradle.kts +++ b/orx-property-watchers/build.gradle.kts @@ -13,7 +13,7 @@ kotlin { @Suppress("UNUSED_VARIABLE") val commonMain by getting { dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(sharedLibs.kotlin.reflect) } diff --git a/orx-quadtree/build.gradle.kts b/orx-quadtree/build.gradle.kts index 34c58d16..59bc8803 100644 --- a/orx-quadtree/build.gradle.kts +++ b/orx-quadtree/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { dependencies { implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.draw) implementation(openrndr.filter) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-shade-styles/build.gradle.kts b/orx-shade-styles/build.gradle.kts index 5ccfc731..28d3a180 100644 --- a/orx-shade-styles/build.gradle.kts +++ b/orx-shade-styles/build.gradle.kts @@ -10,7 +10,7 @@ kotlin { implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) implementation(project(":orx-color")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.draw) implementation(openrndr.filter) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-shader-phrases/build.gradle.kts b/orx-shader-phrases/build.gradle.kts index 3ff909fa..f12f6c54 100644 --- a/orx-shader-phrases/build.gradle.kts +++ b/orx-shader-phrases/build.gradle.kts @@ -14,7 +14,7 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.draw) implementation(sharedLibs.kotlin.reflect) } diff --git a/orx-shapes/build.gradle.kts b/orx-shapes/build.gradle.kts index 06ae0c0a..65025192 100644 --- a/orx-shapes/build.gradle.kts +++ b/orx-shapes/build.gradle.kts @@ -11,7 +11,7 @@ kotlin { implementation(project(":orx-shader-phrases")) implementation(project(":orx-color")) implementation(project(":orx-kdtree")) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.draw) implementation(openrndr.filter) implementation(sharedLibs.kotlin.reflect) diff --git a/orx-temporal-blur/build.gradle.kts b/orx-temporal-blur/build.gradle.kts index 44673ee6..2e9c51c3 100644 --- a/orx-temporal-blur/build.gradle.kts +++ b/orx-temporal-blur/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(project(":orx-color")) implementation(project(":orx-noise")) diff --git a/orx-text-on-contour/build.gradle.kts b/orx-text-on-contour/build.gradle.kts index e50f7d7c..b0134623 100644 --- a/orx-text-on-contour/build.gradle.kts +++ b/orx-text-on-contour/build.gradle.kts @@ -8,7 +8,7 @@ kotlin { dependencies { implementation(openrndr.shape) implementation(openrndr.draw) - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(project(":orx-shapes")) } } diff --git a/orx-text-writer/build.gradle.kts b/orx-text-writer/build.gradle.kts index 4ee3e081..a4cc3c8d 100644 --- a/orx-text-writer/build.gradle.kts +++ b/orx-text-writer/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { dependencies { implementation(openrndr.shape) implementation(openrndr.draw) - implementation(openrndr.application) + implementation(openrndr.application.core) } } diff --git a/orx-time-operators/build.gradle.kts b/orx-time-operators/build.gradle.kts index fa05f07a..e8902599 100644 --- a/orx-time-operators/build.gradle.kts +++ b/orx-time-operators/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(project(":orx-parameters")) } \ No newline at end of file diff --git a/orx-timer/build.gradle.kts b/orx-timer/build.gradle.kts index d63cb69c..059fc78c 100644 --- a/orx-timer/build.gradle.kts +++ b/orx-timer/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.math) implementation(sharedLibs.kotlin.coroutines) } \ No newline at end of file diff --git a/orx-view-box/build.gradle.kts b/orx-view-box/build.gradle.kts index 92a9bbb3..deef707e 100644 --- a/orx-view-box/build.gradle.kts +++ b/orx-view-box/build.gradle.kts @@ -14,7 +14,7 @@ kotlin { @Suppress("UNUSED_VARIABLE") val commonMain by getting { dependencies { - implementation(openrndr.application) + implementation(openrndr.application.core) implementation(openrndr.draw) } }