diff --git a/.gitignore b/.gitignore index 62c248af..5b8423f1 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 + diff --git a/build.gradle.kts b/build.gradle.kts index ae809218..4819ef27 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-envelopes", // "orx-expression-evaluator", // "orx-file-watcher", "orx-fx", // "orx-git-archiver", -// "orx-glslify", // "orx-gradient-descent", "orx-gui", // "orx-hash-grid", @@ -48,6 +49,7 @@ val orxFeatures = setOf( "orx-panel", // "orx-parameters", // "orx-poisson-fill", +// "orx-property-watchers", // "orx-quadtree", // "orx-rabbit-control", // "orx-realsense2", @@ -57,7 +59,7 @@ val orxFeatures = setOf( "orx-shapes", // "orx-syphon", // "orx-temporal-blur", -// "orx-tensorflow", +// "orx-tensorflow", // "orx-time-operators", // "orx-timer", // "orx-triangulation", @@ -190,7 +192,7 @@ tasks { tasks.register("jpackageZip") { archiveFileName.set("openrndr-application.zip") - from("$buildDir/jpackage") { + from("${layout.buildDirectory.get()}/jpackage") { include("**/*") } } @@ -220,9 +222,7 @@ tasks.register("gitArchiveT // ------------------------------------------------------------------------------------------------------------------ // tasks { - dependencyUpdates { - gradleReleaseChannel = "current" val nonStableKeywords = listOf("alpha", "beta", "rc") @@ -236,9 +236,7 @@ tasks { rejectVersionIf { isNonStable(candidate.version) && !isNonStable(currentVersion) } - } - } // ------------------------------------------------------------------------------------------------------------------ // @@ -336,7 +334,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||file:*.svg" ) files.forEach { (name, pattern) -> val file = File(scopesFolder, "__$name.xml") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0ecfd082..4a6fdd78 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] -kotlin = "1.8.21" -openrndr = "0.4.3" -orx = "0.4.3" +kotlin = "1.9.22" +openrndr = "0.4.4" +orx = "0.4.4" orml = "0.4.1" -slf4j = "2.0.7" -log4j = "2.20.0" -jackson = "2.14.2" +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" } @@ -19,16 +19,17 @@ 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.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.0" } +csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version = "1.9.2" } [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" } -versions = { id = "com.github.ben-manes.versions", version = "0.49.0" } +versions = { id = "com.github.ben-manes.versions", version = "0.50.0" } + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a79..d64cd491 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 c30b486a..1af9e093 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.5-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index aeb74cbb..1aa94a42 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. @@ -141,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 @@ -149,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 @@ -198,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" \