Feature variants (#376)

Migrate from buildSrc to build-logic. Setup feature variants.
2025-09-17 01:03:02 -07:00
parent 2979963d3f
commit b7ba6f6daa
100 changed files with 424 additions and 326 deletions
--- a/orx-jvm/build.gradle.kts
+++ b/orx-jvm/build.gradle.kts
@@ -1,3 +1,3 @@
 plugins {
-    org.openrndr.extra.convention.dokka
+    id("org.openrndr.extra.convention.dokka")
 }
--- a/orx-jvm/orx-axidraw/build.gradle.kts
+++ b/orx-jvm/orx-axidraw/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 dependencies {
--- a/orx-jvm/orx-boofcv/build.gradle.kts
+++ b/orx-jvm/orx-boofcv/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 dependencies {
--- a/orx-jvm/orx-chataigne/build.gradle.kts
+++ b/orx-jvm/orx-chataigne/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 dependencies {
--- a/orx-jvm/orx-depth-camera-calibrator/build.gradle.kts
+++ b/orx-jvm/orx-depth-camera-calibrator/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 dependencies {
--- a/orx-jvm/orx-dnk3/build.gradle.kts
+++ b/orx-jvm/orx-dnk3/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 dependencies {
--- a/orx-jvm/orx-file-watcher/build.gradle.kts
+++ b/orx-jvm/orx-file-watcher/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 dependencies {
--- a/orx-jvm/orx-git-archiver-gradle/build.gradle.kts
+++ b/orx-jvm/orx-git-archiver-gradle/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
    `java-gradle-plugin`
 }

--- a/orx-jvm/orx-git-archiver/build.gradle.kts
+++ b/orx-jvm/orx-git-archiver/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 dependencies {
--- a/orx-jvm/orx-gui/build.gradle.kts
+++ b/orx-jvm/orx-gui/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 dependencies {
--- a/orx-jvm/orx-keyframer/build.gradle.kts
+++ b/orx-jvm/orx-keyframer/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 dependencies {
--- a/orx-jvm/orx-kinect-common/build.gradle.kts
+++ b/orx-jvm/orx-kinect-common/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }
 dependencies {
    api(project(":orx-depth-camera"))
--- a/orx-jvm/orx-kinect-v1-demo/build.gradle.kts
+++ b/orx-jvm/orx-kinect-v1-demo/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 dependencies {
@@ -9,6 +9,6 @@ dependencies {
    implementation(project(":orx-jvm:orx-depth-camera-calibrator"))
    implementation(project(":orx-fx"))
    implementation(project(":orx-jvm:orx-gui"))
-    runtimeOnly(project(":orx-jvm:orx-kinect-v1-${(gradle as ExtensionAware).extra["openrndrClassifier"]}"))
-    runtimeOnly(libs.openrndr.gl3.core)
+    runtimeOnly(project(":orx-jvm:orx-kinect-v1"))
+    runtimeOnly(openrndr.gl3)
 }
--- a/orx-jvm/orx-kinect-v1-natives-linux-arm64/build.gradle.kts
+++ b/orx-jvm/orx-kinect-v1-natives-linux-arm64/build.gradle.kts
@@ -1,6 +0,0 @@
-plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
-}
-dependencies {
-    runtimeOnly(variantOf(libs.libfreenect) { classifier("linux-arm64") })
-}
--- a/orx-jvm/orx-kinect-v1-natives-linux-x64/build.gradle.kts
+++ b/orx-jvm/orx-kinect-v1-natives-linux-x64/build.gradle.kts
@@ -1,6 +0,0 @@
-plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
-}
-dependencies {
-    runtimeOnly(variantOf(libs.libfreenect) { classifier("linux-x86_64") })
-}
--- a/orx-jvm/orx-kinect-v1-natives-macos/build.gradle.kts
+++ b/orx-jvm/orx-kinect-v1-natives-macos/build.gradle.kts
@@ -1,6 +0,0 @@
-plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
-}
-dependencies {
-    runtimeOnly(variantOf(libs.libfreenect) { classifier("macosx-x86_64") })
-}
--- a/orx-jvm/orx-kinect-v1-natives-windows/build.gradle.kts
+++ b/orx-jvm/orx-kinect-v1-natives-windows/build.gradle.kts
@@ -1,6 +0,0 @@
-plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
-}
-dependencies {
-    runtimeOnly(variantOf(libs.libfreenect) { classifier("windows-x86_64") })
-}
--- a/orx-jvm/orx-kinect-v1/build.gradle.kts
+++ b/orx-jvm/orx-kinect-v1/build.gradle.kts
@@ -1,7 +1,28 @@
-plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
-}

+plugins {
+    id("org.openrndr.extra.convention.kotlin-jvm")
+    id("org.openrndr.extra.convention.variant")
+}
+variants {
+    val nativeLibs = listOf(libs.libfreenect, sharedLibs.javacpp)
+
+    val platforms = listOf(
+        Triple(OperatingSystemFamily.WINDOWS, MachineArchitecture.X86_64, "windows-x86_64"),
+        Triple(OperatingSystemFamily.MACOS, MachineArchitecture.X86_64, "macosx-x86_64"),
+        Triple(OperatingSystemFamily.LINUX, MachineArchitecture.X86_64, "linux-x86_64"),
+        Triple(OperatingSystemFamily.LINUX, MachineArchitecture.ARM64, "linux-arm64"),
+    )
+
+    for ((os, arch, classifier) in platforms) {
+        platform(os, arch) {
+            dependencies {
+                nativeLibs.forEach {
+                    runtimeOnly(it.get().withClassifier(classifier))
+                }
+            }
+        }
+    }
+}
 dependencies {
    implementation(openrndr.application)
    implementation(openrndr.math)
--- a/orx-jvm/orx-kotlin-parser/build.gradle.kts
+++ b/orx-jvm/orx-kotlin-parser/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
    antlr
 }

--- a/orx-jvm/orx-midi/build.gradle.kts
+++ b/orx-jvm/orx-midi/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 dependencies {
--- a/orx-jvm/orx-minim/build.gradle.kts
+++ b/orx-jvm/orx-minim/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 dependencies {
--- a/orx-jvm/orx-olive/build.gradle.kts
+++ b/orx-jvm/orx-olive/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 tasks.test {
--- a/orx-jvm/orx-osc/build.gradle.kts
+++ b/orx-jvm/orx-osc/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 dependencies {
--- a/orx-jvm/orx-panel/build.gradle.kts
+++ b/orx-jvm/orx-panel/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 tasks.test {
--- a/orx-jvm/orx-poisson-fill/build.gradle.kts
+++ b/orx-jvm/orx-poisson-fill/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 dependencies {
--- a/orx-jvm/orx-processing/build.gradle.kts
+++ b/orx-jvm/orx-processing/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 dependencies {
--- a/orx-jvm/orx-rabbit-control/build.gradle.kts
+++ b/orx-jvm/orx-rabbit-control/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 dependencies {
--- a/orx-jvm/orx-realsense2-natives-linux-x64/build.gradle.kts
+++ b/orx-jvm/orx-realsense2-natives-linux-x64/build.gradle.kts
@@ -1,6 +0,0 @@
-plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
-}
-dependencies {
-    runtimeOnly(variantOf(libs.librealsense) { classifier("linux-x86_64") })
-}
--- a/orx-jvm/orx-realsense2-natives-macos/build.gradle.kts
+++ b/orx-jvm/orx-realsense2-natives-macos/build.gradle.kts
@@ -1,6 +0,0 @@
-plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
-}
-dependencies {
-    runtimeOnly(variantOf(libs.librealsense) { classifier("macosx-x86_64") })
-}
--- a/orx-jvm/orx-realsense2-natives-windows/build.gradle.kts
+++ b/orx-jvm/orx-realsense2-natives-windows/build.gradle.kts
@@ -1,6 +0,0 @@
-plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
-}
-dependencies {
-    runtimeOnly(variantOf(libs.librealsense) { classifier("windows-x86_64") })
-}
--- a/orx-jvm/orx-realsense2/build.gradle.kts
+++ b/orx-jvm/orx-realsense2/build.gradle.kts
@@ -1,11 +1,31 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
+    id("org.openrndr.extra.convention.variant")
 }
+variants {
+    val nativeLibs = listOf(libs.librealsense, sharedLibs.javacpp)

+    val platforms = listOf(
+        Triple(OperatingSystemFamily.WINDOWS, MachineArchitecture.X86_64, "windows-x86_64"),
+        Triple(OperatingSystemFamily.MACOS, MachineArchitecture.X86_64, "macosx-x86_64"),
+        Triple(OperatingSystemFamily.LINUX, MachineArchitecture.X86_64, "linux-x86_64"),
+        Triple(OperatingSystemFamily.LINUX, MachineArchitecture.ARM64, "linux-arm64"),
+    )
+
+    for ((os, arch, classifier) in platforms) {
+        platform(os, arch) {
+            dependencies {
+                nativeLibs.forEach {
+                    runtimeOnly(it.get().withClassifier(classifier))
+                }
+            }
+        }
+    }
+}
 dependencies {
    implementation(openrndr.application)
    implementation(openrndr.math)
    api(libs.librealsense)
-    demoRuntimeOnly(project(":orx-jvm:orx-realsense2-${(gradle as ExtensionAware).extra["openrndrClassifier"]}"))
+    demoRuntimeOnly(project(":orx-jvm:orx-realsense2"))
    demoImplementation(project(":orx-color"))
 }
--- a/orx-jvm/orx-syphon/build.gradle.kts
+++ b/orx-jvm/orx-syphon/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 dependencies {
    implementation(openrndr.application)
-    implementation(libs.openrndr.gl3.core)
+    implementation(openrndr.gl3)
 }
--- a/orx-jvm/orx-video-profiles/build.gradle.kts
+++ b/orx-jvm/orx-video-profiles/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    org.openrndr.extra.convention.`kotlin-jvm`
+    id("org.openrndr.extra.convention.kotlin-jvm")
 }

 dependencies {