Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to Kotlin DSL build scripts #243

Merged
merged 2 commits into from
Jun 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion openrndr-demos/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion orx-camera/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion orx-color/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion orx-compositor/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion orx-compute-graph-nodes/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion orx-compute-graph/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion orx-easing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion orx-fx/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
6 changes: 0 additions & 6 deletions orx-glslify/build.gradle

This file was deleted.

5 changes: 5 additions & 0 deletions orx-glslify/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
dependencies {
implementation(libs.gson)
implementation("org.rauschig:jarchivelib:1.0.0")
implementation(project(":orx-noise"))
}
2 changes: 1 addition & 1 deletion orx-gradient-descent/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion orx-hash-grid/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion orx-image-fit/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
3 changes: 0 additions & 3 deletions orx-integral-image/build.gradle

This file was deleted.

3 changes: 3 additions & 0 deletions orx-integral-image/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependencies {
implementation(project(":orx-fx"))
}
2 changes: 1 addition & 1 deletion orx-jumpflood/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion orx-jvm/orx-boofcv/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion orx-jvm/orx-chataigne/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion orx-jvm/orx-dnk3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion orx-jvm/orx-git-archiver/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion orx-jvm/orx-gui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion orx-jvm/orx-keyframer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 0 additions & 7 deletions orx-jvm/orx-kinect-v1-demo/build.gradle

This file was deleted.

7 changes: 7 additions & 0 deletions orx-jvm/orx-kinect-v1-demo/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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")
}
4 changes: 0 additions & 4 deletions orx-jvm/orx-kinect-v1/build.gradle

This file was deleted.

4 changes: 4 additions & 0 deletions orx-jvm/orx-kinect-v1/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
dependencies {
api(project(":orx-jvm:orx-kinect-common"))
api(libs.libfreenect)
}
2 changes: 1 addition & 1 deletion orx-jvm/orx-kotlin-parser/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion orx-jvm/orx-minim/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion orx-jvm/orx-olive/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion orx-jvm/orx-panel/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion orx-jvm/orx-poisson-fill/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion orx-jvm/orx-rabbit-control/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

dependencies {
runtimeOnly(variantOf(libs.librealsense) { classifier("macosx-x86_64") })
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

dependencies {
runtimeOnly(variantOf(libs.librealsense) { classifier("windows-x86_64") })
}
9 changes: 3 additions & 6 deletions orx-jvm/orx-realsense2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)

}
2 changes: 1 addition & 1 deletion orx-jvm/orx-runway/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions orx-jvm/orx-syphon/build.gradle

This file was deleted.

5 changes: 5 additions & 0 deletions orx-jvm/orx-syphon/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
dependencies {
implementation(libs.openrndr.application)
implementation(libs.openrndr.gl3.core)
implementation(libs.openrndr.gl3.natives)
}
10 changes: 3 additions & 7 deletions orx-jvm/orx-tensorflow/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -50,5 +48,3 @@ dependencies {
// -- wrapgen
wrapgenImplementation 'com.github.javaparser:javaparser-core:3.15.21'
}


2 changes: 1 addition & 1 deletion orx-jvm/orx-triangulation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion orx-jvm/orx-video-profiles/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion orx-kdtree/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion orx-mesh-generators/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion orx-no-clear/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion orx-noise/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
Loading