Use openrndr-dependency-catalog and openrndr-module-catalog to resolve dependencies. Publish orx-module-catalog

Author: edwinRNDR

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 {

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

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

buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts

@@ -2,16 +2,18 @@ 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
 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())
             }
         }
     }

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,42 +26,23 @@ 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" }
 kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 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" }

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

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

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

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

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