Merge branch 'next-version' into feature-variants

s/convention/conventions/

.github/workflows/build-on-commit.yaml

@@ -8,16 +8,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v5
+      - uses: actions/setup-java@v4
         with:
-          distribution: temurin
+          distribution: 'temurin'
-          java-version: 21
+          java-version: '17'
           #cache: 'gradle'
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
-
       - name: Build sources
         run: ./gradlew build
+

.github/workflows/build-snapshot-on-commit.yaml

@@ -1,63 +0,0 @@
-name: Build snapshot on commit
-on:
-  push:
-    branches:
-      - snapshot
-
-defaults:
-  run:
-    working-directory: ./template
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout OPENRNDR repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          repository: openrndr/openrndr
-          path: ./openrndr
-          ref: master
-
-      - name: Checkout ORX repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          repository: openrndr/orx
-          path: ./orx
-          ref: master
-
-      - name: Checkout current repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          repository: openrndr/openrndr-template
-          path: ./template
-          ref: snapshot
-
-      - uses: actions/setup-java@v5
-        with:
-          distribution: temurin
-          java-version: 21
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
-
-      - name: Set swap space
-        uses: pierotofy/set-swap-space@v1.0
-        with:
-          swap-size-gb: 8
-
-      - name: Build OPENRNDR
-        working-directory: ./openrndr
-        run: ./gradlew publishToMavenLocal snapshot
-
-      - name: Build ORX
-        working-directory: ./orx
-        run: ./gradlew publishToMavenLocal snapshot
-
-      - name: Build template
-        working-directory: ./template
-        run: ./gradlew build
-

.github/workflows/publish-binaries.yaml

@@ -23,10 +23,10 @@ jobs:
     runs-on: ${{ matrix.os }}          
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v7
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -48,7 +48,7 @@ jobs:
         run: mv ./build/distributions/openrndr-application.zip ./build/distributions/openrndr-application-${{env.OR_TARGET_NAME}}.zip
 
       - name: Create Release
-        uses: ncipollo/release-action@v1.20.0
+        uses: ncipollo/release-action@v1.14.0
         id: create_release
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

build.gradle.kts

@@ -9,22 +9,23 @@ plugins {
 }
 
 dependencies {
-    implementation(openrndr.bundles.basic)
+    implementation(openrndr.application)
-    implementation(openrndr.bundles.video)
+    implementation(openrndr.draw)
-    runtimeOnly(openrndr.bundles.runtime.sdl)
-//    runtimeOnly(openrndr.bundles.runtime.glfw)
     runtimeOnly(openrndr.gl3)
+
     implementation(openrndr.dialogs)
     implementation(openrndr.orextensions)
 
+    implementation(openrndr.ffmpeg)
     implementation(orx.bundles.basic)
     implementation(orx.olive)
-
     implementation(libs.kotlinx.coroutines.core)
     implementation(libs.kotlinx.serialization.core)
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.slf4j.api)
     implementation(libs.kotlin.logging)
+
     runtimeOnly(libs.bundles.logging.simple)
+
     testImplementation(libs.junit)
 }

buildSrc/src/main/kotlin/conventions/distribute-application.gradle.kts

@@ -25,8 +25,6 @@ tasks {
         }
         minimize {
             exclude(dependency("org.openrndr:openrndr-gl3:.*"))
-            exclude(dependency("org.openrndr:openrndr-application-glfw"))
-            exclude(dependency("org.openrndr:openrndr-application-sdl"))
             exclude(dependency("org.jetbrains.kotlin:kotlin-reflect:.*"))
             exclude(dependency("org.slf4j:slf4j-simple:.*"))
             exclude(dependency("org.apache.logging.log4j:log4j-slf4j2-impl:.*"))
@@ -57,11 +55,6 @@ tasks {
         from("${layout.buildDirectory.get()}/jpackage") {
             include("**/*")
         }
-        filesMatching("**/bin/*") {
-            permissions {
-                unix("0755")
-            }
-        }
         dependsOn("jpackage")
     }
 }
@@ -72,9 +65,9 @@ runtime {
         skipInstaller = true
         if (OperatingSystem.current().isMacOsX) {
             jvmArgs.add("-XstartOnFirstThread")
-            jvmArgs.add($$"-Duser.dir=$APPDIR/../Resources")
+            jvmArgs.add("-Duser.dir=${"$"}APPDIR/../Resources")
         }
     }
-    options = listOf("--strip-debug", "--compress", "zip-6", "--no-header-files", "--no-man-pages")
+    options = listOf("--strip-debug", "--compress", "1", "--no-header-files", "--no-man-pages")
     modules = listOf("jdk.unsupported", "java.management", "java.desktop")
 }

gradle/libs.versions.toml

@@ -1,26 +1,26 @@
 [versions]
 jvmTarget = "17"
-kotlin = "2.3.21"
+kotlin = "2.2.10"
 kotlinApi = "2.2"
 kotlinLanguage = "2.2"
 
-openrndr = "0.5.0-alpha4"
+openrndr = "0.5.0-SNAPSHOT"
-orx = "0.5.0-alpha4"
+orx = "0.5.0-SNAPSHOT"
 orsl = "0.4.5-alpha5"
 orml = "0.4.1"
 
-slf4j = "2.0.18"
+slf4j = "2.0.17"
 log4j = "2.23.1"
 jackson = "2.17.2"
 junit = "4.13.2"
-kotlinxCoroutines = "1.11.0"
+kotlinxCoroutines = "1.10.2"
-kotlinxSerialization = "1.11.0"
+kotlinxSerialization = "1.9.0"
-kotlinLogging = "8.0.03"
+kotlinLogging = "7.0.13"
 kotlinCsvJvm = "1.9.3"
 jsoup = "1.17.1"
-shadow = "9.4.0"
+shadow = "9.1.0"
-runtime = "2.0.1"
+runtime = "1.13.1"
-versions = "0.54.0"
+versions = "0.52.0"
 
 [libraries]
 kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" }
@@ -56,4 +56,4 @@ versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
 [bundles]
 logging-none = ["slf4j-nop"]
 logging-simple = ["slf4j-simple"]
-logging-full = ["log4j-slf4j2", "log4j-core", "jackson-databind", "jackson-json"]
+loggin-full = ["log4j-slf4j2", "log4j-core", "jackson-databind", "jackson-json"]

gradle/wrapper/gradle-wrapper.properties

@@ -1,9 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
-retries=0
-retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -114,6 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -171,6 +172,7 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -210,6 +212,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -23,8 +23,8 @@
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables, and ensure extensions are enabled
+@rem Set local scope for the variables with windows NT shell
-setlocal EnableExtensions
+if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-"%COMSPEC%" /c exit 1
+goto fail
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,18 +65,30 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-"%COMSPEC%" /c exit 1
+goto fail
 
 :execute
 @rem Setup the command line
 
+set CLASSPATH=
 
 
 @rem Execute Gradle
-@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
-@rem which allows us to clear the local environment before executing the java command
-endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
 
-:exitWithErrorLevel
+:end
-@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+@rem End local scope for the variables with windows NT shell
-"%COMSPEC%" /c exit %ERRORLEVEL%
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega