Migrate to Kotlin DSL build scripts (#243)

2022-06-30 18:51:09 +03:00
parent f0256aec7a
commit 48781ca314
66 changed files with 235 additions and 237 deletions
--- 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)
 }
--- 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)
--- 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)
 }
--- 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)
 }
--- 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)
 }
--- 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)
--- a/orx-jvm/orx-kinect-v1-demo/build.gradle
+++ b/orx-jvm/orx-kinect-v1-demo/build.gradle
@@ -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"
-}
--- a/orx-jvm/orx-kinect-v1-demo/build.gradle.kts
+++ 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")
+}
--- a/orx-jvm/orx-kinect-v1-natives-linux-arm64/build.gradle.kts
+++ b/orx-jvm/orx-kinect-v1-natives-linux-arm64/build.gradle.kts
--- a/orx-jvm/orx-kinect-v1-natives-linux-x64/build.gradle.kts
+++ b/orx-jvm/orx-kinect-v1-natives-linux-x64/build.gradle.kts
--- a/orx-jvm/orx-kinect-v1-natives-macos/build.gradle.kts
+++ b/orx-jvm/orx-kinect-v1-natives-macos/build.gradle.kts
--- a/orx-jvm/orx-kinect-v1-natives-windows/build.gradle.kts
+++ b/orx-jvm/orx-kinect-v1-natives-windows/build.gradle.kts
--- a/orx-jvm/orx-kinect-v1/build.gradle
+++ b/orx-jvm/orx-kinect-v1/build.gradle
@@ -1,4 +0,0 @@
-dependencies {
-    api project(":orx-jvm:orx-kinect-common")
-    api libs.libfreenect
-}
--- a/orx-jvm/orx-kinect-v1/build.gradle.kts
+++ b/orx-jvm/orx-kinect-v1/build.gradle.kts
@@ -0,0 +1,4 @@
+dependencies {
+    api(project(":orx-jvm:orx-kinect-common"))
+    api(libs.libfreenect)
+}
--- 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)
--- 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)
 }
--- 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)
--- 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)
 }
--- 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)
 }
--- 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)
 }
--- a/orx-jvm/orx-realsense2-natives-linux-x64/build.gradle.kts
+++ b/orx-jvm/orx-realsense2-natives-linux-x64/build.gradle.kts
--- a/orx-jvm/orx-realsense2-natives-macos/build.gradle.kts
+++ b/orx-jvm/orx-realsense2-natives-macos/build.gradle.kts
@@ -1,4 +1,3 @@
-
 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,4 +1,3 @@
-
 dependencies {
    runtimeOnly(variantOf(libs.librealsense) { classifier("windows-x86_64") })
 }
--- 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)
-
 }
--- 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)
--- a/orx-jvm/orx-syphon/build.gradle
+++ b/orx-jvm/orx-syphon/build.gradle
@@ -1,5 +0,0 @@
-dependencies {
-    implementation libs.openrndr.application
-    implementation libs.openrndr.gl3
-    implementation libs.openrndr.gl3.natives
-}
--- a/orx-jvm/orx-syphon/build.gradle.kts
+++ 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)
+}
--- a/orx-jvm/orx-tensorflow-gpu-natives-linux-x64/build.gradle.kts
+++ b/orx-jvm/orx-tensorflow-gpu-natives-linux-x64/build.gradle.kts
--- a/orx-jvm/orx-tensorflow-gpu-natives-windows/build.gradle.kts
+++ b/orx-jvm/orx-tensorflow-gpu-natives-windows/build.gradle.kts
--- a/orx-jvm/orx-tensorflow-natives-linux-x64/build.gradle.kts
+++ b/orx-jvm/orx-tensorflow-natives-linux-x64/build.gradle.kts
--- a/orx-jvm/orx-tensorflow-natives-macos/build.gradle.kts
+++ b/orx-jvm/orx-tensorflow-natives-macos/build.gradle.kts
--- a/orx-jvm/orx-tensorflow-natives-windows/build.gradle.kts
+++ b/orx-jvm/orx-tensorflow-natives-windows/build.gradle.kts
--- 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'
 }
-
-
--- 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)
 }
--- 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)