From f3d8d0a3dca0bac783e615b103935b5d73a6f5c2 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Sat, 24 Jun 2023 07:46:45 +0200 Subject: Upgrade openrndr/orx to 0.4.4-SNAPSHOT --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 934c538..7921e9e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "1.8.21" -openrndr = "0.4.3" -orx = "0.4.3" +openrndr = "0.4.4-SNAPSHOT" +orx = "0.4.4-SNAPSHOT" orml = "0.4.1" slf4j = "2.0.7" -- cgit v1.3.1 From f907422a5e705b29899645c8289c4b9a1451ed5b Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Sat, 24 Jun 2023 07:51:19 +0200 Subject: Upgrade kotlinx coroutines to 1.7.1, kotlin-csv to 1.9.1 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7921e9e..e9a67f8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,12 +19,12 @@ log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version. jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson" } jackson-json = { group = "com.fasterxml.jackson.dataformat", name = "jackson-dataformat-yaml", version.ref = "jackson" } -kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.6.4" } +kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.7.1" } kotlin-logging = { group = "io.github.microutils", name = "kotlin-logging", version = "3.0.5" } junit = { group = "junit", name = "junit", version = "4.13.2" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.16.1" } gson = { group = "com.google.code.gson", name = "gson", version = "2.10.1" } -csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version = "1.9.0" } +csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version = "1.9.1" } [plugins] kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } -- cgit v1.3.1 From a35675fd036b603628a4c778832ccb7d715c3691 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Tue, 29 Aug 2023 07:50:15 +0200 Subject: Upgrade to Gradle 8.3 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d..c30b486 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -- cgit v1.3.1 From 2f2d279e248896a35a11d18d9d77d886c7de84d5 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Tue, 29 Aug 2023 08:04:07 +0200 Subject: Update configuration cache settings --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index fbb0c0b..d847ff6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ openrndr.tasks=true kotlin.code.style=official -org.gradle.unsafe.configuration-cache=false - +#org.gradle.configuration-cache=true +#org.gradle.configuration-cache.problems=warn \ No newline at end of file -- cgit v1.3.1 From 411b5f5b126e7b252f4673270fe9cf883a47064d Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Fri, 6 Oct 2023 17:26:30 +0200 Subject: Update Gradle and Kotlin --- gradle/libs.versions.toml | 12 ++++++------ gradle/wrapper/gradle-wrapper.jar | Bin 62076 -> 63721 bytes gradle/wrapper/gradle-wrapper.properties | 3 ++- gradlew | 8 ++++++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e9a67f8..0397a90 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] -kotlin = "1.8.21" -openrndr = "0.4.4-SNAPSHOT" -orx = "0.4.4-SNAPSHOT" +kotlin = "1.9.10" +openrndr = "0.4.4-alpha4" +orx = "0.4.4-alpha4" orml = "0.4.1" -slf4j = "2.0.7" +slf4j = "2.0.9" log4j = "2.20.0" jackson = "2.14.2" @@ -19,12 +19,12 @@ log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version. jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson" } jackson-json = { group = "com.fasterxml.jackson.dataformat", name = "jackson-dataformat-yaml", version.ref = "jackson" } -kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.7.1" } +kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.7.3" } kotlin-logging = { group = "io.github.microutils", name = "kotlin-logging", version = "3.0.5" } junit = { group = "junit", name = "junit", version = "4.13.2" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.16.1" } gson = { group = "com.google.code.gson", name = "gson", version = "2.10.1" } -csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version = "1.9.1" } +csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version = "1.9.2" } [plugins] kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a7..7f93135 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c30b486..3fa8f86 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index aeb74cb..0adc8e1 100755 --- a/gradlew +++ b/gradlew @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -130,10 +131,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -- cgit v1.3.1 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(-) 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(-) 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 adf88e10621b6e53dd9bf183afb9dc9003bae596 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Sat, 11 Nov 2023 11:59:29 +0100 Subject: Update dependencies --- gradle/libs.versions.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0397a90..336e973 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] -kotlin = "1.9.10" +kotlin = "1.9.20" openrndr = "0.4.4-alpha4" orx = "0.4.4-alpha4" orml = "0.4.1" slf4j = "2.0.9" -log4j = "2.20.0" -jackson = "2.14.2" +log4j = "2.21.1" +jackson = "2.15.3" [libraries] kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" } @@ -28,6 +28,6 @@ csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version = "1. [plugins] kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } -shadow = { id = "com.github.johnrengelman.shadow", version = "7.1.2" } +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" } -- 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(+) 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 9695d5e8af2e91b9cb7bbfc4868eed7aa250b043 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Wed, 29 Nov 2023 16:27:28 +0100 Subject: Update Gradle to 8.5 --- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3fa8f86..1af9e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 0adc8e1..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -202,11 +202,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -- cgit v1.3.1 From 5ce3313da5c04c5eec6afcbdec50e03b107f77a7 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Wed, 29 Nov 2023 17:06:24 +0100 Subject: Update dependencies --- gradle/libs.versions.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 627decc..3e6122b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] -kotlin = "1.9.20" +kotlin = "1.9.21" openrndr = "0.4.4-alpha4" orx = "0.4.4-alpha4" orml = "0.4.1" slf4j = "2.0.9" -log4j = "2.21.1" -jackson = "2.15.3" +log4j = "2.22.0" +jackson = "2.16.0" [libraries] kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" } @@ -31,4 +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" } +versions = { id = "com.github.ben-manes.versions", version = "0.50.0" } -- cgit v1.3.1 From ce3bf56b4301caa10a4a714cbfc4784d8c6634a9 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Fri, 1 Dec 2023 17:11:57 +0100 Subject: Update openrndr and orx dependencies to 0.4.4-alpha5 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3e6122b..a59354e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "1.9.21" -openrndr = "0.4.4-alpha4" -orx = "0.4.4-alpha4" +openrndr = "0.4.4-alpha5" +orx = "0.4.4-alpha5" orml = "0.4.1" slf4j = "2.0.9" -- cgit v1.3.1 From 84f54b3f4e4ceee18dccc9ac03ecb1ecda18b26a Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Fri, 8 Dec 2023 10:47:07 +0100 Subject: Add logging files to .gitignore --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 62c248a..5b8423f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,7 @@ out .gradle video/ screenshots/ -gui-parameters/ \ No newline at end of file +gui-parameters/ +ffmpegOutput.txt +ShaderError.glsl + -- 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(-) 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 29db13e82a6fb473533d92d47d0d6d76ac50070e Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Fri, 8 Dec 2023 10:49:11 +0100 Subject: Update openrndr and orx to 0.4.4-alpha6 --- gradle/libs.versions.toml | 4 ++-- gradle/wrapper/gradle-wrapper.jar | Bin 63721 -> 43462 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a59354e..3b44feb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "1.9.21" -openrndr = "0.4.4-alpha5" -orx = "0.4.4-alpha5" +openrndr = "0.4.4-alpha6" +orx = "0.4.4-alpha6" orml = "0.4.1" slf4j = "2.0.9" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135..d64cd49 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ -- 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(-) 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 d692d6998d75a64a0eee51a79a4aa28486840123 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Tue, 2 Jan 2024 11:16:47 +0100 Subject: Update dependencies --- gradle/libs.versions.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3b44feb..5a14105 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] -kotlin = "1.9.21" -openrndr = "0.4.4-alpha6" -orx = "0.4.4-alpha6" +kotlin = "1.9.22" +openrndr = "0.4.4-alpha7" +orx = "0.4.4-alpha7" orml = "0.4.1" -slf4j = "2.0.9" -log4j = "2.22.0" -jackson = "2.16.0" +slf4j = "2.0.10" +log4j = "2.22.1" +jackson = "2.16.1" [libraries] kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" } @@ -22,7 +22,7 @@ jackson-json = { group = "com.fasterxml.jackson.dataformat", name = "jackson-dat kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.7.3" } kotlin-logging = { group = "io.github.microutils", name = "kotlin-logging", version = "3.0.5" } junit = { group = "junit", name = "junit", version = "4.13.2" } -jsoup = { group = "org.jsoup", name = "jsoup", version = "1.16.1" } +jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.1" } gson = { group = "com.google.code.gson", name = "gson", version = "2.10.1" } csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version = "1.9.2" } -- cgit v1.3.1 From d5702db78fa7ba28a58f95c18676ab5b90ee3a3c Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Fri, 5 Jan 2024 16:22:49 +0100 Subject: Update openrndr and orx to 0.4.4 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5a14105..cc9eac2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "1.9.22" -openrndr = "0.4.4-alpha7" -orx = "0.4.4-alpha7" +openrndr = "0.4.4" +orx = "0.4.4" orml = "0.4.1" slf4j = "2.0.10" -- 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(-) 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