From 48781ca3140129cb7ab45a38a18b9142d4b4d590 Mon Sep 17 00:00:00 2001 From: Vechro <6316604+Vechro@users.noreply.github.com> Date: Thu, 30 Jun 2022 18:51:09 +0300 Subject: [PATCH] Migrate to Kotlin DSL build scripts (#243) --- openrndr-demos/build.gradle | 2 +- orx-camera/build.gradle.kts | 2 +- orx-color/build.gradle.kts | 2 +- orx-compositor/build.gradle.kts | 2 +- orx-compute-graph-nodes/build.gradle.kts | 2 +- orx-compute-graph/build.gradle.kts | 2 +- orx-easing/build.gradle.kts | 2 +- orx-fx/build.gradle.kts | 2 +- orx-glslify/build.gradle | 6 - orx-glslify/build.gradle.kts | 5 + orx-gradient-descent/build.gradle.kts | 2 +- orx-hash-grid/build.gradle.kts | 2 +- orx-image-fit/build.gradle.kts | 2 +- orx-integral-image/build.gradle | 3 - orx-integral-image/build.gradle.kts | 3 + orx-jumpflood/build.gradle | 2 +- orx-jvm/orx-boofcv/build.gradle.kts | 2 +- orx-jvm/orx-chataigne/build.gradle | 2 +- orx-jvm/orx-dnk3/build.gradle | 2 +- orx-jvm/orx-git-archiver/build.gradle | 2 +- orx-jvm/orx-gui/build.gradle.kts | 2 +- orx-jvm/orx-keyframer/build.gradle | 2 +- orx-jvm/orx-kinect-v1-demo/build.gradle | 7 - orx-jvm/orx-kinect-v1-demo/build.gradle.kts | 7 + .../{build.gradle => build.gradle.kts} | 0 .../{build.gradle => build.gradle.kts} | 0 .../{build.gradle => build.gradle.kts} | 0 .../{build.gradle => build.gradle.kts} | 0 orx-jvm/orx-kinect-v1/build.gradle | 4 - orx-jvm/orx-kinect-v1/build.gradle.kts | 4 + orx-jvm/orx-kotlin-parser/build.gradle | 2 +- orx-jvm/orx-minim/build.gradle.kts | 2 +- orx-jvm/orx-olive/build.gradle | 2 +- orx-jvm/orx-panel/build.gradle.kts | 2 +- orx-jvm/orx-poisson-fill/build.gradle.kts | 2 +- orx-jvm/orx-rabbit-control/build.gradle | 2 +- .../{build.gradle => build.gradle.kts} | 0 .../{build.gradle => build.gradle.kts} | 1 - .../{build.gradle => build.gradle.kts} | 1 - orx-jvm/orx-realsense2/build.gradle | 9 +- orx-jvm/orx-runway/build.gradle | 2 +- orx-jvm/orx-syphon/build.gradle | 5 - orx-jvm/orx-syphon/build.gradle.kts | 5 + .../{build.gradle => build.gradle.kts} | 0 .../{build.gradle => build.gradle.kts} | 0 .../{build.gradle => build.gradle.kts} | 0 .../{build.gradle => build.gradle.kts} | 0 .../{build.gradle => build.gradle.kts} | 0 orx-jvm/orx-tensorflow/build.gradle | 10 +- orx-jvm/orx-triangulation/build.gradle | 2 +- orx-jvm/orx-video-profiles/build.gradle | 2 +- orx-kdtree/build.gradle | 2 +- orx-mesh-generators/build.gradle | 2 +- orx-no-clear/build.gradle.kts | 2 +- orx-noise/build.gradle.kts | 2 +- orx-palette/build.gradle | 5 - orx-palette/build.gradle.kts | 5 + orx-quadtree/build.gradle.kts | 2 +- orx-shade-styles/build.gradle.kts | 2 +- orx-shader-phrases/build.gradle.kts | 2 +- orx-shapes/build.gradle.kts | 2 +- orx-temporal-blur/build.gradle | 2 +- orx-time-operators/build.gradle | 2 +- orx-timer/build.gradle | 2 +- settings.gradle | 154 ----------------- settings.gradle.kts | 162 ++++++++++++++++++ 66 files changed, 235 insertions(+), 237 deletions(-) delete mode 100644 orx-glslify/build.gradle create mode 100644 orx-glslify/build.gradle.kts delete mode 100644 orx-integral-image/build.gradle create mode 100644 orx-integral-image/build.gradle.kts delete mode 100644 orx-jvm/orx-kinect-v1-demo/build.gradle create mode 100644 orx-jvm/orx-kinect-v1-demo/build.gradle.kts rename orx-jvm/orx-kinect-v1-natives-linux-arm64/{build.gradle => build.gradle.kts} (100%) rename orx-jvm/orx-kinect-v1-natives-linux-x64/{build.gradle => build.gradle.kts} (100%) rename orx-jvm/orx-kinect-v1-natives-macos/{build.gradle => build.gradle.kts} (100%) rename orx-jvm/orx-kinect-v1-natives-windows/{build.gradle => build.gradle.kts} (100%) delete mode 100644 orx-jvm/orx-kinect-v1/build.gradle create mode 100644 orx-jvm/orx-kinect-v1/build.gradle.kts rename orx-jvm/orx-realsense2-natives-linux-x64/{build.gradle => build.gradle.kts} (100%) rename orx-jvm/orx-realsense2-natives-macos/{build.gradle => build.gradle.kts} (98%) rename orx-jvm/orx-realsense2-natives-windows/{build.gradle => build.gradle.kts} (98%) delete mode 100644 orx-jvm/orx-syphon/build.gradle create mode 100644 orx-jvm/orx-syphon/build.gradle.kts rename orx-jvm/orx-tensorflow-gpu-natives-linux-x64/{build.gradle => build.gradle.kts} (100%) rename orx-jvm/orx-tensorflow-gpu-natives-windows/{build.gradle => build.gradle.kts} (100%) rename orx-jvm/orx-tensorflow-natives-linux-x64/{build.gradle => build.gradle.kts} (100%) rename orx-jvm/orx-tensorflow-natives-macos/{build.gradle => build.gradle.kts} (100%) rename orx-jvm/orx-tensorflow-natives-windows/{build.gradle => build.gradle.kts} (100%) delete mode 100644 orx-palette/build.gradle create mode 100644 orx-palette/build.gradle.kts delete mode 100644 settings.gradle create mode 100644 settings.gradle.kts diff --git a/openrndr-demos/build.gradle b/openrndr-demos/build.gradle index 793b3f50..5798fec6 100644 --- a/openrndr-demos/build.gradle +++ b/openrndr-demos/build.gradle @@ -24,7 +24,7 @@ dependencies { demoImplementation(libs.openrndr.svg) demoRuntimeOnly(libs.openrndr.ffmpeg.natives) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) diff --git a/orx-camera/build.gradle.kts b/orx-camera/build.gradle.kts index 4aa769d8..0f857ba2 100644 --- a/orx-camera/build.gradle.kts +++ b/orx-camera/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { implementation(libs.openrndr.application) implementation(libs.openrndr.extensions) - runtimeOnly(libs.openrndr.gl3) + runtimeOnly(libs.openrndr.gl3.core) runtimeOnly(libs.openrndr.gl3.natives) implementation(compilations["main"]!!.output.allOutputs) diff --git a/orx-color/build.gradle.kts b/orx-color/build.gradle.kts index 40dd35d9..0affa855 100644 --- a/orx-color/build.gradle.kts +++ b/orx-color/build.gradle.kts @@ -19,7 +19,7 @@ kotlin { implementation(project(":orx-jvm:orx-gui")) implementation(libs.openrndr.application) implementation(libs.openrndr.extensions) - runtimeOnly(libs.openrndr.gl3) + runtimeOnly(libs.openrndr.gl3.core) runtimeOnly(libs.openrndr.gl3.natives) implementation(compilations["main"]!!.output.allOutputs) } diff --git a/orx-compositor/build.gradle.kts b/orx-compositor/build.gradle.kts index 0d3fe708..1455ae55 100644 --- a/orx-compositor/build.gradle.kts +++ b/orx-compositor/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { implementation(project(":orx-camera")) implementation(libs.openrndr.application) implementation(libs.openrndr.extensions) - runtimeOnly(libs.openrndr.gl3) + runtimeOnly(libs.openrndr.gl3.core) runtimeOnly(libs.openrndr.gl3.natives) implementation(compilations["main"]!!.output.allOutputs) } diff --git a/orx-compute-graph-nodes/build.gradle.kts b/orx-compute-graph-nodes/build.gradle.kts index 6c1c0382..5aa3a489 100644 --- a/orx-compute-graph-nodes/build.gradle.kts +++ b/orx-compute-graph-nodes/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { implementation(libs.openrndr.application) implementation(libs.openrndr.extensions) - runtimeOnly(libs.openrndr.gl3) + runtimeOnly(libs.openrndr.gl3.core) runtimeOnly(libs.openrndr.gl3.natives) implementation(compilations["main"]!!.output.allOutputs) } diff --git a/orx-compute-graph/build.gradle.kts b/orx-compute-graph/build.gradle.kts index eba6a2b3..ff3b2921 100644 --- a/orx-compute-graph/build.gradle.kts +++ b/orx-compute-graph/build.gradle.kts @@ -15,7 +15,7 @@ kotlin { implementation(project(":orx-camera")) implementation(libs.openrndr.application) implementation(libs.openrndr.extensions) - runtimeOnly(libs.openrndr.gl3) + runtimeOnly(libs.openrndr.gl3.core) runtimeOnly(libs.openrndr.gl3.natives) implementation(compilations["main"]!!.output.allOutputs) } diff --git a/orx-easing/build.gradle.kts b/orx-easing/build.gradle.kts index 70ba9908..f62dbf73 100644 --- a/orx-easing/build.gradle.kts +++ b/orx-easing/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { implementation(project(":orx-shapes")) implementation(libs.openrndr.application) implementation(libs.openrndr.extensions) - runtimeOnly(libs.openrndr.gl3) + runtimeOnly(libs.openrndr.gl3.core) runtimeOnly(libs.openrndr.gl3.natives) implementation(compilations["main"]!!.output.allOutputs) } diff --git a/orx-fx/build.gradle.kts b/orx-fx/build.gradle.kts index a376c605..05f22530 100644 --- a/orx-fx/build.gradle.kts +++ b/orx-fx/build.gradle.kts @@ -25,7 +25,7 @@ kotlin { implementation(project(":orx-camera")) implementation(libs.openrndr.application) implementation(libs.openrndr.extensions) - runtimeOnly(libs.openrndr.gl3) + runtimeOnly(libs.openrndr.gl3.core) runtimeOnly(libs.openrndr.gl3.natives) implementation(compilations["main"]!!.output.allOutputs) } diff --git a/orx-glslify/build.gradle b/orx-glslify/build.gradle deleted file mode 100644 index f5e217db..00000000 --- a/orx-glslify/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -dependencies { - implementation libs.gson - implementation "org.rauschig:jarchivelib:1.0.0" - implementation project(":orx-noise") -} - diff --git a/orx-glslify/build.gradle.kts b/orx-glslify/build.gradle.kts new file mode 100644 index 00000000..7003da8b --- /dev/null +++ b/orx-glslify/build.gradle.kts @@ -0,0 +1,5 @@ +dependencies { + implementation(libs.gson) + implementation("org.rauschig:jarchivelib:1.0.0") + implementation(project(":orx-noise")) +} diff --git a/orx-gradient-descent/build.gradle.kts b/orx-gradient-descent/build.gradle.kts index ff8720e0..295e875c 100644 --- a/orx-gradient-descent/build.gradle.kts +++ b/orx-gradient-descent/build.gradle.kts @@ -13,7 +13,7 @@ kotlin { implementation(project(":orx-camera")) implementation(libs.openrndr.application) implementation(libs.openrndr.extensions) - runtimeOnly(libs.openrndr.gl3) + runtimeOnly(libs.openrndr.gl3.core) runtimeOnly(libs.openrndr.gl3.natives) implementation(compilations["main"]!!.output.allOutputs) } diff --git a/orx-hash-grid/build.gradle.kts b/orx-hash-grid/build.gradle.kts index ff8720e0..295e875c 100644 --- a/orx-hash-grid/build.gradle.kts +++ b/orx-hash-grid/build.gradle.kts @@ -13,7 +13,7 @@ kotlin { implementation(project(":orx-camera")) implementation(libs.openrndr.application) implementation(libs.openrndr.extensions) - runtimeOnly(libs.openrndr.gl3) + runtimeOnly(libs.openrndr.gl3.core) runtimeOnly(libs.openrndr.gl3.natives) implementation(compilations["main"]!!.output.allOutputs) } diff --git a/orx-image-fit/build.gradle.kts b/orx-image-fit/build.gradle.kts index ff8720e0..295e875c 100644 --- a/orx-image-fit/build.gradle.kts +++ b/orx-image-fit/build.gradle.kts @@ -13,7 +13,7 @@ kotlin { implementation(project(":orx-camera")) implementation(libs.openrndr.application) implementation(libs.openrndr.extensions) - runtimeOnly(libs.openrndr.gl3) + runtimeOnly(libs.openrndr.gl3.core) runtimeOnly(libs.openrndr.gl3.natives) implementation(compilations["main"]!!.output.allOutputs) } diff --git a/orx-integral-image/build.gradle b/orx-integral-image/build.gradle deleted file mode 100644 index 217cbae4..00000000 --- a/orx-integral-image/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - implementation project(":orx-fx") -} \ No newline at end of file diff --git a/orx-integral-image/build.gradle.kts b/orx-integral-image/build.gradle.kts new file mode 100644 index 00000000..a36643e1 --- /dev/null +++ b/orx-integral-image/build.gradle.kts @@ -0,0 +1,3 @@ +dependencies { + implementation(project(":orx-fx")) +} diff --git a/orx-jumpflood/build.gradle b/orx-jumpflood/build.gradle index 4cb81eba..6019c6f2 100644 --- a/orx-jumpflood/build.gradle +++ b/orx-jumpflood/build.gradle @@ -19,7 +19,7 @@ dependencies { demoImplementation(libs.openrndr.extensions) demoImplementation(libs.openrndr.svg) demoImplementation(libs.openrndr.ffmpeg) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) diff --git a/orx-jvm/orx-boofcv/build.gradle.kts b/orx-jvm/orx-boofcv/build.gradle.kts index ddc3f917..6cf8be55 100644 --- a/orx-jvm/orx-boofcv/build.gradle.kts +++ b/orx-jvm/orx-boofcv/build.gradle.kts @@ -19,7 +19,7 @@ dependencies { api(libs.boofcv) demoImplementation(libs.openrndr.application) demoImplementation(libs.openrndr.extensions) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) } \ No newline at end of file diff --git a/orx-jvm/orx-chataigne/build.gradle b/orx-jvm/orx-chataigne/build.gradle index 189f3f46..21af4224 100644 --- a/orx-jvm/orx-chataigne/build.gradle +++ b/orx-jvm/orx-chataigne/build.gradle @@ -13,7 +13,7 @@ dependencies { implementation libs.gson demoImplementation(libs.openrndr.application) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoRuntimeOnly(libs.openrndr.extensions) demoImplementation(libs.openrndr.ffmpeg) diff --git a/orx-jvm/orx-dnk3/build.gradle b/orx-jvm/orx-dnk3/build.gradle index f72eb5e9..149daf95 100644 --- a/orx-jvm/orx-dnk3/build.gradle +++ b/orx-jvm/orx-dnk3/build.gradle @@ -24,7 +24,7 @@ dependencies { demoImplementation(libs.openrndr.extensions) demoImplementation(libs.openrndr.ffmpeg) demoImplementation(libs.openrndr.filter) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) } diff --git a/orx-jvm/orx-git-archiver/build.gradle b/orx-jvm/orx-git-archiver/build.gradle index c335e363..31359ec5 100644 --- a/orx-jvm/orx-git-archiver/build.gradle +++ b/orx-jvm/orx-git-archiver/build.gradle @@ -19,7 +19,7 @@ dependencies { demoImplementation(libs.openrndr.extensions) demoImplementation(libs.openrndr.ffmpeg) demoImplementation(libs.openrndr.filter) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) } diff --git a/orx-jvm/orx-gui/build.gradle.kts b/orx-jvm/orx-gui/build.gradle.kts index ad7ce6e4..07325931 100644 --- a/orx-jvm/orx-gui/build.gradle.kts +++ b/orx-jvm/orx-gui/build.gradle.kts @@ -26,7 +26,7 @@ dependencies { demoImplementation(libs.openrndr.extensions) demoRuntimeOnly(libs.slf4j.simple) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) } diff --git a/orx-jvm/orx-keyframer/build.gradle b/orx-jvm/orx-keyframer/build.gradle index 6d49624d..c1a9e6fd 100644 --- a/orx-jvm/orx-keyframer/build.gradle +++ b/orx-jvm/orx-keyframer/build.gradle @@ -43,7 +43,7 @@ dependencies { demoImplementation(libs.openrndr.application) demoImplementation(libs.openrndr.extensions) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) diff --git a/orx-jvm/orx-kinect-v1-demo/build.gradle b/orx-jvm/orx-kinect-v1-demo/build.gradle deleted file mode 100644 index 11396084..00000000 --- a/orx-jvm/orx-kinect-v1-demo/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -dependencies { - implementation project(":orx-jvm:orx-kinect-v1") - runtimeOnly project(":orx-jvm:orx-kinect-v1-natives-${gradle.ext.openrndrOS}") - runtimeOnly libs.openrndr.gl3 - runtimeOnly libs.openrndr.gl3.natives - runtimeOnly "ch.qos.logback:logback-classic:1.2.11" -} diff --git a/orx-jvm/orx-kinect-v1-demo/build.gradle.kts b/orx-jvm/orx-kinect-v1-demo/build.gradle.kts new file mode 100644 index 00000000..32ed58ea --- /dev/null +++ b/orx-jvm/orx-kinect-v1-demo/build.gradle.kts @@ -0,0 +1,7 @@ +dependencies { + implementation(project(":orx-jvm:orx-kinect-v1")) + runtimeOnly(project(":orx-jvm:orx-kinect-v1-${(gradle as ExtensionAware).extra["openrndrClassifier"]}")) + runtimeOnly(libs.openrndr.gl3.core) + runtimeOnly(libs.openrndr.gl3.natives) + runtimeOnly("ch.qos.logback:logback-classic:1.2.11") +} diff --git a/orx-jvm/orx-kinect-v1-natives-linux-arm64/build.gradle b/orx-jvm/orx-kinect-v1-natives-linux-arm64/build.gradle.kts similarity index 100% rename from orx-jvm/orx-kinect-v1-natives-linux-arm64/build.gradle rename to orx-jvm/orx-kinect-v1-natives-linux-arm64/build.gradle.kts diff --git a/orx-jvm/orx-kinect-v1-natives-linux-x64/build.gradle b/orx-jvm/orx-kinect-v1-natives-linux-x64/build.gradle.kts similarity index 100% rename from orx-jvm/orx-kinect-v1-natives-linux-x64/build.gradle rename to orx-jvm/orx-kinect-v1-natives-linux-x64/build.gradle.kts diff --git a/orx-jvm/orx-kinect-v1-natives-macos/build.gradle b/orx-jvm/orx-kinect-v1-natives-macos/build.gradle.kts similarity index 100% rename from orx-jvm/orx-kinect-v1-natives-macos/build.gradle rename to orx-jvm/orx-kinect-v1-natives-macos/build.gradle.kts diff --git a/orx-jvm/orx-kinect-v1-natives-windows/build.gradle b/orx-jvm/orx-kinect-v1-natives-windows/build.gradle.kts similarity index 100% rename from orx-jvm/orx-kinect-v1-natives-windows/build.gradle rename to orx-jvm/orx-kinect-v1-natives-windows/build.gradle.kts diff --git a/orx-jvm/orx-kinect-v1/build.gradle b/orx-jvm/orx-kinect-v1/build.gradle deleted file mode 100644 index 3bd3846d..00000000 --- a/orx-jvm/orx-kinect-v1/build.gradle +++ /dev/null @@ -1,4 +0,0 @@ -dependencies { - api project(":orx-jvm:orx-kinect-common") - api libs.libfreenect -} diff --git a/orx-jvm/orx-kinect-v1/build.gradle.kts b/orx-jvm/orx-kinect-v1/build.gradle.kts new file mode 100644 index 00000000..07ef77b9 --- /dev/null +++ b/orx-jvm/orx-kinect-v1/build.gradle.kts @@ -0,0 +1,4 @@ +dependencies { + api(project(":orx-jvm:orx-kinect-common")) + api(libs.libfreenect) +} diff --git a/orx-jvm/orx-kotlin-parser/build.gradle b/orx-jvm/orx-kotlin-parser/build.gradle index c19b50ad..1b874789 100644 --- a/orx-jvm/orx-kotlin-parser/build.gradle +++ b/orx-jvm/orx-kotlin-parser/build.gradle @@ -39,7 +39,7 @@ dependencies { demoImplementation(libs.openrndr.application) demoImplementation(libs.openrndr.extensions) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) diff --git a/orx-jvm/orx-minim/build.gradle.kts b/orx-jvm/orx-minim/build.gradle.kts index 34b819ea..744f11b0 100644 --- a/orx-jvm/orx-minim/build.gradle.kts +++ b/orx-jvm/orx-minim/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { demoImplementation(libs.openrndr.extensions) demoRuntimeOnly(libs.slf4j.simple) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) } diff --git a/orx-jvm/orx-olive/build.gradle b/orx-jvm/orx-olive/build.gradle index f97700a5..5452d5fb 100644 --- a/orx-jvm/orx-olive/build.gradle +++ b/orx-jvm/orx-olive/build.gradle @@ -21,7 +21,7 @@ dependencies { demoImplementation(libs.openrndr.application) demoImplementation(libs.openrndr.extensions) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) diff --git a/orx-jvm/orx-panel/build.gradle.kts b/orx-jvm/orx-panel/build.gradle.kts index c581f3f2..1fe3fdcf 100644 --- a/orx-jvm/orx-panel/build.gradle.kts +++ b/orx-jvm/orx-panel/build.gradle.kts @@ -21,7 +21,7 @@ dependencies { demoImplementation(libs.openrndr.extensions) demoImplementation(libs.openrndr.dialogs) demoImplementation(libs.gson) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) } diff --git a/orx-jvm/orx-poisson-fill/build.gradle.kts b/orx-jvm/orx-poisson-fill/build.gradle.kts index 7e475acd..1aa83565 100644 --- a/orx-jvm/orx-poisson-fill/build.gradle.kts +++ b/orx-jvm/orx-poisson-fill/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { demoImplementation(libs.openrndr.application) demoImplementation(libs.openrndr.extensions) demoRuntimeOnly(libs.slf4j.simple) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) } \ No newline at end of file diff --git a/orx-jvm/orx-rabbit-control/build.gradle b/orx-jvm/orx-rabbit-control/build.gradle index d202c317..ca754a71 100644 --- a/orx-jvm/orx-rabbit-control/build.gradle +++ b/orx-jvm/orx-rabbit-control/build.gradle @@ -26,7 +26,7 @@ dependencies { implementation "io.ktor:ktor-server-netty:1.3.1" demoImplementation(libs.openrndr.extensions) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) } diff --git a/orx-jvm/orx-realsense2-natives-linux-x64/build.gradle b/orx-jvm/orx-realsense2-natives-linux-x64/build.gradle.kts similarity index 100% rename from orx-jvm/orx-realsense2-natives-linux-x64/build.gradle rename to orx-jvm/orx-realsense2-natives-linux-x64/build.gradle.kts diff --git a/orx-jvm/orx-realsense2-natives-macos/build.gradle b/orx-jvm/orx-realsense2-natives-macos/build.gradle.kts similarity index 98% rename from orx-jvm/orx-realsense2-natives-macos/build.gradle rename to orx-jvm/orx-realsense2-natives-macos/build.gradle.kts index db9e45df..2e511ec8 100644 --- a/orx-jvm/orx-realsense2-natives-macos/build.gradle +++ b/orx-jvm/orx-realsense2-natives-macos/build.gradle.kts @@ -1,4 +1,3 @@ - dependencies { runtimeOnly(variantOf(libs.librealsense) { classifier("macosx-x86_64") }) } diff --git a/orx-jvm/orx-realsense2-natives-windows/build.gradle b/orx-jvm/orx-realsense2-natives-windows/build.gradle.kts similarity index 98% rename from orx-jvm/orx-realsense2-natives-windows/build.gradle rename to orx-jvm/orx-realsense2-natives-windows/build.gradle.kts index a9f7850d..b4c32e69 100644 --- a/orx-jvm/orx-realsense2-natives-windows/build.gradle +++ b/orx-jvm/orx-realsense2-natives-windows/build.gradle.kts @@ -1,4 +1,3 @@ - dependencies { runtimeOnly(variantOf(libs.librealsense) { classifier("windows-x86_64") }) } diff --git a/orx-jvm/orx-realsense2/build.gradle b/orx-jvm/orx-realsense2/build.gradle index 2bdb1c16..b6b7b9d0 100644 --- a/orx-jvm/orx-realsense2/build.gradle +++ b/orx-jvm/orx-realsense2/build.gradle @@ -8,15 +8,12 @@ sourceSets { } } - - dependencies { - api libs.librealsense + api(libs.librealsense) demoImplementation(libs.openrndr.application) demoImplementation(libs.openrndr.extensions) - demoRuntimeOnly(project(":orx-jvm:orx-realsense2-natives-${gradle.ext.openrndrOS}")) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(project(":orx-jvm:orx-realsense2-${gradle.ext.openrndrClassifier}")) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) - } diff --git a/orx-jvm/orx-runway/build.gradle b/orx-jvm/orx-runway/build.gradle index e344e40d..7b8065d7 100644 --- a/orx-jvm/orx-runway/build.gradle +++ b/orx-jvm/orx-runway/build.gradle @@ -11,7 +11,7 @@ dependencies { implementation(libs.gson) demoImplementation(libs.openrndr.application) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoRuntimeOnly(libs.openrndr.extensions) demoImplementation(libs.openrndr.ffmpeg) diff --git a/orx-jvm/orx-syphon/build.gradle b/orx-jvm/orx-syphon/build.gradle deleted file mode 100644 index 3a0cfbd7..00000000 --- a/orx-jvm/orx-syphon/build.gradle +++ /dev/null @@ -1,5 +0,0 @@ -dependencies { - implementation libs.openrndr.application - implementation libs.openrndr.gl3 - implementation libs.openrndr.gl3.natives -} \ No newline at end of file diff --git a/orx-jvm/orx-syphon/build.gradle.kts b/orx-jvm/orx-syphon/build.gradle.kts new file mode 100644 index 00000000..cb7f2519 --- /dev/null +++ b/orx-jvm/orx-syphon/build.gradle.kts @@ -0,0 +1,5 @@ +dependencies { + implementation(libs.openrndr.application) + implementation(libs.openrndr.gl3.core) + implementation(libs.openrndr.gl3.natives) +} diff --git a/orx-jvm/orx-tensorflow-gpu-natives-linux-x64/build.gradle b/orx-jvm/orx-tensorflow-gpu-natives-linux-x64/build.gradle.kts similarity index 100% rename from orx-jvm/orx-tensorflow-gpu-natives-linux-x64/build.gradle rename to orx-jvm/orx-tensorflow-gpu-natives-linux-x64/build.gradle.kts diff --git a/orx-jvm/orx-tensorflow-gpu-natives-windows/build.gradle b/orx-jvm/orx-tensorflow-gpu-natives-windows/build.gradle.kts similarity index 100% rename from orx-jvm/orx-tensorflow-gpu-natives-windows/build.gradle rename to orx-jvm/orx-tensorflow-gpu-natives-windows/build.gradle.kts diff --git a/orx-jvm/orx-tensorflow-natives-linux-x64/build.gradle b/orx-jvm/orx-tensorflow-natives-linux-x64/build.gradle.kts similarity index 100% rename from orx-jvm/orx-tensorflow-natives-linux-x64/build.gradle rename to orx-jvm/orx-tensorflow-natives-linux-x64/build.gradle.kts diff --git a/orx-jvm/orx-tensorflow-natives-macos/build.gradle b/orx-jvm/orx-tensorflow-natives-macos/build.gradle.kts similarity index 100% rename from orx-jvm/orx-tensorflow-natives-macos/build.gradle rename to orx-jvm/orx-tensorflow-natives-macos/build.gradle.kts diff --git a/orx-jvm/orx-tensorflow-natives-windows/build.gradle b/orx-jvm/orx-tensorflow-natives-windows/build.gradle.kts similarity index 100% rename from orx-jvm/orx-tensorflow-natives-windows/build.gradle rename to orx-jvm/orx-tensorflow-natives-windows/build.gradle.kts diff --git a/orx-jvm/orx-tensorflow/build.gradle b/orx-jvm/orx-tensorflow/build.gradle index 81f7a3b6..13770a70 100644 --- a/orx-jvm/orx-tensorflow/build.gradle +++ b/orx-jvm/orx-tensorflow/build.gradle @@ -30,15 +30,13 @@ compileWrapgenKotlin { } } - dependencies { - implementation libs.gson + implementation(libs.gson) demoImplementation(libs.openrndr.application) + demoRuntimeOnly(project(":orx-jvm:orx-tensorflow-${gradle.ext.openrndrClassifier}")) - demoRuntimeOnly(project(":orx-jvm:orx-tensorflow-natives-${gradle.ext.openrndrOS}")) - - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoRuntimeOnly(libs.openrndr.extensions) demoImplementation(libs.openrndr.ffmpeg) @@ -50,5 +48,3 @@ dependencies { // -- wrapgen wrapgenImplementation 'com.github.javaparser:javaparser-core:3.15.21' } - - diff --git a/orx-jvm/orx-triangulation/build.gradle b/orx-jvm/orx-triangulation/build.gradle index b0a0e498..fdf0d730 100644 --- a/orx-jvm/orx-triangulation/build.gradle +++ b/orx-jvm/orx-triangulation/build.gradle @@ -18,7 +18,7 @@ dependencies { demoImplementation(libs.openrndr.application) demoImplementation(libs.openrndr.extensions) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) } \ No newline at end of file diff --git a/orx-jvm/orx-video-profiles/build.gradle b/orx-jvm/orx-video-profiles/build.gradle index c34a2d2d..ad0490bd 100644 --- a/orx-jvm/orx-video-profiles/build.gradle +++ b/orx-jvm/orx-video-profiles/build.gradle @@ -12,7 +12,7 @@ dependencies { demoImplementation(libs.openrndr.application) demoImplementation(libs.openrndr.extensions) demoImplementation(libs.openrndr.ffmpeg) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) implementation(libs.openrndr.ffmpeg) demoImplementation(sourceSets.getByName("main").output) diff --git a/orx-kdtree/build.gradle b/orx-kdtree/build.gradle index ed3bc1bd..f32b5b68 100644 --- a/orx-kdtree/build.gradle +++ b/orx-kdtree/build.gradle @@ -11,7 +11,7 @@ sourceSets { dependencies { demoImplementation(libs.openrndr.application) demoImplementation(libs.openrndr.extensions) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) } \ No newline at end of file diff --git a/orx-mesh-generators/build.gradle b/orx-mesh-generators/build.gradle index e1da8ea4..685856ad 100644 --- a/orx-mesh-generators/build.gradle +++ b/orx-mesh-generators/build.gradle @@ -12,7 +12,7 @@ dependencies { demoImplementation(project(":orx-camera")) demoImplementation(libs.openrndr.application) demoImplementation(libs.openrndr.extensions) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) diff --git a/orx-no-clear/build.gradle.kts b/orx-no-clear/build.gradle.kts index 8238cb24..05eceedb 100644 --- a/orx-no-clear/build.gradle.kts +++ b/orx-no-clear/build.gradle.kts @@ -13,7 +13,7 @@ kotlin { implementation(project(":orx-camera")) implementation(libs.openrndr.application) implementation(libs.openrndr.extensions) - runtimeOnly(libs.openrndr.gl3) + runtimeOnly(libs.openrndr.gl3.core) runtimeOnly(libs.openrndr.gl3.natives) implementation(compilations["main"]!!.output.allOutputs) } diff --git a/orx-noise/build.gradle.kts b/orx-noise/build.gradle.kts index 1543e1f4..df2b6275 100644 --- a/orx-noise/build.gradle.kts +++ b/orx-noise/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { implementation(project(":orx-hash-grid")) implementation(libs.openrndr.application) implementation(libs.openrndr.extensions) - runtimeOnly(libs.openrndr.gl3) + runtimeOnly(libs.openrndr.gl3.core) runtimeOnly(libs.openrndr.gl3.natives) implementation(compilations["main"]!!.output.allOutputs) } diff --git a/orx-palette/build.gradle b/orx-palette/build.gradle deleted file mode 100644 index b51595d8..00000000 --- a/orx-palette/build.gradle +++ /dev/null @@ -1,5 +0,0 @@ -dependencies { - implementation libs.gson - implementation project(":orx-noise") -} - diff --git a/orx-palette/build.gradle.kts b/orx-palette/build.gradle.kts new file mode 100644 index 00000000..d474474d --- /dev/null +++ b/orx-palette/build.gradle.kts @@ -0,0 +1,5 @@ +dependencies { + implementation(libs.gson) + implementation(project(":orx-noise")) +} + diff --git a/orx-quadtree/build.gradle.kts b/orx-quadtree/build.gradle.kts index c74f686c..33135a86 100644 --- a/orx-quadtree/build.gradle.kts +++ b/orx-quadtree/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { implementation(project(":orx-noise")) implementation(libs.openrndr.application) implementation(libs.openrndr.extensions) - runtimeOnly(libs.openrndr.gl3) + runtimeOnly(libs.openrndr.gl3.core) runtimeOnly(libs.openrndr.gl3.natives) implementation(compilations["main"]!!.output.allOutputs) } diff --git a/orx-shade-styles/build.gradle.kts b/orx-shade-styles/build.gradle.kts index 872411ed..eef81536 100644 --- a/orx-shade-styles/build.gradle.kts +++ b/orx-shade-styles/build.gradle.kts @@ -15,7 +15,7 @@ kotlin { implementation(project(":orx-color")) implementation(libs.openrndr.application) implementation(libs.openrndr.extensions) - runtimeOnly(libs.openrndr.gl3) + runtimeOnly(libs.openrndr.gl3.core) runtimeOnly(libs.openrndr.gl3.natives) implementation(compilations["main"]!!.output.allOutputs) } diff --git a/orx-shader-phrases/build.gradle.kts b/orx-shader-phrases/build.gradle.kts index 4472c34a..7ab33702 100644 --- a/orx-shader-phrases/build.gradle.kts +++ b/orx-shader-phrases/build.gradle.kts @@ -19,7 +19,7 @@ kotlin { implementation(project(":orx-camera")) implementation(libs.openrndr.application) implementation(libs.openrndr.extensions) - runtimeOnly(libs.openrndr.gl3) + runtimeOnly(libs.openrndr.gl3.core) runtimeOnly(libs.openrndr.gl3.natives) implementation(compilations["main"]!!.output.allOutputs) } diff --git a/orx-shapes/build.gradle.kts b/orx-shapes/build.gradle.kts index b0575eeb..8446c3eb 100644 --- a/orx-shapes/build.gradle.kts +++ b/orx-shapes/build.gradle.kts @@ -17,7 +17,7 @@ kotlin { implementation(project(":orx-jvm:orx-triangulation")) implementation(libs.openrndr.application) implementation(libs.openrndr.extensions) - runtimeOnly(libs.openrndr.gl3) + runtimeOnly(libs.openrndr.gl3.core) runtimeOnly(libs.openrndr.gl3.natives) implementation(compilations["main"]!!.output.allOutputs) } diff --git a/orx-temporal-blur/build.gradle b/orx-temporal-blur/build.gradle index da2231a8..0eb70577 100644 --- a/orx-temporal-blur/build.gradle +++ b/orx-temporal-blur/build.gradle @@ -14,7 +14,7 @@ dependencies { implementation(libs.openrndr.filter) demoImplementation(libs.openrndr.application) demoImplementation(libs.openrndr.extensions) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) } \ No newline at end of file diff --git a/orx-time-operators/build.gradle b/orx-time-operators/build.gradle index 5b83b695..bd35b36c 100644 --- a/orx-time-operators/build.gradle +++ b/orx-time-operators/build.gradle @@ -14,7 +14,7 @@ dependencies { demoImplementation(project(":orx-camera")) demoImplementation(libs.openrndr.application) demoImplementation(libs.openrndr.extensions) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) } \ No newline at end of file diff --git a/orx-timer/build.gradle b/orx-timer/build.gradle index ed3bc1bd..f32b5b68 100644 --- a/orx-timer/build.gradle +++ b/orx-timer/build.gradle @@ -11,7 +11,7 @@ sourceSets { dependencies { demoImplementation(libs.openrndr.application) demoImplementation(libs.openrndr.extensions) - demoRuntimeOnly(libs.openrndr.gl3) + demoRuntimeOnly(libs.openrndr.gl3.core) demoRuntimeOnly(libs.openrndr.gl3.natives) demoImplementation(sourceSets.getByName("main").output) } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index ae314112..00000000 --- a/settings.gradle +++ /dev/null @@ -1,154 +0,0 @@ -rootProject.name = 'orx' - -switch (org.gradle.internal.os.OperatingSystem.current()) { - case org.gradle.internal.os.OperatingSystem.WINDOWS: - gradle.ext.openrndrOS = "windows" - break - case org.gradle.internal.os.OperatingSystem.LINUX: - gradle.ext.openrndrOS = "linux-x64" - break - case org.gradle.internal.os.OperatingSystem.MAC_OS: - gradle.ext.openrndrOS = "macos" - break -} - -dependencyResolutionManagement { - versionCatalogs { - libs { - version('kotlinApi', '1.6') - version('kotlinLanguage', '1.6') - version('kotlin', '1.6.20') - version('jvmTarget', '1.8') - version('kotlinxCoroutines', '1.6.0') - version('kotlinLogging', '2.1.21') - version('kotlinxSerialization', '1.3.2') - version('spek', '2.0.15') - version('boofcv', '0.39') - version('kluent', '1.68') - version('kotest', '5.2.1') - version('junitJupiter', '5.8.2') - version('slf4j', '1.7.36') - version('openrndr', ((rootProject.properties.getOrDefault('OPENRNDR.version', System.getenv("OPENRNDR_VERSION"))) ?.replace('v','')) ?: '0.5.1-SNAPSHOT') - version('libfreenect', '0.5.7-1.5.7') - version('librealsense', '2.50.0-1.5.7') - version('gson', '2.9.0') - version('antlr', '4.9.3') - version('tensorflow', '0.4.0') - - library('openrndr-application', 'org.openrndr', 'openrndr-application').versionRef('openrndr') - library('openrndr-extensions', 'org.openrndr', 'openrndr-extensions').versionRef('openrndr') - library('openrndr-math', 'org.openrndr', 'openrndr-math').versionRef('openrndr') - library('openrndr-shape', 'org.openrndr', 'openrndr-shape').versionRef('openrndr') - library('openrndr-draw', 'org.openrndr', 'openrndr-draw').versionRef('openrndr') - library('openrndr-event', 'org.openrndr', 'openrndr-event').versionRef('openrndr') - library('openrndr-filter', 'org.openrndr', 'openrndr-filter').versionRef('openrndr') - library('openrndr-dialogs', 'org.openrndr', 'openrndr-dialogs').versionRef('openrndr') - library('openrndr-ffmpeg', 'org.openrndr', 'openrndr-ffmpeg').versionRef('openrndr') - library('openrndr-ffmpeg-natives', 'org.openrndr', "openrndr-ffmpeg-natives-${gradle.ext.openrndrOS}").versionRef('openrndr') - library('openrndr-svg', 'org.openrndr', 'openrndr-svg').versionRef('openrndr') - library('openrndr-gl3', 'org.openrndr', 'openrndr-gl3').versionRef('openrndr') - library('openrndr-gl3-natives', 'org.openrndr', "openrndr-gl3-natives-${gradle.ext.openrndrOS}").versionRef('openrndr') - - library('tensorflow', 'org.tensorflow' ,'tensorflow-core-api').versionRef('tensorflow') - library('boofcv', 'org.boofcv' ,'boofcv-core').versionRef('boofcv') - library('libfreenect', 'org.bytedeco' ,'libfreenect').versionRef('libfreenect') - library('librealsense', 'org.bytedeco' ,'librealsense2').versionRef('librealsense') - - library('kotlin-logging', 'io.github.microutils' ,'kotlin-logging').versionRef('kotlinLogging') - library('kotlin-coroutines', 'org.jetbrains.kotlinx', 'kotlinx-coroutines-core').versionRef('kotlinxCoroutines') - library('kotlin-serialization-json', 'org.jetbrains.kotlinx', 'kotlinx-serialization-json').versionRef('kotlinxSerialization') - library('kotlin-serialization-core', 'org.jetbrains.kotlinx', 'kotlinx-serialization-core').versionRef('kotlinxSerialization') - library('kotlin-stdlib', 'org.jetbrains.kotlin', 'kotlin-stdlib').versionRef('kotlin') - library('kotlin-test', 'org.jetbrains.kotlin', 'kotlin-test').versionRef('kotlin') - library('kotlin-reflect', 'org.jetbrains.kotlin', 'kotlin-reflect').versionRef('kotlin') - library('kotlin-gradlePlugin', 'org.jetbrains.kotlin', 'kotlin-gradle-plugin').versionRef('kotlin') - library('kotlin-scriptingJvm', 'org.jetbrains.kotlin', 'kotlin-scripting-jvm').versionRef('kotlin') - library('kotlin-scriptingJvmHost', 'org.jetbrains.kotlin', 'kotlin-scripting-jvm-host').versionRef('kotlin') - library('kotlin-scriptingJSR223', 'org.jetbrains.kotlin', 'kotlin-scripting-jsr223').versionRef('kotlin') - - library('spek-dsl', 'org.spekframework.spek2', 'spek-dsl-jvm').versionRef('spek') - library('spek-junit5', 'org.spekframework.spek2', 'spek-runner-junit5').versionRef('spek') - - library('jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junitJupiter') - library('jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junitJupiter') - - bundle('jupiter', ['jupiter-api', 'jupiter-engine']) - - library('kotest', 'io.kotest', 'kotest-assertions-core').versionRef('kotest') - library('kluent', 'org.amshove.kluent', 'kluent').versionRef('kluent') - library('slf4j-simple', 'org.slf4j', 'slf4j-simple').versionRef('slf4j') - library('gson', 'com.google.code.gson', 'gson').versionRef('gson') - library('antlr', 'org.antlr', 'antlr4').versionRef('antlr') - library('antlrRuntime', 'org.antlr', 'antlr4-runtime').versionRef('antlr') - } - } -} - -include 'openrndr-demos', - 'orx-jvm:orx-boofcv', - 'orx-camera', - 'orx-jvm:orx-chataigne', - 'orx-color', - 'orx-compositor', - 'orx-compute-graph', - 'orx-compute-graph-nodes', - 'orx-jvm:orx-dnk3', - 'orx-easing', - 'orx-jvm:orx-file-watcher', - 'orx-parameters', - 'orx-filter-extension', - 'orx-fx', - 'orx-jvm:orx-git-archiver', - 'orx-jvm:orx-git-archiver-gradle', - 'orx-glslify', - 'orx-gradient-descent', - 'orx-hash-grid', - 'orx-integral-image', - 'orx-interval-tree', - 'orx-jumpflood', - 'orx-jvm:orx-gui', - 'orx-image-fit', - 'orx-kdtree', - 'orx-jvm:orx-keyframer', - 'orx-mesh-generators', - 'orx-jvm:orx-minim', - 'orx-jvm:orx-kotlin-parser', - 'orx-jvm:orx-midi', - 'orx-no-clear', - 'orx-noise', - 'orx-obj-loader', - 'orx-jvm:orx-olive', - 'orx-jvm:orx-osc', - 'orx-palette', - 'orx-jvm:orx-panel', - 'orx-jvm:orx-poisson-fill', - 'orx-quadtree', - 'orx-jvm:orx-rabbit-control', - 'orx-jvm:orx-realsense2', - 'orx-jvm:orx-realsense2-natives-linux-x64', - 'orx-jvm:orx-realsense2-natives-macos', - 'orx-jvm:orx-realsense2-natives-windows', - 'orx-jvm:orx-runway', - 'orx-shader-phrases', - 'orx-shade-styles', - 'orx-shapes', - 'orx-jvm:orx-syphon', - 'orx-temporal-blur', - 'orx-jvm:orx-tensorflow', - 'orx-jvm:orx-tensorflow-gpu-natives-linux-x64', - 'orx-jvm:orx-tensorflow-gpu-natives-windows', - 'orx-jvm:orx-tensorflow-natives-linux-x64', - 'orx-jvm:orx-tensorflow-natives-macos', - 'orx-jvm:orx-tensorflow-natives-windows', - 'orx-timer', - 'orx-time-operators', - 'orx-jvm:orx-triangulation', - 'orx-jvm:orx-kinect-common', - 'orx-jvm:orx-kinect-v1', - 'orx-jvm:orx-kinect-v1-natives-linux-arm64', - 'orx-jvm:orx-kinect-v1-natives-linux-x64', - 'orx-jvm:orx-kinect-v1-natives-macos', - 'orx-jvm:orx-kinect-v1-natives-windows', - 'orx-jvm:orx-kinect-v1-demo', - 'orx-jvm:orx-video-profiles' - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..e097dda2 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,162 @@ +import org.gradle.internal.os.OperatingSystem + +rootProject.name = "orx" + +@Suppress("INACCESSIBLE_TYPE") +// This is equivalent to `gradle.ext` https://stackoverflow.com/a/65377323/17977931 +val openrndrClassifier: String by (gradle as ExtensionAware).extra( + "natives-" + when (val os = OperatingSystem.current()) { + OperatingSystem.WINDOWS -> "windows" + OperatingSystem.LINUX -> "linux-x64" + OperatingSystem.MAC_OS -> "macos" + else -> error("Unsupported operating system: $os") + } +) + +val openrndrVersion = + (extra.properties["OPENRNDR.version"] as String? ?: System.getenv("OPENRNDR_VERSION"))?.replace("v", "") + ?: "0.5.1-SNAPSHOT" + +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + version("kotlinApi", "1.6") + version("kotlinLanguage", "1.6") + version("kotlin", "1.6.20") + version("jvmTarget", "1.8") + version("kotlinxCoroutines", "1.6.0") + version("kotlinLogging", "2.1.21") + version("kotlinxSerialization", "1.3.2") + version("spek", "2.0.15") + version("boofcv", "0.39") + version("kluent", "1.68") + version("kotest", "5.2.1") + version("junitJupiter", "5.8.2") + version("slf4j", "1.7.36") + version("openrndr", openrndrVersion) + version("libfreenect", "0.5.7-1.5.7") + version("librealsense", "2.50.0-1.5.7") + version("gson", "2.9.0") + version("antlr", "4.9.3") + version("tensorflow", "0.4.0") + + library("openrndr-application", "org.openrndr", "openrndr-application").versionRef("openrndr") + library("openrndr-extensions", "org.openrndr", "openrndr-extensions").versionRef("openrndr") + library("openrndr-math", "org.openrndr", "openrndr-math").versionRef("openrndr") + library("openrndr-shape", "org.openrndr", "openrndr-shape").versionRef("openrndr") + library("openrndr-draw", "org.openrndr", "openrndr-draw").versionRef("openrndr") + library("openrndr-event", "org.openrndr", "openrndr-event").versionRef("openrndr") + library("openrndr-filter", "org.openrndr", "openrndr-filter").versionRef("openrndr") + library("openrndr-dialogs", "org.openrndr", "openrndr-dialogs").versionRef("openrndr") + library("openrndr-ffmpeg", "org.openrndr", "openrndr-ffmpeg").versionRef("openrndr") + library("openrndr-ffmpeg-natives", "org.openrndr", "openrndr-ffmpeg-$openrndrClassifier").versionRef("openrndr") + library("openrndr-svg", "org.openrndr", "openrndr-svg").versionRef("openrndr") + library("openrndr-gl3-core", "org.openrndr", "openrndr-gl3").versionRef("openrndr") + library("openrndr-gl3-natives", "org.openrndr", "openrndr-gl3-$openrndrClassifier").versionRef("openrndr") + + library("tensorflow", "org.tensorflow", "tensorflow-core-api").versionRef("tensorflow") + library("boofcv", "org.boofcv", "boofcv-core").versionRef("boofcv") + library("libfreenect", "org.bytedeco", "libfreenect").versionRef("libfreenect") + library("librealsense", "org.bytedeco", "librealsense2").versionRef("librealsense") + + library("kotlin-logging", "io.github.microutils", "kotlin-logging").versionRef("kotlinLogging") + library("kotlin-coroutines", "org.jetbrains.kotlinx", "kotlinx-coroutines-core").versionRef("kotlinxCoroutines") + library("kotlin-serialization-json", "org.jetbrains.kotlinx", "kotlinx-serialization-json").versionRef("kotlinxSerialization") + library("kotlin-serialization-core", "org.jetbrains.kotlinx", "kotlinx-serialization-core").versionRef("kotlinxSerialization") + library("kotlin-stdlib", "org.jetbrains.kotlin", "kotlin-stdlib").versionRef("kotlin") + library("kotlin-test", "org.jetbrains.kotlin", "kotlin-test").versionRef("kotlin") + library("kotlin-reflect", "org.jetbrains.kotlin", "kotlin-reflect").versionRef("kotlin") + library("kotlin-gradlePlugin", "org.jetbrains.kotlin", "kotlin-gradle-plugin").versionRef("kotlin") + library("kotlin-scriptingJvm", "org.jetbrains.kotlin", "kotlin-scripting-jvm").versionRef("kotlin") + library("kotlin-scriptingJvmHost", "org.jetbrains.kotlin", "kotlin-scripting-jvm-host").versionRef("kotlin") + library("kotlin-scriptingJSR223", "org.jetbrains.kotlin", "kotlin-scripting-jsr223").versionRef("kotlin") + + library("spek-dsl", "org.spekframework.spek2", "spek-dsl-jvm").versionRef("spek") + library("spek-junit5", "org.spekframework.spek2", "spek-runner-junit5").versionRef("spek") + + library("jupiter-api", "org.junit.jupiter", "junit-jupiter-api").versionRef("junitJupiter") + library("jupiter-engine", "org.junit.jupiter", "junit-jupiter-engine").versionRef("junitJupiter") + + bundle("jupiter", listOf("jupiter-api", "jupiter-engine")) + + library("kotest", "io.kotest", "kotest-assertions-core").versionRef("kotest") + library("kluent", "org.amshove.kluent", "kluent").versionRef("kluent") + library("slf4j-simple", "org.slf4j", "slf4j-simple").versionRef("slf4j") + library("gson", "com.google.code.gson", "gson").versionRef("gson") + library("antlr", "org.antlr", "antlr4").versionRef("antlr") + library("antlrRuntime", "org.antlr", "antlr4-runtime").versionRef("antlr") + } + } +} + +include( + listOf( + "openrndr-demos", + "orx-jvm:orx-boofcv", + "orx-camera", + "orx-jvm:orx-chataigne", + "orx-color", + "orx-compositor", + "orx-compute-graph", + "orx-compute-graph-nodes", + "orx-jvm:orx-dnk3", + "orx-easing", + "orx-jvm:orx-file-watcher", + "orx-parameters", + "orx-filter-extension", + "orx-fx", + "orx-jvm:orx-git-archiver", + "orx-jvm:orx-git-archiver-gradle", + "orx-glslify", + "orx-gradient-descent", + "orx-hash-grid", + "orx-integral-image", + "orx-interval-tree", + "orx-jumpflood", + "orx-jvm:orx-gui", + "orx-image-fit", + "orx-kdtree", + "orx-jvm:orx-keyframer", + "orx-mesh-generators", + "orx-jvm:orx-minim", + "orx-jvm:orx-kotlin-parser", + "orx-jvm:orx-midi", + "orx-no-clear", + "orx-noise", + "orx-obj-loader", + "orx-jvm:orx-olive", + "orx-jvm:orx-osc", + "orx-palette", + "orx-jvm:orx-panel", + "orx-jvm:orx-poisson-fill", + "orx-quadtree", + "orx-jvm:orx-rabbit-control", + "orx-jvm:orx-realsense2", + "orx-jvm:orx-realsense2-natives-linux-x64", + "orx-jvm:orx-realsense2-natives-macos", + "orx-jvm:orx-realsense2-natives-windows", + "orx-jvm:orx-runway", + "orx-shader-phrases", + "orx-shade-styles", + "orx-shapes", + "orx-jvm:orx-syphon", + "orx-temporal-blur", + "orx-jvm:orx-tensorflow", + "orx-jvm:orx-tensorflow-gpu-natives-linux-x64", + "orx-jvm:orx-tensorflow-gpu-natives-windows", + "orx-jvm:orx-tensorflow-natives-linux-x64", + "orx-jvm:orx-tensorflow-natives-macos", + "orx-jvm:orx-tensorflow-natives-windows", + "orx-timer", + "orx-time-operators", + "orx-jvm:orx-triangulation", + "orx-jvm:orx-kinect-common", + "orx-jvm:orx-kinect-v1", + "orx-jvm:orx-kinect-v1-natives-linux-arm64", + "orx-jvm:orx-kinect-v1-natives-linux-x64", + "orx-jvm:orx-kinect-v1-natives-macos", + "orx-jvm:orx-kinect-v1-natives-windows", + "orx-jvm:orx-kinect-v1-demo", + "orx-jvm:orx-video-profiles" + ) +)