From fa820c6d3cd222beb850dd2a9b24171f4013e2c6 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Fri, 6 Oct 2023 18:08:07 +0200 Subject: Fix Gradle deprecated $buildDir And some whitespace --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index 32b8bbe..28f0a9f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -57,7 +57,7 @@ val orxFeatures = setOf( "orx-shapes", // "orx-syphon", // "orx-temporal-blur", -// "orx-tensorflow", +// "orx-tensorflow", // "orx-time-operators", // "orx-timer", // "orx-triangulation", @@ -189,7 +189,7 @@ tasks { tasks.register("jpackageZip") { archiveFileName.set("openrndr-application.zip") - from("$buildDir/jpackage") { + from("${layout.buildDirectory.get()}/jpackage") { include("**/*") } } -- cgit v1.3.1 From eda66cc37a2c2c158614ef7230c04b90aefe4c36 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Fri, 6 Oct 2023 18:08:56 +0200 Subject: s/Images/Media/ (file scope), add audio and video file extensions --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index 28f0a9f..c916f5f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -311,7 +311,7 @@ if (properties["openrndr.tasks"] == "true") { "Code" to "file:*.kt||file:*.frag||file:*.vert||file:*.glsl", "Text" to "file:*.txt||file:*.md||file:*.xml||file:*.json", "Gradle" to "file[*buildSrc*]:*/||file:*gradle.*||file:*.gradle||file:*/gradle-wrapper.properties||file:*.toml", - "Images" to "file:*.png||file:*.jpg||file:*.dds||file:*.exr" + "Media" to "file:*.png||file:*.jpg||file:*.dds||file:*.exr||file:*.mp3||file:*.wav||file:*.mp4||file:*.mov" ) files.forEach { (name, pattern) -> val file = File(scopesFolder, "__$name.xml") -- cgit v1.3.1 From 5242dae526ffcb7145dd7871718e9888d751c8d6 Mon Sep 17 00:00:00 2001 From: Kazik Pogoda Date: Sun, 12 Nov 2023 16:17:25 +0100 Subject: build: versions plugin added for routine checks of dependency updates, excluding unstable dependencies (#51) --- build.gradle.kts | 25 +++++++++++++++++++++++++ gradle/libs.versions.toml | 1 + 2 files changed, 26 insertions(+) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index c916f5f..af657e3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -98,6 +98,7 @@ plugins { alias(libs.plugins.shadow) alias(libs.plugins.runtime) alias(libs.plugins.gitarchive.tomarkdown).apply(false) + alias(libs.plugins.versions) } repositories { @@ -218,6 +219,30 @@ tasks.register("gitArchiveT // ------------------------------------------------------------------------------------------------------------------ // +tasks { + + dependencyUpdates { + + gradleReleaseChannel = "current" + + val nonStableKeywords = listOf("alpha", "beta", "rc") + + fun isNonStable( + version: String + ) = nonStableKeywords.any { + version.lowercase().contains(it) + } + + rejectVersionIf { + isNonStable(candidate.version) && !isNonStable(currentVersion) + } + + } + +} + +// ------------------------------------------------------------------------------------------------------------------ // + class Openrndr { val openrndrVersion = libs.versions.openrndr.get() val orxVersion = libs.versions.orx.get() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 336e973..627decc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,3 +31,4 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" } runtime = { id = "org.beryx.runtime", version = "1.13.0" } gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" } +versions = { id = "com.github.ben-manes.versions", version = "0.49.0" } -- cgit v1.3.1 From a3c9178d4dc226dd2de00185ba69436d9c4ba9ff Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Fri, 8 Dec 2023 10:48:00 +0100 Subject: Update orx'es in build.gradle.kts --- build.gradle.kts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index af657e3..f98b31a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,13 +17,14 @@ val orxFeatures = setOf( "orx-compositor", // "orx-compute-graph", // "orx-compute-graph-nodes", + "orx-delegate-magic", // "orx-dnk3", // "orx-easing", // "orx-expression-evaluator", + "orx-envelopes", // "orx-file-watcher", "orx-fx", // "orx-git-archiver", -// "orx-glslify", // "orx-gradient-descent", "orx-gui", // "orx-hash-grid", @@ -220,9 +221,7 @@ tasks.register("gitArchiveT // ------------------------------------------------------------------------------------------------------------------ // tasks { - dependencyUpdates { - gradleReleaseChannel = "current" val nonStableKeywords = listOf("alpha", "beta", "rc") @@ -236,9 +235,7 @@ tasks { rejectVersionIf { isNonStable(candidate.version) && !isNonStable(currentVersion) } - } - } // ------------------------------------------------------------------------------------------------------------------ // -- cgit v1.3.1 From 3db83af277d8a505fe01d35eb17a4fa607c3b4b3 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Tue, 2 Jan 2024 11:16:30 +0100 Subject: Add svg to media file scope --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index f98b31a..3271a3d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -333,7 +333,7 @@ if (properties["openrndr.tasks"] == "true") { "Code" to "file:*.kt||file:*.frag||file:*.vert||file:*.glsl", "Text" to "file:*.txt||file:*.md||file:*.xml||file:*.json", "Gradle" to "file[*buildSrc*]:*/||file:*gradle.*||file:*.gradle||file:*/gradle-wrapper.properties||file:*.toml", - "Media" to "file:*.png||file:*.jpg||file:*.dds||file:*.exr||file:*.mp3||file:*.wav||file:*.mp4||file:*.mov" + "Media" to "file:*.png||file:*.jpg||file:*.dds||file:*.exr||file:*.mp3||file:*.wav||file:*.mp4||file:*.mov||file:*.svg" ) files.forEach { (name, pattern) -> val file = File(scopesFolder, "__$name.xml") -- cgit v1.3.1 From 498fd6773d2b3828934f507a93ba090302842d1c Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Fri, 5 Jan 2024 16:37:29 +0100 Subject: Add orx-property-watchers, mention next-version branch --- README.md | 2 +- build.gradle.kts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'build.gradle.kts') diff --git a/README.md b/README.md index 1e7537a..4da4455 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Newer versions of OPENRNDR and ORX bring useful features and bug fixes. The most
![openrndr version](https://maven-badges.herokuapp.com/maven-central/org.openrndr/openrndr-application/badge.svg) for OPENRNDR.
![orx version](https://maven-badges.herokuapp.com/maven-central/org.openrndr.extra/orx-parameters-jvm/badge.svg) for ORX. -You can use those version numbers in your toml file. They can look like "0.4.3" or "0.4.3-alpha4". Use the complete string, as in: +Switch to the [next-version branch](https://github.com/openrndr/openrndr-template/tree/next-version) or enter these version numbers in your toml file. They can look like "0.4.3" or "0.4.3-alpha4". Use the complete string, as in: openrndr = "0.4.3-alpha4" orx = "0.4.3-alpha4" diff --git a/build.gradle.kts b/build.gradle.kts index 3271a3d..4819ef2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,8 +20,8 @@ val orxFeatures = setOf( "orx-delegate-magic", // "orx-dnk3", // "orx-easing", -// "orx-expression-evaluator", "orx-envelopes", +// "orx-expression-evaluator", // "orx-file-watcher", "orx-fx", // "orx-git-archiver", @@ -49,6 +49,7 @@ val orxFeatures = setOf( "orx-panel", // "orx-parameters", // "orx-poisson-fill", +// "orx-property-watchers", // "orx-quadtree", // "orx-rabbit-control", // "orx-realsense2", -- cgit v1.3.1