Use openrndr-dependency-catalog and openrndr-module-catalog to resolve dependencies. Publish orx-module-catalog (#374)

This commit is contained in:
Edwin Jakobs
2025-09-13 00:54:51 -07:00
committed by GitHub
parent 4ddb73a596
commit a913f3f370
72 changed files with 407 additions and 304 deletions

View File

@@ -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 {

View File

@@ -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")
}
}
}

View File

@@ -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<LibrariesForLibs>()
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 {

View File

@@ -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<LibrariesForLibs>()
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())
}
}
}

View File

@@ -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"]

View File

@@ -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)
}

View File

@@ -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)
}
}

View File

@@ -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)
}
}

View File

@@ -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)
}
}

View File

@@ -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)
}
}

View File

@@ -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)
}
}

View File

@@ -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)
}
}
}

View File

@@ -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)
}
}

View File

@@ -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)
}
}

View File

@@ -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"))

View File

@@ -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"))
}

View File

@@ -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)
}
}

View File

@@ -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)
}
}

View File

@@ -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)
}
}
}

View File

@@ -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)
}
}

View File

@@ -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)
}
}

View File

@@ -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"))
}

View File

@@ -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)
}
}

View File

@@ -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"))

View File

@@ -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)
}

View File

@@ -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"))
}

View File

@@ -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"))

View File

@@ -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)
}

View File

@@ -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)
}

View File

@@ -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)
}

View File

@@ -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)
}

View File

@@ -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"))

View File

@@ -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)
}

View File

@@ -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"))

View File

@@ -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)
}

View File

@@ -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)
}

View File

@@ -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)
}

View File

@@ -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)
}

View File

@@ -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"))
}

View File

@@ -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)
}

View File

@@ -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"))
}

View File

@@ -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)

View File

@@ -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"))

View File

@@ -3,6 +3,6 @@ plugins {
}
dependencies {
implementation(libs.openrndr.application)
implementation(openrndr.application)
implementation(libs.openrndr.gl3.core)
}

View File

@@ -3,6 +3,6 @@ plugins {
}
dependencies {
implementation(libs.openrndr.ffmpeg)
demoImplementation(libs.openrndr.ffmpeg)
implementation(openrndr.ffmpeg)
demoImplementation(openrndr.ffmpeg)
}

View File

@@ -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)
}
}
}

View File

@@ -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)
}
}

View File

@@ -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)
}
}

View File

@@ -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"))
}

View File

@@ -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"))

View File

@@ -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"))

View File

@@ -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<MavenPublication>("maven") {
from(components["versionCatalog"])
}
}
}

View File

@@ -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)
}
}
}

View File

@@ -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)
}
}

View File

@@ -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"))
}
}

View File

@@ -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)
}
}

View File

@@ -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)
}
}
}

View File

@@ -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)
}
}
}

View File

@@ -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)
}
}

View File

@@ -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)
}
}

View File

@@ -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)
}
}
}

View File

@@ -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)
}
}

View File

@@ -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)
}
}

View File

@@ -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)
}

View File

@@ -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"))
}
}

View File

@@ -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)
}
}

View File

@@ -3,7 +3,7 @@ plugins {
}
dependencies {
implementation(libs.openrndr.application)
implementation(libs.openrndr.math)
implementation(openrndr.application)
implementation(openrndr.math)
implementation(project(":orx-parameters"))
}

View File

@@ -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)
}

View File

@@ -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)
}
}
}

View File

@@ -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)
}
}

View File

@@ -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)
}
}

View File

@@ -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"
)
)