From a913f3f37093e61bce38218a8db02f69ae430331 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Sat, 13 Sep 2025 00:54:51 -0700 Subject: [PATCH] Use openrndr-dependency-catalog and openrndr-module-catalog to resolve dependencies. Publish orx-module-catalog (#374) --- buildSrc/build.gradle.kts | 3 +- buildSrc/settings.gradle.kts | 20 ++++- .../extra/convention/kotlin-jvm.gradle.kts | 15 ++-- .../kotlin-multiplatform.gradle.kts | 16 ++-- gradle/libs.versions.toml | 35 +------- openrndr-demos/build.gradle.kts | 4 +- orx-camera/build.gradle.kts | 8 +- orx-color/build.gradle.kts | 22 ++--- orx-composition/build.gradle.kts | 10 +-- orx-compositor/build.gradle.kts | 8 +- orx-delegate-magic/build.gradle.kts | 8 +- orx-depth-camera/build.gradle.kts | 4 +- orx-easing/build.gradle.kts | 10 +-- orx-envelopes/build.gradle.kts | 8 +- .../build.gradle.kts | 6 +- orx-expression-evaluator/build.gradle.kts | 6 +- orx-fcurve/build.gradle.kts | 10 +-- orx-fx/build.gradle.kts | 8 +- orx-gradient-descent/build.gradle.kts | 18 ++-- orx-hash-grid/build.gradle.kts | 8 +- orx-image-fit/build.gradle.kts | 8 +- orx-integral-image/build.gradle.kts | 4 +- orx-jumpflood/build.gradle.kts | 8 +- orx-jvm/orx-axidraw/build.gradle.kts | 4 +- orx-jvm/orx-boofcv/build.gradle.kts | 4 +- orx-jvm/orx-chataigne/build.gradle.kts | 6 +- .../build.gradle.kts | 4 +- orx-jvm/orx-dnk3/build.gradle.kts | 10 +-- orx-jvm/orx-file-watcher/build.gradle.kts | 6 +- orx-jvm/orx-git-archiver/build.gradle.kts | 8 +- orx-jvm/orx-gui/build.gradle.kts | 14 +-- orx-jvm/orx-keyframer/build.gradle.kts | 6 +- orx-jvm/orx-kinect-common/build.gradle.kts | 4 +- orx-jvm/orx-kinect-v1-demo/build.gradle.kts | 4 +- orx-jvm/orx-kinect-v1/build.gradle.kts | 6 +- orx-jvm/orx-midi/build.gradle.kts | 10 +-- orx-jvm/orx-minim/build.gradle.kts | 8 +- orx-jvm/orx-olive/build.gradle.kts | 16 ++-- orx-jvm/orx-panel/build.gradle.kts | 12 +-- orx-jvm/orx-poisson-fill/build.gradle.kts | 8 +- orx-jvm/orx-processing/build.gradle.kts | 8 +- orx-jvm/orx-rabbit-control/build.gradle.kts | 4 +- orx-jvm/orx-realsense2/build.gradle.kts | 4 +- orx-jvm/orx-syphon/build.gradle.kts | 2 +- orx-jvm/orx-video-profiles/build.gradle.kts | 4 +- orx-kdtree/build.gradle.kts | 8 +- orx-marching-squares/build.gradle.kts | 4 +- orx-math/build.gradle.kts | 16 ++-- orx-mesh-generators/build.gradle.kts | 4 +- orx-mesh-noise/build.gradle.kts | 8 +- orx-mesh/build.gradle.kts | 8 +- orx-module-catalog/build.gradle.kts | 86 +++++++++++++++++++ orx-no-clear/build.gradle.kts | 8 +- orx-noise/build.gradle.kts | 10 +-- orx-obj-loader/build.gradle.kts | 4 +- orx-palette/build.gradle.kts | 4 +- orx-parameters/build.gradle.kts | 14 +-- orx-property-watchers/build.gradle.kts | 8 +- orx-quadtree/build.gradle.kts | 8 +- orx-shade-styles/build.gradle.kts | 8 +- orx-shader-phrases/build.gradle.kts | 14 +-- orx-shapes/build.gradle.kts | 18 ++-- orx-svg/build.gradle.kts | 12 +-- orx-temporal-blur/build.gradle.kts | 6 +- orx-text-on-contour/build.gradle.kts | 6 +- orx-text-writer/build.gradle.kts | 6 +- orx-time-operators/build.gradle.kts | 4 +- orx-timer/build.gradle.kts | 6 +- orx-triangulation/build.gradle.kts | 8 +- orx-turtle/build.gradle.kts | 4 +- orx-view-box/build.gradle.kts | 4 +- settings.gradle.kts | 26 +++++- 72 files changed, 407 insertions(+), 304 deletions(-) create mode 100644 orx-module-catalog/build.gradle.kts diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 6741a0ba..33b0d360 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,5 +1,6 @@ plugins { `kotlin-dsl` +// alias(sha) } val preload: SourceSet by sourceSets.creating @@ -15,7 +16,7 @@ dependencies { implementation(libs.kotlin.serialization.gradle.plugin) // https://github.com/gradle/gradle/issues/15383#issuecomment-779893192 implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location)) - "preloadImplementation"(libs.openrndr.application) + "preloadImplementation"(openrndr.application) "preloadImplementation"(libs.openrndr.extensions) } kotlin { diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts index fa8bc749..e7f90242 100644 --- a/buildSrc/settings.gradle.kts +++ b/buildSrc/settings.gradle.kts @@ -1,7 +1,25 @@ dependencyResolutionManagement { + repositories { + mavenCentral() + mavenLocal { + include("org.openrndr") + } + } + versionCatalogs { create("libs") { from(files("../gradle/libs.versions.toml")) } + + // We use a regex to get the openrndr version from the primary catalog as there is no public Gradle API to parse catalogs. + val regEx = Regex("^openrndr[ ]*=[ ]*(?:\\{[ ]*require[ ]*=[ ]*)?\"(.*)\"[ ]*(?:\\})?", RegexOption.MULTILINE) + val openrndrVersion = regEx.find(File(rootDir,"../gradle/libs.versions.toml").readText())?.groupValues?.get(1) ?: error("can't find openrndr version") + create("sharedLibs") { + from("org.openrndr:openrndr-dependency-catalog:$openrndrVersion") + } + create("openrndr") { + from("org.openrndr:openrndr-module-catalog:$openrndrVersion") + } } -} \ No newline at end of file +} + diff --git a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts index d45704e1..360d38a0 100644 --- a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts +++ b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts @@ -3,11 +3,14 @@ package org.openrndr.extra.convention import ScreenshotsHelper.collectScreenshots import org.gradle.accessors.dm.LibrariesForLibs import org.gradle.api.tasks.testing.logging.TestExceptionFormat +import org.gradle.kotlin.dsl.the import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinVersion +val sharedLibs = extensions.getByType(VersionCatalogsExtension::class.java).named("sharedLibs") +val openrndr = extensions.getByType(VersionCatalogsExtension::class.java).named("openrndr") val libs = the() val shouldPublish = project.name !in setOf("openrndr-demos", "orx-git-archiver-gradle") @@ -51,19 +54,19 @@ val demo: SourceSet by sourceSets.creating { } dependencies { - implementation(libs.kotlin.stdlib) - implementation(libs.kotlin.logging) - testImplementation(libs.kotlin.test) - testRuntimeOnly(libs.slf4j.simple) + implementation(sharedLibs.findLibrary("kotlin-stdlib").get()) + implementation(sharedLibs.findLibrary("kotlin-logging").get()) + testImplementation(sharedLibs.findLibrary("kotlin-test").get()) + testRuntimeOnly(sharedLibs.findLibrary("slf4j-simple").get()) "demoImplementation"(main.output.classesDirs + main.runtimeClasspath) - "demoImplementation"(libs.openrndr.application) + "demoImplementation"(openrndr.findLibrary("application").get()) "demoImplementation"(libs.openrndr.extensions) if (DefaultNativePlatform.getCurrentOperatingSystem().isMacOsX) { "demoRuntimeOnly"(libs.openrndr.gl3.natives.macos.arm64) } "demoRuntimeOnly"(libs.openrndr.gl3.core) - "demoRuntimeOnly"(libs.slf4j.simple) + "demoRuntimeOnly"(sharedLibs.findLibrary("slf4j.simple").get()) } tasks { diff --git a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts index 78246663..c8b23742 100644 --- a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts +++ b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts @@ -2,9 +2,9 @@ package org.openrndr.extra.convention import CollectScreenshotsTask import org.gradle.accessors.dm.LibrariesForLibs + import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform -import org.gradle.nativeplatform.platform.internal.DefaultOperatingSystem import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinVersion @@ -12,6 +12,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile val libs = the() +val sharedLibs = extensions.getByType(VersionCatalogsExtension::class.java).named("sharedLibs") +val openrndr = extensions.getByType(VersionCatalogsExtension::class.java).named("openrndr") val shouldPublish = project.name !in setOf("openrndr-demos") @@ -90,7 +92,7 @@ kotlin { val commonMain by getting { dependencies { implementation(libs.kotlin.stdlib) - implementation(libs.kotlin.logging) + implementation(sharedLibs.findLibrary("kotlin-logging").get()) } } @@ -102,17 +104,17 @@ kotlin { val jvmTest by getting { dependencies { - runtimeOnly(libs.bundles.jupiter) - runtimeOnly(libs.slf4j.simple) + runtimeOnly(sharedLibs.findBundle("jupiter").get()) + runtimeOnly(sharedLibs.findLibrary("slf4j.simple").get()) } } val jvmDemo by getting { dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.extensions) + implementation(openrndr.findLibrary("application").get()) + implementation(openrndr.findLibrary("orextensions").get()) runtimeOnly(libs.openrndr.gl3.core) - runtimeOnly(libs.slf4j.simple) + runtimeOnly(sharedLibs.findLibrary("slf4j-simple").get()) } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 920909f9..e52601e0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,22 +3,16 @@ kotlinApi = "2.2" kotlinLanguage = "2.2" kotlin = "2.2.10" jvmTarget = "17" -openrndr = { require = "[0.4.2, 0.5.0)" } -kotlinxCoroutines = "1.10.2" -kotlinLogging = "7.0.13" -kotlinxSerialization = "1.9.0" +openrndr = { require = "[0.5,0.6.0)" } kotest = "5.9.1" dokka = "2.0.0" nebulaRelease = "18.0.7" boofcv = "1.2.3" -junitJupiter = "5.13.4" -slf4j = "2.0.17" libfreenect = "0.5.7-1.5.9" librealsense = "2.53.1-1.5.9" gson = "2.13.1" antlr = "4.13.2" antlrKotlin = "1.0.3" -tensorflow = "0.5.0" minim = "2.2.2" netty = "4.2.4.Final" rabbitcontrol = "0.3.39" @@ -32,13 +26,8 @@ processing = "4.4.6" nmcp = "1.1.0" [libraries] -kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version.ref = "kotlinLogging" } -kotlin-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" } -kotlin-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" } -kotlin-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinxSerialization" } kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" } kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" } -kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" } kotlin-scriptingJvm = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-jvm", version.ref = "kotlin" } kotlin-scriptingJvmHost = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-jvm-host", version.ref = "kotlin" } kotlin-scriptingJSR223 = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-jsr223", version.ref = "kotlin" } @@ -46,28 +35,14 @@ kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-p kotlin-serialization-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-serialization", version.ref = "kotlin" } dokka-gradle-plugin = { group = "org.jetbrains.dokka", name = "dokka-gradle-plugin", version.ref = "dokka" } -kotest-assertions = { group = "io.kotest", name = "kotest-assertions-core", version.ref = "kotest" } -kotest-runner = { group = "io.kotest", name = "kotest-runner-junit5", version.ref = "kotest" } -kotest-framework-engine = { group = "io.kotest", name = "kotest-framework-engine", version.ref = "kotest" } - mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk"} processing-core = { group = "org.processing", name = "core", version.ref = "processing"} -openrndr-application = { group = "org.openrndr", name = "openrndr-application", version.ref = "openrndr" } openrndr-extensions = { group = "org.openrndr", name = "openrndr-extensions", version.ref = "openrndr" } -openrndr-math = { group = "org.openrndr", name = "openrndr-math", version.ref = "openrndr" } -openrndr-utils = { group = "org.openrndr", name = "openrndr-utils", version.ref = "openrndr" } -openrndr-shape = { group = "org.openrndr", name = "openrndr-shape", version.ref = "openrndr" } -openrndr-draw = { group = "org.openrndr", name = "openrndr-draw", version.ref = "openrndr" } -openrndr-event = { group = "org.openrndr", name = "openrndr-event", version.ref = "openrndr" } -openrndr-filter = { group = "org.openrndr", name = "openrndr-filter", version.ref = "openrndr" } -openrndr-dialogs = { group = "org.openrndr", name = "openrndr-dialogs", version.ref = "openrndr" } -openrndr-ffmpeg = { group = "org.openrndr", name = "openrndr-ffmpeg", version.ref = "openrndr" } openrndr-gl3-core = { group = "org.openrndr", name = "openrndr-gl3", version.ref = "openrndr" } openrndr-gl3-natives-macos-arm64 = { group = "org.openrndr", name = "openrndr-gl3-natives-macos-arm64", version.ref = "openrndr" } -tensorflow = { group = "org.tensorflow", name = "tensorflow-core-api", version.ref = "tensorflow" } boofcv = { group = "org.boofcv", name = "boofcv-core", version.ref = "boofcv" } libfreenect = { group = "org.bytedeco", name = "libfreenect", version.ref = "libfreenect" } librealsense = { group = "org.bytedeco", name = "librealsense2", version.ref = "librealsense" } @@ -85,15 +60,9 @@ antlr-runtime = { group = "org.antlr", name = "antlr4-runtime", version.ref = "a antlr-kotlin-runtime = { group = "com.strumenta", name = "antlr-kotlin-runtime", version.ref = "antlrKotlin" } jsoup = { group = "org.jsoup", name = "jsoup", version.ref = "jsoup" } -jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junitJupiter" } -jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junitJupiter" } -slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" } - [plugins] kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } nebula-release = { id = "nebula.release", version.ref = "nebulaRelease" } kotest-multiplatform = { id = "io.kotest.multiplatform", version.ref = "kotest" } antlr-kotlin = { id = "com.strumenta.antlr-kotlin", version.ref = "antlrKotlin" } -nmcp = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" } -[bundles] -jupiter = ["jupiter-api", "jupiter-engine"] +nmcp = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" } \ No newline at end of file diff --git a/openrndr-demos/build.gradle.kts b/openrndr-demos/build.gradle.kts index 87db58ae..bef5ac65 100644 --- a/openrndr-demos/build.gradle.kts +++ b/openrndr-demos/build.gradle.kts @@ -13,6 +13,6 @@ dependencies { demoImplementation(project(":orx-composition")) demoImplementation(project(":orx-shapes")) demoImplementation(project(":orx-svg")) - demoImplementation(libs.slf4j.simple) - demoImplementation(libs.openrndr.ffmpeg) + demoImplementation(sharedLibs.slf4j.simple) + demoImplementation(openrndr.ffmpeg) } diff --git a/orx-camera/build.gradle.kts b/orx-camera/build.gradle.kts index 72ddd363..571fa901 100644 --- a/orx-camera/build.gradle.kts +++ b/orx-camera/build.gradle.kts @@ -16,10 +16,10 @@ kotlin { dependencies { implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) - implementation(libs.openrndr.application) - implementation(libs.openrndr.draw) - implementation(libs.openrndr.filter) - implementation(libs.kotlin.reflect) + implementation(openrndr.application) + 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 a882c767..5a4520aa 100644 --- a/orx-color/build.gradle.kts +++ b/orx-color/build.gradle.kts @@ -14,27 +14,27 @@ kotlin { dependencies { implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) - implementation(libs.kotlin.serialization.core) - implementation(libs.openrndr.application) - implementation(libs.openrndr.draw) - implementation(libs.openrndr.filter) - implementation(libs.kotlin.reflect) + implementation(sharedLibs.kotlin.serialization.core) + implementation(openrndr.application) + implementation(openrndr.draw) + implementation(openrndr.filter) + implementation(sharedLibs.kotlin.reflect) } } val commonTest by getting { dependencies { - implementation(libs.kotlin.serialization.json) - implementation(libs.kotest.assertions) - implementation(libs.kotest.framework.engine) + implementation(sharedLibs.kotlin.serialization.json) + implementation(sharedLibs.kotest.assertions) + implementation(sharedLibs.kotest.framework.engine) } } val jvmTest by getting { dependencies { - implementation(libs.kotlin.serialization.json) - implementation(libs.kotest.assertions) - implementation(libs.kotest.framework.engine) + implementation(sharedLibs.kotlin.serialization.json) + implementation(sharedLibs.kotest.assertions) + implementation(sharedLibs.kotest.framework.engine) } } diff --git a/orx-composition/build.gradle.kts b/orx-composition/build.gradle.kts index 08e84e5a..80ce4bb8 100644 --- a/orx-composition/build.gradle.kts +++ b/orx-composition/build.gradle.kts @@ -11,11 +11,11 @@ kotlin { @Suppress("UNUSED_VARIABLE") val commonMain by getting { dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.draw) - implementation(libs.openrndr.filter) - implementation(libs.kotlin.reflect) - implementation(libs.kotlin.serialization.core) + implementation(openrndr.application) + implementation(openrndr.draw) + implementation(openrndr.filter) + implementation(sharedLibs.kotlin.reflect) + implementation(sharedLibs.kotlin.serialization.core) } } diff --git a/orx-compositor/build.gradle.kts b/orx-compositor/build.gradle.kts index fced9e30..d2a09468 100644 --- a/orx-compositor/build.gradle.kts +++ b/orx-compositor/build.gradle.kts @@ -10,10 +10,10 @@ kotlin { implementation(project(":orx-fx")) implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) - implementation(libs.openrndr.application) - implementation(libs.openrndr.draw) - implementation(libs.openrndr.filter) - implementation(libs.kotlin.reflect) + implementation(openrndr.application) + 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 45dcee13..c991af88 100644 --- a/orx-delegate-magic/build.gradle.kts +++ b/orx-delegate-magic/build.gradle.kts @@ -8,10 +8,10 @@ kotlin { val commonMain by getting { dependencies { implementation(project(":orx-parameters")) - implementation(libs.openrndr.application) - implementation(libs.openrndr.draw) - implementation(libs.openrndr.filter) - implementation(libs.kotlin.reflect) + implementation(openrndr.application) + 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 18b852d6..cfa8f65c 100644 --- a/orx-depth-camera/build.gradle.kts +++ b/orx-depth-camera/build.gradle.kts @@ -7,8 +7,8 @@ kotlin { @Suppress("UNUSED_VARIABLE") val commonMain by getting { dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) + implementation(openrndr.application) + implementation(openrndr.math) } } } diff --git a/orx-easing/build.gradle.kts b/orx-easing/build.gradle.kts index 4d829f80..a693b108 100644 --- a/orx-easing/build.gradle.kts +++ b/orx-easing/build.gradle.kts @@ -12,11 +12,11 @@ kotlin { val commonMain by getting { dependencies { implementation(project(":orx-parameters")) - implementation(libs.openrndr.application) - implementation(libs.openrndr.draw) - implementation(libs.openrndr.filter) - implementation(libs.kotlin.reflect) - implementation(libs.kotlin.serialization.core) + implementation(openrndr.application) + implementation(openrndr.draw) + implementation(openrndr.filter) + implementation(sharedLibs.kotlin.reflect) + implementation(sharedLibs.kotlin.serialization.core) } } diff --git a/orx-envelopes/build.gradle.kts b/orx-envelopes/build.gradle.kts index ac1faec7..f380a876 100644 --- a/orx-envelopes/build.gradle.kts +++ b/orx-envelopes/build.gradle.kts @@ -8,10 +8,10 @@ kotlin { val commonMain by getting { dependencies { implementation(project(":orx-parameters")) - implementation(libs.openrndr.application) - implementation(libs.openrndr.draw) - implementation(libs.openrndr.filter) - implementation(libs.kotlin.reflect) + implementation(openrndr.application) + 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 ef3c105c..82a6699f 100644 --- a/orx-expression-evaluator-typed/build.gradle.kts +++ b/orx-expression-evaluator-typed/build.gradle.kts @@ -7,9 +7,9 @@ kotlin { val commonMain by getting { dependencies { implementation(libs.antlr.kotlin.runtime) - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) - implementation(libs.kotlin.coroutines) + implementation(openrndr.application) + implementation(openrndr.math) + implementation(sharedLibs.kotlin.coroutines) implementation(project(":orx-property-watchers")) implementation(project(":orx-noise")) implementation(project(":orx-expression-evaluator")) diff --git a/orx-expression-evaluator/build.gradle.kts b/orx-expression-evaluator/build.gradle.kts index c5cdda40..dc8e93cf 100644 --- a/orx-expression-evaluator/build.gradle.kts +++ b/orx-expression-evaluator/build.gradle.kts @@ -32,9 +32,9 @@ kotlin { val commonMain by getting { dependencies { implementation(libs.antlr.kotlin.runtime) - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) - implementation(libs.kotlin.coroutines) + implementation(openrndr.application) + implementation(openrndr.math) + implementation(sharedLibs.kotlin.coroutines) implementation(project(":orx-property-watchers")) implementation(project(":orx-noise")) } diff --git a/orx-fcurve/build.gradle.kts b/orx-fcurve/build.gradle.kts index 540613ca..8a6ce6c9 100644 --- a/orx-fcurve/build.gradle.kts +++ b/orx-fcurve/build.gradle.kts @@ -10,11 +10,11 @@ kotlin { dependencies { implementation(project(":orx-parameters")) implementation(project(":orx-expression-evaluator")) - implementation(libs.openrndr.application) - implementation(libs.openrndr.draw) - implementation(libs.openrndr.filter) - implementation(libs.kotlin.reflect) - implementation(libs.kotlin.serialization.core) + implementation(openrndr.application) + implementation(openrndr.draw) + implementation(openrndr.filter) + implementation(sharedLibs.kotlin.reflect) + implementation(sharedLibs.kotlin.serialization.core) } } diff --git a/orx-fx/build.gradle.kts b/orx-fx/build.gradle.kts index b2c642f4..4ed2b76e 100644 --- a/orx-fx/build.gradle.kts +++ b/orx-fx/build.gradle.kts @@ -21,10 +21,10 @@ kotlin { implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) implementation(project(":orx-color")) - implementation(libs.openrndr.application) - implementation(libs.openrndr.draw) - implementation(libs.openrndr.filter) - implementation(libs.kotlin.reflect) + implementation(openrndr.application) + 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 dc1f648f..a7b8553e 100644 --- a/orx-gradient-descent/build.gradle.kts +++ b/orx-gradient-descent/build.gradle.kts @@ -16,25 +16,25 @@ kotlin { dependencies { implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) - implementation(libs.openrndr.application) - implementation(libs.openrndr.draw) - implementation(libs.openrndr.filter) - implementation(libs.kotlin.reflect) + implementation(openrndr.application) + implementation(openrndr.draw) + implementation(openrndr.filter) + implementation(sharedLibs.kotlin.reflect) } } val commonTest by getting { dependencies { - implementation(libs.kotest.assertions) - implementation(libs.kotest.framework.engine) + implementation(sharedLibs.kotest.assertions) + implementation(sharedLibs.kotest.framework.engine) } } val jvmTest by getting { dependencies { - implementation(libs.kotest.assertions) - implementation(libs.kotest.framework.engine) - runtimeOnly(libs.kotlin.reflect) + implementation(sharedLibs.kotest.assertions) + implementation(sharedLibs.kotest.framework.engine) + runtimeOnly(sharedLibs.kotlin.reflect) } } } diff --git a/orx-hash-grid/build.gradle.kts b/orx-hash-grid/build.gradle.kts index 68661c87..1eec2ca8 100644 --- a/orx-hash-grid/build.gradle.kts +++ b/orx-hash-grid/build.gradle.kts @@ -9,10 +9,10 @@ kotlin { dependencies { implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) - implementation(libs.openrndr.application) - implementation(libs.openrndr.draw) - implementation(libs.openrndr.filter) - implementation(libs.kotlin.reflect) + implementation(openrndr.application) + 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 24a6f3e5..05b83a73 100644 --- a/orx-image-fit/build.gradle.kts +++ b/orx-image-fit/build.gradle.kts @@ -9,10 +9,10 @@ kotlin { dependencies { implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) - implementation(libs.openrndr.application) - implementation(libs.openrndr.draw) - implementation(libs.openrndr.filter) - implementation(libs.kotlin.reflect) + implementation(openrndr.application) + 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 6eb760ce..5332487b 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(libs.openrndr.application) - implementation(libs.openrndr.math) + implementation(openrndr.application) + 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 6839dc31..b0804ba1 100644 --- a/orx-jumpflood/build.gradle.kts +++ b/orx-jumpflood/build.gradle.kts @@ -18,10 +18,10 @@ kotlin { dependencies { implementation(project(":orx-parameters")) implementation(project(":orx-fx")) - implementation(libs.openrndr.application) - implementation(libs.openrndr.draw) - implementation(libs.openrndr.filter) - implementation(libs.kotlin.reflect) + implementation(openrndr.application) + 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 b3e9a3b3..0aa4e15a 100644 --- a/orx-jvm/orx-axidraw/build.gradle.kts +++ b/orx-jvm/orx-axidraw/build.gradle.kts @@ -3,8 +3,8 @@ plugins { } dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.dialogs) + implementation(openrndr.application) + implementation(openrndr.dialogs) implementation(project(":orx-jvm:orx-gui")) api(project(":orx-composition")) implementation(project(":orx-svg")) diff --git a/orx-jvm/orx-boofcv/build.gradle.kts b/orx-jvm/orx-boofcv/build.gradle.kts index 1b196367..0fd8d613 100644 --- a/orx-jvm/orx-boofcv/build.gradle.kts +++ b/orx-jvm/orx-boofcv/build.gradle.kts @@ -3,8 +3,8 @@ plugins { } dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) + implementation(openrndr.application) + implementation(openrndr.math) demoImplementation(project(":orx-shapes")) api(libs.boofcv) } \ No newline at end of file diff --git a/orx-jvm/orx-chataigne/build.gradle.kts b/orx-jvm/orx-chataigne/build.gradle.kts index 085ee7db..5f695f4e 100644 --- a/orx-jvm/orx-chataigne/build.gradle.kts +++ b/orx-jvm/orx-chataigne/build.gradle.kts @@ -3,10 +3,10 @@ plugins { } dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) + implementation(openrndr.application) + implementation(openrndr.math) api(project(":orx-jvm:orx-osc")) implementation(libs.gson) - demoImplementation(libs.openrndr.ffmpeg) + demoImplementation(openrndr.ffmpeg) demoImplementation(project(":orx-fx")) } \ No newline at end of file diff --git a/orx-jvm/orx-depth-camera-calibrator/build.gradle.kts b/orx-jvm/orx-depth-camera-calibrator/build.gradle.kts index 353d8207..10328057 100644 --- a/orx-jvm/orx-depth-camera-calibrator/build.gradle.kts +++ b/orx-jvm/orx-depth-camera-calibrator/build.gradle.kts @@ -3,8 +3,8 @@ plugins { } dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) + implementation(openrndr.application) + implementation(openrndr.math) implementation(project(":orx-fx")) api(project(":orx-depth-camera")) api(project(":orx-jvm:orx-gui")) diff --git a/orx-jvm/orx-dnk3/build.gradle.kts b/orx-jvm/orx-dnk3/build.gradle.kts index 03be06af..384b9c19 100644 --- a/orx-jvm/orx-dnk3/build.gradle.kts +++ b/orx-jvm/orx-dnk3/build.gradle.kts @@ -9,13 +9,13 @@ dependencies { implementation(project(":orx-easing")) implementation(project(":orx-shader-phrases")) implementation(project(":orx-mesh-generators")) - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) - implementation(libs.kotlin.coroutines) + implementation(openrndr.application) + implementation(openrndr.math) + implementation(sharedLibs.kotlin.coroutines) demoImplementation(project(":orx-mesh-generators")) demoImplementation(project(":orx-camera")) demoImplementation(project(":orx-noise")) demoImplementation(project(":orx-shader-phrases")) - demoImplementation(libs.openrndr.ffmpeg) - demoImplementation(libs.openrndr.filter) + demoImplementation(openrndr.ffmpeg) + demoImplementation(openrndr.filter) } \ No newline at end of file diff --git a/orx-jvm/orx-file-watcher/build.gradle.kts b/orx-jvm/orx-file-watcher/build.gradle.kts index c0c30fd3..7edb0ea6 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(libs.openrndr.application) - implementation(libs.openrndr.math) - implementation(libs.kotlin.coroutines) + implementation(openrndr.application) + 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 2bcd1892..b5bbbb07 100644 --- a/orx-jvm/orx-git-archiver/build.gradle.kts +++ b/orx-jvm/orx-git-archiver/build.gradle.kts @@ -3,11 +3,11 @@ plugins { } dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) + implementation(openrndr.application) + implementation(openrndr.math) implementation(libs.jgit) demoImplementation(project(":orx-mesh-generators")) demoImplementation(project(":orx-noise")) - demoImplementation(libs.openrndr.ffmpeg) - demoImplementation(libs.openrndr.filter) + demoImplementation(openrndr.ffmpeg) + demoImplementation(openrndr.filter) } \ No newline at end of file diff --git a/orx-jvm/orx-gui/build.gradle.kts b/orx-jvm/orx-gui/build.gradle.kts index e1170a46..b0c57173 100644 --- a/orx-jvm/orx-gui/build.gradle.kts +++ b/orx-jvm/orx-gui/build.gradle.kts @@ -7,12 +7,12 @@ dependencies { api(project(":orx-jvm:orx-panel")) api(project(":orx-noise")) demoImplementation(project(":orx-property-watchers")) - implementation(libs.kotlin.coroutines) - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) - implementation(libs.openrndr.filter) - implementation(libs.openrndr.dialogs) + implementation(sharedLibs.kotlin.coroutines) + implementation(openrndr.application) + implementation(openrndr.math) + implementation(openrndr.filter) + implementation(openrndr.dialogs) implementation(libs.gson) - implementation(libs.kotlin.reflect) - demoRuntimeOnly(libs.slf4j.simple) + implementation(sharedLibs.kotlin.reflect) + demoRuntimeOnly(sharedLibs.slf4j.simple) } \ No newline at end of file diff --git a/orx-jvm/orx-keyframer/build.gradle.kts b/orx-jvm/orx-keyframer/build.gradle.kts index 79b62d71..132f9789 100644 --- a/orx-jvm/orx-keyframer/build.gradle.kts +++ b/orx-jvm/orx-keyframer/build.gradle.kts @@ -3,10 +3,10 @@ plugins { } dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) + implementation(openrndr.application) + implementation(openrndr.math) implementation(libs.gson) - implementation(libs.kotlin.reflect) + implementation(sharedLibs.kotlin.reflect) implementation(project(":orx-noise")) implementation(project(":orx-easing")) api(project(":orx-expression-evaluator")) diff --git a/orx-jvm/orx-kinect-common/build.gradle.kts b/orx-jvm/orx-kinect-common/build.gradle.kts index f32630c3..61172dff 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(libs.openrndr.application) - implementation(libs.openrndr.math) + implementation(openrndr.application) + 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 16f86641..6879c64b 100644 --- a/orx-jvm/orx-kinect-v1-demo/build.gradle.kts +++ b/orx-jvm/orx-kinect-v1-demo/build.gradle.kts @@ -3,8 +3,8 @@ plugins { } dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) + implementation(openrndr.application) + implementation(openrndr.math) implementation(project(":orx-jvm:orx-kinect-v1")) implementation(project(":orx-jvm:orx-depth-camera-calibrator")) implementation(project(":orx-fx")) diff --git a/orx-jvm/orx-kinect-v1/build.gradle.kts b/orx-jvm/orx-kinect-v1/build.gradle.kts index 41cee592..80fe4e2a 100644 --- a/orx-jvm/orx-kinect-v1/build.gradle.kts +++ b/orx-jvm/orx-kinect-v1/build.gradle.kts @@ -3,9 +3,9 @@ plugins { } dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) - implementation(libs.kotlin.coroutines) + implementation(openrndr.application) + implementation(openrndr.math) + implementation(sharedLibs.kotlin.coroutines) api(project(":orx-jvm:orx-kinect-common")) api(libs.libfreenect) } \ No newline at end of file diff --git a/orx-jvm/orx-midi/build.gradle.kts b/orx-jvm/orx-midi/build.gradle.kts index bcc3c727..10457e77 100644 --- a/orx-jvm/orx-midi/build.gradle.kts +++ b/orx-jvm/orx-midi/build.gradle.kts @@ -3,13 +3,13 @@ plugins { } dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) - implementation(libs.kotlin.reflect) - implementation(libs.kotlin.coroutines) + implementation(openrndr.application) + implementation(openrndr.math) + implementation(sharedLibs.kotlin.reflect) + implementation(sharedLibs.kotlin.coroutines) implementation(project(":orx-property-watchers")) implementation(project(":orx-parameters")) testImplementation(libs.mockk) - testImplementation(libs.kotest.assertions) + testImplementation(sharedLibs.kotest.assertions) } diff --git a/orx-jvm/orx-minim/build.gradle.kts b/orx-jvm/orx-minim/build.gradle.kts index 2feb42fd..5dc4175c 100644 --- a/orx-jvm/orx-minim/build.gradle.kts +++ b/orx-jvm/orx-minim/build.gradle.kts @@ -8,8 +8,8 @@ dependencies { api(libs.minim) { exclude(group = "org.apache.maven.plugins", module = "maven-javadoc-plugin") } - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) - implementation(libs.kotlin.reflect) - demoRuntimeOnly(libs.slf4j.simple) + implementation(openrndr.application) + implementation(openrndr.math) + implementation(sharedLibs.kotlin.reflect) + demoRuntimeOnly(sharedLibs.slf4j.simple) } \ No newline at end of file diff --git a/orx-jvm/orx-olive/build.gradle.kts b/orx-jvm/orx-olive/build.gradle.kts index 4883f831..9bcc253e 100644 --- a/orx-jvm/orx-olive/build.gradle.kts +++ b/orx-jvm/orx-olive/build.gradle.kts @@ -11,15 +11,15 @@ dependencies { implementation(project(":orx-jvm:orx-file-watcher")) implementation(project(":orx-jvm:orx-kotlin-parser")) demoImplementation(project(":orx-jvm:orx-gui")) - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) + implementation(openrndr.application) + implementation(openrndr.math) implementation(libs.kotlin.scriptingJvm) implementation(libs.kotlin.scriptingJvmHost) - implementation(libs.kotlin.reflect) + implementation(sharedLibs.kotlin.reflect) implementation(libs.kotlin.scriptingJSR223) - implementation(libs.kotlin.coroutines) - demoImplementation(libs.kotlin.coroutines) - testImplementation(libs.kotest.runner) - testImplementation(libs.kotest.assertions) - testRuntimeOnly(libs.kotlin.reflect) + implementation(sharedLibs.kotlin.coroutines) + demoImplementation(sharedLibs.kotlin.coroutines) + testImplementation(sharedLibs.kotest.runner) + testImplementation(sharedLibs.kotest.assertions) + testRuntimeOnly(sharedLibs.kotlin.reflect) } \ No newline at end of file diff --git a/orx-jvm/orx-panel/build.gradle.kts b/orx-jvm/orx-panel/build.gradle.kts index 10237105..9e63ef17 100644 --- a/orx-jvm/orx-panel/build.gradle.kts +++ b/orx-jvm/orx-panel/build.gradle.kts @@ -11,12 +11,12 @@ dependencies { implementation(project(":orx-expression-evaluator")) implementation(project(":orx-color")) implementation(project(":orx-text-writer")) - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) - implementation(libs.kotlin.coroutines) - implementation(libs.kotlin.reflect) - testRuntimeOnly(libs.kotlin.reflect) - demoImplementation(libs.openrndr.dialogs) + implementation(openrndr.application) + implementation(openrndr.math) + implementation(sharedLibs.kotlin.coroutines) + implementation(sharedLibs.kotlin.reflect) + testRuntimeOnly(sharedLibs.kotlin.reflect) + demoImplementation(openrndr.dialogs) demoImplementation(libs.gson) demoImplementation(project(":orx-jvm:orx-panel")) } \ No newline at end of file diff --git a/orx-jvm/orx-poisson-fill/build.gradle.kts b/orx-jvm/orx-poisson-fill/build.gradle.kts index 1697d7a2..47cd805c 100644 --- a/orx-jvm/orx-poisson-fill/build.gradle.kts +++ b/orx-jvm/orx-poisson-fill/build.gradle.kts @@ -3,10 +3,10 @@ plugins { } dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) + implementation(openrndr.application) + implementation(openrndr.math) implementation(project(":orx-fx")) implementation(project(":orx-noise")) - implementation(libs.openrndr.filter) - demoRuntimeOnly(libs.slf4j.simple) + implementation(openrndr.filter) + demoRuntimeOnly(sharedLibs.slf4j.simple) } \ No newline at end of file diff --git a/orx-jvm/orx-processing/build.gradle.kts b/orx-jvm/orx-processing/build.gradle.kts index 3e384fe7..5637f2bc 100644 --- a/orx-jvm/orx-processing/build.gradle.kts +++ b/orx-jvm/orx-processing/build.gradle.kts @@ -7,9 +7,9 @@ dependencies { exclude(group = "org.jogamp.gluegen") exclude(group = "org.jogamp.jogl") } - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) - implementation(libs.kotlin.reflect) - demoRuntimeOnly(libs.slf4j.simple) + implementation(openrndr.application) + implementation(openrndr.math) + implementation(sharedLibs.kotlin.reflect) + demoRuntimeOnly(sharedLibs.slf4j.simple) demoImplementation(project(":orx-shapes")) } \ No newline at end of file diff --git a/orx-jvm/orx-rabbit-control/build.gradle.kts b/orx-jvm/orx-rabbit-control/build.gradle.kts index a37eb34a..ec0ddf69 100644 --- a/orx-jvm/orx-rabbit-control/build.gradle.kts +++ b/orx-jvm/orx-rabbit-control/build.gradle.kts @@ -7,8 +7,8 @@ dependencies { implementation(project(":orx-compositor")) implementation(project(":orx-image-fit")) implementation(project(":orx-fx")) - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) + implementation(openrndr.application) + implementation(openrndr.math) implementation(libs.rabbitcontrol.rcp) implementation(libs.netty.all) implementation(libs.zxing.core) diff --git a/orx-jvm/orx-realsense2/build.gradle.kts b/orx-jvm/orx-realsense2/build.gradle.kts index 85a32d0b..3f0f4208 100644 --- a/orx-jvm/orx-realsense2/build.gradle.kts +++ b/orx-jvm/orx-realsense2/build.gradle.kts @@ -3,8 +3,8 @@ plugins { } dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) + implementation(openrndr.application) + implementation(openrndr.math) api(libs.librealsense) demoRuntimeOnly(project(":orx-jvm:orx-realsense2-${(gradle as ExtensionAware).extra["openrndrClassifier"]}")) demoImplementation(project(":orx-color")) diff --git a/orx-jvm/orx-syphon/build.gradle.kts b/orx-jvm/orx-syphon/build.gradle.kts index 525c9fcc..134ff469 100644 --- a/orx-jvm/orx-syphon/build.gradle.kts +++ b/orx-jvm/orx-syphon/build.gradle.kts @@ -3,6 +3,6 @@ plugins { } dependencies { - implementation(libs.openrndr.application) + implementation(openrndr.application) implementation(libs.openrndr.gl3.core) } \ No newline at end of file diff --git a/orx-jvm/orx-video-profiles/build.gradle.kts b/orx-jvm/orx-video-profiles/build.gradle.kts index 66e8fa83..ffeb66ef 100644 --- a/orx-jvm/orx-video-profiles/build.gradle.kts +++ b/orx-jvm/orx-video-profiles/build.gradle.kts @@ -3,6 +3,6 @@ plugins { } dependencies { - implementation(libs.openrndr.ffmpeg) - demoImplementation(libs.openrndr.ffmpeg) + implementation(openrndr.ffmpeg) + demoImplementation(openrndr.ffmpeg) } \ No newline at end of file diff --git a/orx-kdtree/build.gradle.kts b/orx-kdtree/build.gradle.kts index 3ffa5d3d..188c771e 100644 --- a/orx-kdtree/build.gradle.kts +++ b/orx-kdtree/build.gradle.kts @@ -7,10 +7,10 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(libs.openrndr.application) - api(libs.openrndr.math) - implementation(libs.kotlin.coroutines) - api(libs.openrndr.utils) + implementation(openrndr.application) + api(openrndr.math) + implementation(sharedLibs.kotlin.coroutines) + api(openrndr.utils) } } } diff --git a/orx-marching-squares/build.gradle.kts b/orx-marching-squares/build.gradle.kts index c0ee33c2..96c74602 100644 --- a/orx-marching-squares/build.gradle.kts +++ b/orx-marching-squares/build.gradle.kts @@ -7,8 +7,8 @@ kotlin { @Suppress("UNUSED_VARIABLE") val commonMain by getting { dependencies { - api(libs.openrndr.math) - api(libs.openrndr.shape) + api(openrndr.math) + api(openrndr.shape) } } diff --git a/orx-math/build.gradle.kts b/orx-math/build.gradle.kts index 9525fc17..db7b561f 100644 --- a/orx-math/build.gradle.kts +++ b/orx-math/build.gradle.kts @@ -12,24 +12,24 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(libs.kotlin.serialization.core) - implementation(libs.openrndr.math) + implementation(sharedLibs.kotlin.serialization.core) + implementation(openrndr.math) } } val commonTest by getting { dependencies { - implementation(libs.kotlin.serialization.json) - implementation(libs.kotest.assertions) - implementation(libs.kotest.framework.engine) + implementation(sharedLibs.kotlin.serialization.json) + implementation(sharedLibs.kotest.assertions) + implementation(sharedLibs.kotest.framework.engine) } } val jvmTest by getting { dependencies { - implementation(libs.kotlin.serialization.json) - implementation(libs.kotest.assertions) - implementation(libs.kotest.framework.engine) + implementation(sharedLibs.kotlin.serialization.json) + implementation(sharedLibs.kotest.assertions) + implementation(sharedLibs.kotest.framework.engine) } } diff --git a/orx-mesh-generators/build.gradle.kts b/orx-mesh-generators/build.gradle.kts index cea3718d..9e25fcd8 100644 --- a/orx-mesh-generators/build.gradle.kts +++ b/orx-mesh-generators/build.gradle.kts @@ -7,8 +7,8 @@ kotlin { @Suppress("UNUSED_VARIABLE") val commonMain by getting { dependencies { - api(libs.openrndr.application) - api(libs.openrndr.math) + api(openrndr.application) + 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 bb148adc..4e52c023 100644 --- a/orx-mesh-noise/build.gradle.kts +++ b/orx-mesh-noise/build.gradle.kts @@ -6,9 +6,9 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - api(libs.openrndr.application) - api(libs.openrndr.math) - api(libs.openrndr.shape) + api(openrndr.application) + api(openrndr.math) + api(openrndr.shape) api(project(":orx-mesh")) implementation(project(":orx-noise")) } @@ -16,7 +16,7 @@ kotlin { val jvmDemo by getting { dependencies { - api(libs.openrndr.shape) + api(openrndr.shape) implementation(project(":orx-shapes")) implementation(project(":orx-mesh")) implementation(project(":orx-mesh-generators")) diff --git a/orx-mesh/build.gradle.kts b/orx-mesh/build.gradle.kts index 03ebfeac..667a82b5 100644 --- a/orx-mesh/build.gradle.kts +++ b/orx-mesh/build.gradle.kts @@ -6,16 +6,16 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - api(libs.openrndr.application) - api(libs.openrndr.math) - api(libs.openrndr.shape) + api(openrndr.application) + api(openrndr.math) + api(openrndr.shape) implementation(project(":orx-shapes")) } } val jvmDemo by getting { dependencies { - api(libs.openrndr.shape) + api(openrndr.shape) implementation(project(":orx-shapes")) implementation(project(":orx-mesh-generators")) implementation(project(":orx-obj-loader")) diff --git a/orx-module-catalog/build.gradle.kts b/orx-module-catalog/build.gradle.kts new file mode 100644 index 00000000..0254807a --- /dev/null +++ b/orx-module-catalog/build.gradle.kts @@ -0,0 +1,86 @@ +plugins { + `version-catalog` + `maven-publish` +} + +catalog { + versionCatalog { + library("camera", "org.openrnd.extra:orx-camera:$version") + library("color", "org.openrnd.extra:orx-color:$version") + library("composition", "org.openrndr.extra:orx-composition:$version") + library("compositor", "org.openrndr.extra:orx-compositor:$version") + library("delegate-magic", "org.openrndr.extra:orx-delegate-magic:$version") + library("depth-camera", "org.openrndr.extra:orx-depth-camera:$version") + library("easing", "org.openrndr.extra:orx-easing:$version") + library("envelopes", "org.openrndr.extra:orx-envelopes:$version") + library("expression-evaluator","org.openrndr.extra:orx-expression-evaluator:$version") + library("expression-evaluator-typed","org.openrndr.extra:orx-expression-evaluator-typed:$version") + library("fcurve", "org.openrndr.extra:orx-fcurve:$version") + library("fft", "org.openrndr.extra:orx-fft:$version") + library("fx", "org.openrndr.extra:orx-fx:$version") + library("gradient-descent", "org.openrndr.extra:orx-gradient-descent:$version") + library("hash-grid", "org.openrndr.extra:orx-hash-grid:$version") + library("image-fit", "org.openrndr.extra:orx-image-fit:$version") + library("integral-image", "org.openrndr.extra:orx-integral-image:$version") + library("interval-tree", "org.openrndr.extra:orx-interval-tree:$version") + library("jumpflood", "org.openrndr.extra:orx-jumpflood:$version") + library("axidraw", "org.openrndr.extra:orx-axidraw:$version") + library("boofcv", "org.openrndr.extra:orx-boofcv:$version") + library("chataigne", "org.openrndr.extra:orx-chataigne:$version") + library("depth-camera-calibrator", "org.openrndr.extra:orx-depth-camera-calibrator:$version") + library("dnk3", "org.openrndr.extra:orx-dnk3:$version") + library("file-watcher", "org.openrndr.extra:orx-file-watcher:$version") + library("git-archiver", "org.openrndr.extra:orx-git-archiver:$version") + //library("git-archiver-gradle", "org.openrndr.extra:orx-git-archiver-gradle:$version") + library("gui", "org.openrndr.extra:orx-gui:$version") + library("keyframer", "org.openrndr.extra:orx-keyframer:$version") + library("kinect-v1-core", "org.openrndr.extra:orx-kinect-v1:$version") + library("kotlin-parser", "org.openrndr.extra:orx-kotlin-parser:$version") + library("midi", "org.openrndr.extra:orx-midi:$version") + library("minim", "org.openrndr.extra:orx-minim:$version") + library("olive", "org.openrndr.extra.olive:orx-live:$version") + library("osc", "org.openrndr.extra:orx-osc:$version") + library("panel", "org.openrndr.extra:orx-panel:$version") + library("poisson-fill", "org.openrndr.extra:orx-poisson-fill:$version") + library("processing", "org.openrndr.extra:orx-processing:$version") + library("rabbit-control", "org.openrndr.extra:orx-rabbit-control:$version") + library("realsense2", "org.openrndr.extra:orx-realsense2:$version") + library("syphon", "org.openrndr.extra:orx-syphon:$version") + library("video-profiles", "org.openrndr.extra:orx-video-profiles:$version") + library("kdtree", "org.openrndr.extra:orx-kdtree:$version") + library("marching-squares", "org.openrndr.extra:orx-marching-squares:$version") + library("math", "org.openrndr.extra:orx-math:$version") + library("mesh-core", "org.openrndr.extra:orx-mesh:$version") + library("mesh-generators", "org.openrndr.extra:orx-mesh-generators:$version") + library("mesh-noise", "org.openrndr.extra:orx-mesh-noise:$version") + library("no-clear", "org.openrndr.extra:orx-no-clear:$version") + library("noise", "org.openrndr.extra:orx-noise:$version") + library("obj-loader", "org.openrndr.extra:orx-obj-loader:$version") + library("palette", "org.openrndr.extra:orx-palette:$version") + library("parameters", "org.openrndr.extra:orx-parameters:$version") + library("property-watchers", "org.openrndr.extra:orx-property-watchers:$version") + library("quadtree", "org.openrndr.extra:orx-quadtree:$version") + library("shade-styles", "org.openrndr.extra:orx-shade-styles:$version") + library("shader-phrases", "org.openrndr.extra:orx-shader-phrases:$version") + library("shapes", "org.openrndr.extra:orx-shapes:$version") + library("svg", "org.openrndr.extra:orx-svg:$version") + library("temporal-blur", "org.openrndr.extra:orx-temporal-blur:$version") + library("text-on-contour", "org.openrndr.extra:orx-text-on-contour:$version") + library("text-writer", "org.openrndr.extra:orx-text-writer:$version") + library("time-operators", "org.openrndr.extra:orx-time-operators:$version") + library("timer", "org.openrndr.extra:orx-timer:$version") + library("triangulation", "org.openrndr.extra:orx-triangulation:$version") + library("turtle", "org.openrndr.extra:orx-turtle:$version") + library("view-box", "org.openrndr.extra:orx-view-box:$version") + } +} + +group = "org.openrndr.extra" + +publishing { + publications { + create("maven") { + from(components["versionCatalog"]) + } + } +} \ No newline at end of file diff --git a/orx-no-clear/build.gradle.kts b/orx-no-clear/build.gradle.kts index 08db018e..a0ce74aa 100644 --- a/orx-no-clear/build.gradle.kts +++ b/orx-no-clear/build.gradle.kts @@ -7,10 +7,10 @@ kotlin { @Suppress("UNUSED_VARIABLE") val commonMain by getting { dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) - implementation(libs.openrndr.shape) - implementation(libs.openrndr.draw) + implementation(openrndr.application) + implementation(openrndr.math) + implementation(openrndr.shape) + implementation(openrndr.draw) } } } diff --git a/orx-noise/build.gradle.kts b/orx-noise/build.gradle.kts index af6f33db..bdd57679 100644 --- a/orx-noise/build.gradle.kts +++ b/orx-noise/build.gradle.kts @@ -16,9 +16,9 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(libs.openrndr.math) - implementation(libs.openrndr.shape) - implementation(libs.openrndr.draw) + implementation(openrndr.math) + implementation(openrndr.shape) + implementation(openrndr.draw) implementation(project(":orx-hash-grid")) implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) @@ -28,8 +28,8 @@ kotlin { val jvmTest by getting { dependencies { - implementation(libs.kotest.assertions) - implementation(libs.kotest.framework.engine) + implementation(sharedLibs.kotest.assertions) + implementation(sharedLibs.kotest.framework.engine) } } diff --git a/orx-obj-loader/build.gradle.kts b/orx-obj-loader/build.gradle.kts index f98c27fd..ec6c320e 100644 --- a/orx-obj-loader/build.gradle.kts +++ b/orx-obj-loader/build.gradle.kts @@ -6,8 +6,8 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) + implementation(openrndr.application) + implementation(openrndr.math) api(project(":orx-mesh")) } } diff --git a/orx-palette/build.gradle.kts b/orx-palette/build.gradle.kts index 344f19fd..d682dc2b 100644 --- a/orx-palette/build.gradle.kts +++ b/orx-palette/build.gradle.kts @@ -6,14 +6,14 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(libs.openrndr.application) + implementation(openrndr.application) } } val jvmMain by getting { dependencies { implementation(project(":orx-noise")) implementation(libs.gson) - implementation(libs.openrndr.math) + implementation(openrndr.math) } } diff --git a/orx-parameters/build.gradle.kts b/orx-parameters/build.gradle.kts index 42f9a7a1..a9857177 100644 --- a/orx-parameters/build.gradle.kts +++ b/orx-parameters/build.gradle.kts @@ -8,9 +8,9 @@ kotlin { @Suppress("UNUSED_VARIABLE") val commonMain by getting { dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) - implementation(libs.kotlin.reflect) + implementation(openrndr.application) + implementation(openrndr.math) + implementation(sharedLibs.kotlin.reflect) } } @@ -19,10 +19,10 @@ kotlin { @Suppress("UNUSED_VARIABLE") val jvmTest by getting { dependencies { - implementation(libs.kotest.assertions) - implementation(libs.kotest.framework.engine) - implementation(libs.kotlin.serialization.json) - runtimeOnly(libs.kotlin.reflect) + implementation(sharedLibs.kotest.assertions) + implementation(sharedLibs.kotest.framework.engine) + implementation(sharedLibs.kotlin.serialization.json) + runtimeOnly(sharedLibs.kotlin.reflect) } } } diff --git a/orx-property-watchers/build.gradle.kts b/orx-property-watchers/build.gradle.kts index 4eca6be1..d6ea5d69 100644 --- a/orx-property-watchers/build.gradle.kts +++ b/orx-property-watchers/build.gradle.kts @@ -13,9 +13,9 @@ kotlin { @Suppress("UNUSED_VARIABLE") val commonMain by getting { dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) - implementation(libs.kotlin.reflect) + implementation(openrndr.application) + implementation(openrndr.math) + implementation(sharedLibs.kotlin.reflect) } } @@ -28,7 +28,7 @@ kotlin { @Suppress("UNUSED_VARIABLE") val jvmTest by getting { dependencies { - runtimeOnly(libs.kotlin.reflect) + runtimeOnly(sharedLibs.kotlin.reflect) } } } diff --git a/orx-quadtree/build.gradle.kts b/orx-quadtree/build.gradle.kts index 5287db92..ef694c67 100644 --- a/orx-quadtree/build.gradle.kts +++ b/orx-quadtree/build.gradle.kts @@ -9,10 +9,10 @@ kotlin { dependencies { implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) - implementation(libs.openrndr.application) - implementation(libs.openrndr.draw) - implementation(libs.openrndr.filter) - implementation(libs.kotlin.reflect) + implementation(openrndr.application) + 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 2065386a..df1a6d76 100644 --- a/orx-shade-styles/build.gradle.kts +++ b/orx-shade-styles/build.gradle.kts @@ -10,10 +10,10 @@ kotlin { implementation(project(":orx-parameters")) implementation(project(":orx-shader-phrases")) implementation(project(":orx-color")) - implementation(libs.openrndr.application) - implementation(libs.openrndr.draw) - implementation(libs.openrndr.filter) - implementation(libs.kotlin.reflect) + implementation(openrndr.application) + 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 dfbe498a..0f7a64bb 100644 --- a/orx-shader-phrases/build.gradle.kts +++ b/orx-shader-phrases/build.gradle.kts @@ -14,19 +14,19 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.draw) - implementation(libs.kotlin.reflect) + implementation(openrndr.application) + implementation(openrndr.draw) + implementation(sharedLibs.kotlin.reflect) } } @Suppress("UNUSED_VARIABLE") val jvmTest by getting { dependencies { - runtimeOnly(libs.slf4j.simple) - runtimeOnly(libs.kotlin.reflect) - implementation(libs.kotest.assertions) - implementation(libs.kotest.framework.engine) + runtimeOnly(sharedLibs.slf4j.simple) + runtimeOnly(sharedLibs.kotlin.reflect) + implementation(sharedLibs.kotest.assertions) + implementation(sharedLibs.kotest.framework.engine) } } } diff --git a/orx-shapes/build.gradle.kts b/orx-shapes/build.gradle.kts index 17edb2d9..a464b4c0 100644 --- a/orx-shapes/build.gradle.kts +++ b/orx-shapes/build.gradle.kts @@ -11,11 +11,11 @@ kotlin { implementation(project(":orx-shader-phrases")) implementation(project(":orx-color")) implementation(project(":orx-kdtree")) - implementation(libs.openrndr.application) - implementation(libs.openrndr.draw) - implementation(libs.openrndr.filter) - implementation(libs.kotlin.reflect) - implementation(libs.kotlin.coroutines) + implementation(openrndr.application) + implementation(openrndr.draw) + implementation(openrndr.filter) + implementation(sharedLibs.kotlin.reflect) + implementation(sharedLibs.kotlin.coroutines) implementation(project(":orx-triangulation")) } } @@ -29,10 +29,10 @@ kotlin { val jvmTest by getting { dependencies { - implementation(libs.kotest.assertions) - implementation(libs.kotest.framework.engine) - implementation(libs.kotlin.serialization.json) - runtimeOnly(libs.kotlin.reflect) + implementation(sharedLibs.kotest.assertions) + implementation(sharedLibs.kotest.framework.engine) + implementation(sharedLibs.kotlin.serialization.json) + runtimeOnly(sharedLibs.kotlin.reflect) } } diff --git a/orx-svg/build.gradle.kts b/orx-svg/build.gradle.kts index ae9945cb..765562f6 100644 --- a/orx-svg/build.gradle.kts +++ b/orx-svg/build.gradle.kts @@ -8,23 +8,23 @@ kotlin { val commonMain by getting { dependencies { implementation(project(":orx-composition")) - implementation(libs.openrndr.shape) + implementation(openrndr.shape) } } val jvmMain by getting { dependencies { implementation(libs.jsoup) - implementation(libs.openrndr.draw) + implementation(openrndr.draw) } } val jvmTest by getting { dependencies { - implementation(libs.kotest.assertions) - implementation(libs.kotest.framework.engine) - implementation(libs.kotlin.serialization.json) - runtimeOnly(libs.kotlin.reflect) + implementation(sharedLibs.kotest.assertions) + implementation(sharedLibs.kotest.framework.engine) + implementation(sharedLibs.kotlin.serialization.json) + runtimeOnly(sharedLibs.kotlin.reflect) } } diff --git a/orx-temporal-blur/build.gradle.kts b/orx-temporal-blur/build.gradle.kts index 5e2e26b5..8ad44d60 100644 --- a/orx-temporal-blur/build.gradle.kts +++ b/orx-temporal-blur/build.gradle.kts @@ -3,10 +3,10 @@ plugins { } dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) + implementation(openrndr.application) + implementation(openrndr.math) implementation(project(":orx-color")) implementation(project(":orx-noise")) implementation(project(":orx-fx")) - implementation(libs.openrndr.filter) + implementation(openrndr.filter) } \ No newline at end of file diff --git a/orx-text-on-contour/build.gradle.kts b/orx-text-on-contour/build.gradle.kts index 1438ad94..af449d7f 100644 --- a/orx-text-on-contour/build.gradle.kts +++ b/orx-text-on-contour/build.gradle.kts @@ -6,9 +6,9 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(libs.openrndr.shape) - implementation(libs.openrndr.draw) - implementation(libs.openrndr.application) + implementation(openrndr.shape) + implementation(openrndr.draw) + implementation(openrndr.application) implementation(project(":orx-shapes")) } } diff --git a/orx-text-writer/build.gradle.kts b/orx-text-writer/build.gradle.kts index 5243cabf..b6dfd7b3 100644 --- a/orx-text-writer/build.gradle.kts +++ b/orx-text-writer/build.gradle.kts @@ -7,9 +7,9 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(libs.openrndr.shape) - implementation(libs.openrndr.draw) - implementation(libs.openrndr.application) + implementation(openrndr.shape) + implementation(openrndr.draw) + implementation(openrndr.application) } } diff --git a/orx-time-operators/build.gradle.kts b/orx-time-operators/build.gradle.kts index 9ef59389..69885b26 100644 --- a/orx-time-operators/build.gradle.kts +++ b/orx-time-operators/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) + implementation(openrndr.application) + 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 c0c30fd3..7edb0ea6 100644 --- a/orx-timer/build.gradle.kts +++ b/orx-timer/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.math) - implementation(libs.kotlin.coroutines) + implementation(openrndr.application) + implementation(openrndr.math) + implementation(sharedLibs.kotlin.coroutines) } \ No newline at end of file diff --git a/orx-triangulation/build.gradle.kts b/orx-triangulation/build.gradle.kts index 07b84fc8..b33cbb22 100644 --- a/orx-triangulation/build.gradle.kts +++ b/orx-triangulation/build.gradle.kts @@ -6,15 +6,15 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - api(libs.openrndr.math) - api(libs.openrndr.shape) + api(openrndr.math) + api(openrndr.shape) implementation(project(":orx-noise")) } } val commonTest by getting { dependencies { implementation(project(":orx-shapes")) - implementation(libs.openrndr.shape) + implementation(openrndr.shape) } } @@ -22,7 +22,7 @@ kotlin { dependencies { implementation(project(":orx-shapes")) implementation(project(":orx-noise")) - implementation(libs.openrndr.shape) + implementation(openrndr.shape) } } } diff --git a/orx-turtle/build.gradle.kts b/orx-turtle/build.gradle.kts index 327da5ab..b5742672 100644 --- a/orx-turtle/build.gradle.kts +++ b/orx-turtle/build.gradle.kts @@ -7,8 +7,8 @@ kotlin { @Suppress("UNUSED_VARIABLE") val commonMain by getting { dependencies { - api(libs.openrndr.math) - api(libs.openrndr.shape) + api(openrndr.math) + api(openrndr.shape) } } diff --git a/orx-view-box/build.gradle.kts b/orx-view-box/build.gradle.kts index 251655aa..94093971 100644 --- a/orx-view-box/build.gradle.kts +++ b/orx-view-box/build.gradle.kts @@ -14,8 +14,8 @@ kotlin { @Suppress("UNUSED_VARIABLE") val commonMain by getting { dependencies { - implementation(libs.openrndr.application) - implementation(libs.openrndr.draw) + implementation(openrndr.application) + implementation(openrndr.draw) } } diff --git a/settings.gradle.kts b/settings.gradle.kts index e8dc0cf2..bea7ecdb 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -13,6 +13,28 @@ val openrndrClassifier: String by (gradle as ExtensionAware).extra( } ) +dependencyResolutionManagement { + repositories { + mavenCentral() + mavenLocal { + include("org.openrndr") + } + } + versionCatalogs { + // We use a regex to get the openrndr version from the primary catalog as there is no public Gradle API to parse catalogs. + val regEx = Regex("^openrndr[ ]*=[ ]*(?:\\{[ ]*require[ ]*=[ ]*)?\"(.*)\"[ ]*(?:\\})?", RegexOption.MULTILINE) + val openrndrVersion = regEx.find(File(rootDir,"gradle/libs.versions.toml").readText())?.groupValues?.get(1) ?: error("can't find openrndr version") + create("sharedLibs") { + from("org.openrndr:openrndr-dependency-catalog:$openrndrVersion") + } + create("openrndr") { + from("org.openrndr:openrndr-module-catalog:$openrndrVersion") + } + } +} + + + include( listOf( "openrndr-demos", @@ -91,6 +113,8 @@ include( "orx-view-box", "orx-text-on-contour", "orx-text-writer", - "orx-turtle" + "orx-turtle", + + "orx-module-catalog" ) ) \ No newline at end of file