From d18c6d5125e5f12746961724d61bc9008101bf0b Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Sun, 14 Jan 2024 19:57:47 +0100 Subject: Upgrade to kotlin-logging 6.0.2 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4a6fdd7..2a1dd90 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ openrndr = "0.4.4" orx = "0.4.4" orml = "0.4.1" -slf4j = "2.0.10" +slf4j = "2.0.11" log4j = "2.22.1" jackson = "2.16.1" @@ -20,7 +20,7 @@ jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-datab 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.3" } -kotlin-logging = { group = "io.github.microutils", name = "kotlin-logging", version = "3.0.5" } +kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "6.0.2" } junit = { group = "junit", name = "junit", version = "4.13.2" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.1" } gson = { group = "com.google.code.gson", name = "gson", version = "2.10.1" } -- cgit v1.3.1 From af067db9e91cd6068a38c9a34b26edab3414beac Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Mon, 15 Jan 2024 14:15:29 +0100 Subject: Add ORSL dependencies --- build.gradle.kts | 11 +++++++++++ gradle/libs.versions.toml | 14 ++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/build.gradle.kts b/build.gradle.kts index 4819ef2..b057833 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -114,6 +114,17 @@ dependencies { // implementation(libs.gson) // implementation(libs.csv) + /* ORSL dependencies */ + +// implementation(libs.orsl.shader.generator) +// implementation(libs.orsl.extension.color) +// implementation(libs.orsl.extension.easing) +// implementation(libs.orsl.extension.gradient) +// implementation(libs.orsl.extension.noise) +// implementation(libs.orsl.extension.pbr) +// implementation(libs.orsl.extension.raymarching) +// implementation(libs.orsl.extension.sdf) + implementation(libs.kotlinx.coroutines.core) implementation(libs.slf4j.api) implementation(libs.kotlin.logging) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2a1dd90..0d948ee 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,8 @@ [versions] kotlin = "1.9.22" -openrndr = "0.4.4" -orx = "0.4.4" +openrndr = "0.4.5-alpha1" +orx = "0.4.5-alpha1" +orsl = "0.4.5-alpha1" orml = "0.4.1" slf4j = "2.0.11" @@ -19,6 +20,15 @@ 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" } +orsl-shader-generator = { group = "org.openrndr.extra", name = "orsl-shader-generator", version.ref = "orsl" } +orsl-extension-color = { group = "org.openrndr.extra", name = "orsl-extension-color", version.ref = "orsl" } +orsl-extension-easing = { group = "org.openrndr.extra", name = "orsl-extension-easing", version.ref = "orsl" } +orsl-extension-gradient = { group = "org.openrndr.extra", name = "orsl-extension-gradient", version.ref = "orsl" } +orsl-extension-noise = { group = "org.openrndr.extra", name = "orsl-extension-noise", version.ref = "orsl" } +orsl-extension-pbr = { group = "org.openrndr.extra", name = "orsl-extension-pbr", version.ref = "orsl" } +orsl-extension-raymarching = { group = "org.openrndr.extra", name = "orsl-extension-raymarching", version.ref = "orsl" } +orsl-extension-sdf = { group = "org.openrndr.extra", name = "orsl-extension-sdf", version.ref = "orsl" } + kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.7.3" } kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "6.0.2" } junit = { group = "junit", name = "junit", version = "4.13.2" } -- cgit v1.3.1 From 44328365dfed688d7e66ca7c22a89d65e09d89e5 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Mon, 29 Jan 2024 17:48:02 +0100 Subject: update Gradle dependencies logging and versions --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0d948ee..c16ea03 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,7 +30,7 @@ orsl-extension-raymarching = { group = "org.openrndr.extra", name = "orsl-extens orsl-extension-sdf = { group = "org.openrndr.extra", name = "orsl-extension-sdf", version.ref = "orsl" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.7.3" } -kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "6.0.2" } +kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "6.0.3" } junit = { group = "junit", name = "junit", version = "4.13.2" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.1" } gson = { group = "com.google.code.gson", name = "gson", version = "2.10.1" } @@ -41,5 +41,5 @@ 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.50.0" } +versions = { id = "com.github.ben-manes.versions", version = "0.51.0" } -- cgit v1.3.1 From e92bd56f905bcd0e4332da3d3e79f5a51cccdb79 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Sat, 3 Feb 2024 09:30:16 +0100 Subject: Update to Gradle 8.6 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e09..a80b22c 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.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -- cgit v1.3.1 From 45724e1fdb13a01eb638ebb18345429aa21c2c6c Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Mon, 19 Feb 2024 15:51:47 +0100 Subject: Update slf4j and kotlinx-coroutines-core --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c16ea03..abd61af 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ orx = "0.4.5-alpha1" orsl = "0.4.5-alpha1" orml = "0.4.1" -slf4j = "2.0.11" +slf4j = "2.0.12" log4j = "2.22.1" jackson = "2.16.1" @@ -29,7 +29,7 @@ orsl-extension-pbr = { group = "org.openrndr.extra", name = "orsl-extension-pbr" orsl-extension-raymarching = { group = "org.openrndr.extra", name = "orsl-extension-raymarching", version.ref = "orsl" } orsl-extension-sdf = { group = "org.openrndr.extra", name = "orsl-extension-sdf", version.ref = "orsl" } -kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.7.3" } +kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.8.0" } kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "6.0.3" } junit = { group = "junit", name = "junit", version = "4.13.2" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.1" } -- cgit v1.3.1 From 52106db9ef308fba0822dfec2a0337bf909738f1 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Thu, 22 Feb 2024 17:29:52 +0100 Subject: Update log4j and org.beryx.runtime dependencies --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index abd61af..3c8e263 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ orsl = "0.4.5-alpha1" orml = "0.4.1" slf4j = "2.0.12" -log4j = "2.22.1" +log4j = "2.23.0" jackson = "2.16.1" [libraries] @@ -39,7 +39,7 @@ 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 = "8.1.1" } -runtime = { id = "org.beryx.runtime", version = "1.13.0" } +runtime = { id = "org.beryx.runtime", version = "1.13.1" } gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" } versions = { id = "com.github.ben-manes.versions", version = "0.51.0" } -- cgit v1.3.1 From 4b606e76ad64c66664f8371fcda16e8207c009ae Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Thu, 7 Mar 2024 19:06:54 +0100 Subject: Update kotlin to 1.9.23 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3c8e263..881960f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "1.9.22" +kotlin = "1.9.23" openrndr = "0.4.5-alpha1" orx = "0.4.5-alpha1" orsl = "0.4.5-alpha1" -- cgit v1.3.1 From 06b43c9ee423bb5ec1ad37a5b498360aa4533787 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Mon, 11 Mar 2024 16:40:36 +0100 Subject: Update to log4j 2.23.1, jackson 2.16.2 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 881960f..8c31963 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,8 +6,8 @@ orsl = "0.4.5-alpha1" orml = "0.4.1" slf4j = "2.0.12" -log4j = "2.23.0" -jackson = "2.16.1" +log4j = "2.23.1" +jackson = "2.16.2" [libraries] kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" } -- cgit v1.3.1 From 04d1b242ecc51670bcee6424ff2b04f2523794d9 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Sun, 17 Mar 2024 20:45:53 +0100 Subject: libs.versions.toml use openrndr/orx/orsl 0.4.5-alpha2 --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8c31963..ed42ebd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] kotlin = "1.9.23" -openrndr = "0.4.5-alpha1" -orx = "0.4.5-alpha1" -orsl = "0.4.5-alpha1" +openrndr = "0.4.5-alpha2" +orx = "0.4.5-alpha2" +orsl = "0.4.5-alpha2" orml = "0.4.1" slf4j = "2.0.12" -- cgit v1.3.1 From cb500ab50d344258083ce0791c16fc50cf137948 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Sat, 23 Mar 2024 10:33:53 +0100 Subject: Upgrade Gradle to 8.7, disable orx-svg, orx-composition as they are not yet available in 0.4.5alpha2 --- build.gradle.kts | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew.bat | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'gradle') diff --git a/build.gradle.kts b/build.gradle.kts index f2087fb..f4925f7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,7 @@ val orxFeatures = setOf( "orx-camera", // "orx-chataigne", "orx-color", - "orx-composition", +//// "orx-composition", "orx-compositor", // "orx-compute-graph", // "orx-compute-graph-nodes", @@ -60,7 +60,7 @@ val orxFeatures = setOf( "orx-shade-styles", // "orx-shader-phrases", "orx-shapes", - "orx-svg", +//// "orx-svg", // "orx-syphon", // "orx-temporal-blur", // "orx-tensorflow", diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22c..b82aa23 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.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +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 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +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 goto fail -- cgit v1.3.1 From d73f4b7595c7163edb5c86078c73d32b143ca167 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Thu, 18 Apr 2024 18:25:50 +0200 Subject: Update slf4j, jackson, kotlin-logging --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ed42ebd..8835d9b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,9 +5,9 @@ orx = "0.4.5-alpha2" orsl = "0.4.5-alpha2" orml = "0.4.1" -slf4j = "2.0.12" +slf4j = "2.0.13" log4j = "2.23.1" -jackson = "2.16.2" +jackson = "2.17.0" [libraries] kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" } @@ -30,7 +30,7 @@ orsl-extension-raymarching = { group = "org.openrndr.extra", name = "orsl-extens orsl-extension-sdf = { group = "org.openrndr.extra", name = "orsl-extension-sdf", version.ref = "orsl" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.8.0" } -kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "6.0.3" } +kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "6.0.9" } junit = { group = "junit", name = "junit", version = "4.13.2" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.1" } gson = { group = "com.google.code.gson", name = "gson", version = "2.10.1" } -- cgit v1.3.1 From 89b9d05ed273e18e131c1fea6e30de4df25deeb2 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Wed, 24 Apr 2024 08:35:35 +0200 Subject: Update to 0.4.5-alpha3, remove openrndr-svg Add orx-svg and orx-composition --- build.gradle.kts | 5 ++--- gradle/libs.versions.toml | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'gradle') diff --git a/build.gradle.kts b/build.gradle.kts index f4925f7..83e1a2f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,7 @@ val orxFeatures = setOf( "orx-camera", // "orx-chataigne", "orx-color", -//// "orx-composition", +// "orx-composition", "orx-compositor", // "orx-compute-graph", // "orx-compute-graph-nodes", @@ -60,7 +60,7 @@ val orxFeatures = setOf( "orx-shade-styles", // "orx-shader-phrases", "orx-shapes", -//// "orx-svg", +// "orx-svg", // "orx-syphon", // "orx-temporal-blur", // "orx-tensorflow", @@ -302,7 +302,6 @@ class Openrndr { implementation(openrndr("openal")) runtimeOnly(openrndrNatives("openal")) implementation(openrndr("application")) - implementation(openrndr("svg")) implementation(openrndr("animatable")) implementation(openrndr("extensions")) implementation(openrndr("filter")) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8835d9b..bfae9f8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] kotlin = "1.9.23" -openrndr = "0.4.5-alpha2" -orx = "0.4.5-alpha2" -orsl = "0.4.5-alpha2" +openrndr = "0.4.5-alpha3" +orx = "0.4.5-alpha3" +orsl = "0.4.5-alpha3" orml = "0.4.1" slf4j = "2.0.13" -- cgit v1.3.1 From ef664b5e6eb5a3e03248b92b92f20e052a91e831 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Thu, 9 May 2024 13:05:34 +0200 Subject: Update to kotlin 1.9.24 and jackson 2.17.1 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bfae9f8..f4c7b3b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "1.9.23" +kotlin = "1.9.24" openrndr = "0.4.5-alpha3" orx = "0.4.5-alpha3" orsl = "0.4.5-alpha3" @@ -7,7 +7,7 @@ orml = "0.4.1" slf4j = "2.0.13" log4j = "2.23.1" -jackson = "2.17.0" +jackson = "2.17.1" [libraries] kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" } -- cgit v1.3.1 From d69cd8e2f3cc1e95feab46a4460579f73e0fde45 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Mon, 13 May 2024 13:46:26 +0200 Subject: Update kotlinx-coroutines-core to 1.8.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f4c7b3b..8a66201 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,7 +29,7 @@ orsl-extension-pbr = { group = "org.openrndr.extra", name = "orsl-extension-pbr" orsl-extension-raymarching = { group = "org.openrndr.extra", name = "orsl-extension-raymarching", version.ref = "orsl" } orsl-extension-sdf = { group = "org.openrndr.extra", name = "orsl-extension-sdf", version.ref = "orsl" } -kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.8.0" } +kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.8.1" } kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "6.0.9" } junit = { group = "junit", name = "junit", version = "4.13.2" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.1" } -- cgit v1.3.1 From 2f6798455975aa48fd57b3bd675cddbed6b5ece2 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Thu, 16 May 2024 16:11:28 +0200 Subject: Update kotlin-csv-jvm to 1.9.3 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8a66201..f904a40 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,7 +34,7 @@ kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = junit = { group = "junit", name = "junit", version = "4.13.2" } 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" } +csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version = "1.9.3" } [plugins] kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } -- cgit v1.3.1 From 62b4bd6838b3deb6ab8b94bcfe9ea147da6a325e Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Mon, 27 May 2024 22:42:21 +0200 Subject: Update to Kotlin 2.0.0 --- build.gradle.kts | 7 +++++++ gradle/libs.versions.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'gradle') diff --git a/build.gradle.kts b/build.gradle.kts index 83e1a2f..8b6a2d9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.internal.os.OperatingSystem import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform +import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile group = "org.openrndr.template" @@ -158,6 +159,12 @@ java { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } +kotlin { + compilerOptions { + languageVersion.set(KotlinVersion.KOTLIN_2_0) + apiVersion.set(KotlinVersion.KOTLIN_2_0) + } +} tasks.withType { kotlinOptions.jvmTarget = "11" } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f904a40..4b6f1b9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "1.9.24" +kotlin = "2.0.0" openrndr = "0.4.5-alpha3" orx = "0.4.5-alpha3" orsl = "0.4.5-alpha3" -- cgit v1.3.1 From d060ca35df8548bc7d110c4ae3d21cdaf67861c8 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Sat, 1 Jun 2024 07:59:06 +0200 Subject: Upgrade to Gradle 8.8 --- gradle/wrapper/gradle-wrapper.jar | Bin 43462 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..e644113 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 b82aa23..a441313 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.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -- cgit v1.3.1 From 07fe13d072f72d2c4e4ed118bb54137fbb8b1d5e Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Sun, 9 Jun 2024 07:18:41 +0200 Subject: Update openrndr/orx/orsl to 0.4.5-alpha4 --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4b6f1b9..746b080 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] kotlin = "2.0.0" -openrndr = "0.4.5-alpha3" -orx = "0.4.5-alpha3" -orsl = "0.4.5-alpha3" +openrndr = "0.4.5-alpha4" +orx = "0.4.5-alpha4" +orsl = "0.4.5-alpha4" orml = "0.4.1" slf4j = "2.0.13" -- cgit v1.3.1 From c26742331a7d383c3baef79b3cce75ebb8b72e95 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Sat, 15 Jun 2024 13:01:14 +0200 Subject: Update kotlin-logging 6.0.9 -> 7.0.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 746b080..ec765c8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,7 +30,7 @@ orsl-extension-raymarching = { group = "org.openrndr.extra", name = "orsl-extens orsl-extension-sdf = { group = "org.openrndr.extra", name = "orsl-extension-sdf", version.ref = "orsl" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.8.1" } -kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "6.0.9" } +kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.0" } junit = { group = "junit", name = "junit", version = "4.13.2" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.1" } gson = { group = "com.google.code.gson", name = "gson", version = "2.10.1" } -- cgit v1.3.1 From e2fc66c8cc2d8128fc4c9857ee4c2ece0f8c2b3e Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Tue, 16 Jul 2024 15:24:58 +0200 Subject: Update Gradle 8.8 to 8.9 --- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a441313..09523c0 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.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..b740cf1 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/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/. -- cgit v1.3.1 From 80233d385cee11558172db4ed3f288b592950afe Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Tue, 16 Jul 2024 15:25:21 +0200 Subject: Update jackson 2.17.1 to 2.17.2 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ec765c8..942e2a5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ orml = "0.4.1" slf4j = "2.0.13" log4j = "2.23.1" -jackson = "2.17.1" +jackson = "2.17.2" [libraries] kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" } -- cgit v1.3.1 From ac635eb6ebf3aed6653ebf25208b7672e733a5cc Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Thu, 18 Jul 2024 22:59:41 +0200 Subject: Update dependencies openrndr = "0.4.5-alpha5" orx = "0.4.5-alpha5" orsl = "0.4.5-alpha3" orsl was set to alpha4 which does not yet exist --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 942e2a5..c34774a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] kotlin = "2.0.0" -openrndr = "0.4.5-alpha4" -orx = "0.4.5-alpha4" -orsl = "0.4.5-alpha4" +openrndr = "0.4.5-alpha5" +orx = "0.4.5-alpha5" +orsl = "0.4.5-alpha3" orml = "0.4.1" slf4j = "2.0.13" -- cgit v1.3.1 From f7c6d74a88f37d75e482285d9e607da7cae8208c Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Thu, 8 Aug 2024 17:22:08 +0200 Subject: Update kotlin to 2.0.10, slf4j to 2.0.15 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c34774a..3607a0a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,11 +1,11 @@ [versions] -kotlin = "2.0.0" +kotlin = "2.0.10" openrndr = "0.4.5-alpha5" orx = "0.4.5-alpha5" orsl = "0.4.5-alpha3" orml = "0.4.1" -slf4j = "2.0.13" +slf4j = "2.0.15" log4j = "2.23.1" jackson = "2.17.2" -- cgit v1.3.1 From e0fa55efc58b9c856d030ab406e34dc8f58f8506 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Sat, 10 Aug 2024 14:47:06 +0200 Subject: Update slf4j to 2.0.16 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3607a0a..49f7c84 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ orx = "0.4.5-alpha5" orsl = "0.4.5-alpha3" orml = "0.4.1" -slf4j = "2.0.15" +slf4j = "2.0.16" log4j = "2.23.1" jackson = "2.17.2" -- cgit v1.3.1 From 9adbb2b4a0e9f2b9e27db1cd5b6855ff9578aee7 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Thu, 15 Aug 2024 10:53:09 +0200 Subject: Update to Gradle 8.10 --- gradle/wrapper/gradle-wrapper.jar | Bin 43453 -> 43504 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 5 ++++- gradlew.bat | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..2c35211 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 09523c0..9355b41 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.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # 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 +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30d..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## -- cgit v1.3.1 From 057160811ab40a51f601c16f3793f3ac0ad0bc94 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Thu, 15 Aug 2024 11:17:53 +0200 Subject: Update orsl to 0.4.5-alpha5 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 49f7c84..b36a573 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ kotlin = "2.0.10" openrndr = "0.4.5-alpha5" orx = "0.4.5-alpha5" -orsl = "0.4.5-alpha3" +orsl = "0.4.5-alpha5" orml = "0.4.1" slf4j = "2.0.16" -- cgit v1.3.1 From 54a0d0fa3b92ce53094f05b3494a82a9daccdf70 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Sun, 1 Sep 2024 19:18:04 +0200 Subject: Update kotlin to 2.0.20 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b36a573..5ea8b8a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "2.0.10" +kotlin = "2.0.20" openrndr = "0.4.5-alpha5" orx = "0.4.5-alpha5" orsl = "0.4.5-alpha5" -- cgit v1.3.1 From db2032434c0dd5c2dd6799a5a7bfc17d8c4b029a Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Tue, 17 Sep 2024 11:13:29 +0200 Subject: Update to kotlinx-coroutines 1.9.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5ea8b8a..356e1e7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,7 +29,7 @@ orsl-extension-pbr = { group = "org.openrndr.extra", name = "orsl-extension-pbr" orsl-extension-raymarching = { group = "org.openrndr.extra", name = "orsl-extension-raymarching", version.ref = "orsl" } orsl-extension-sdf = { group = "org.openrndr.extra", name = "orsl-extension-sdf", version.ref = "orsl" } -kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.8.1" } +kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.9.0" } kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.0" } junit = { group = "junit", name = "junit", version = "4.13.2" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.1" } -- cgit v1.3.1 From 2e54d29687b19b279db5f83f255a8acebeda1c80 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Tue, 1 Oct 2024 16:01:34 +0200 Subject: Update to Gradle 8.10.2 --- gradle/wrapper/gradle-wrapper.jar | Bin 43504 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c35211..a4b76b9 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 9355b41..df97d72 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.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -- cgit v1.3.1 From 1dd34470baa6d95be8bb449047e12ffa87ce1e39 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Mon, 11 Nov 2024 14:31:46 +0100 Subject: Replace gson with kotlinx.serialization --- build.gradle.kts | 4 +++- gradle/libs.versions.toml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/build.gradle.kts b/build.gradle.kts index 1704a2c..ba9ce0a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -107,6 +107,7 @@ plugins { alias(libs.plugins.runtime) alias(libs.plugins.gitarchive.tomarkdown).apply(false) alias(libs.plugins.versions) + alias(libs.plugins.kotlin.serialization) } repositories { @@ -117,7 +118,6 @@ repositories { dependencies { // implementation(libs.jsoup) -// implementation(libs.gson) // implementation(libs.csv) /* ORSL dependencies */ @@ -132,6 +132,8 @@ dependencies { // implementation(libs.orsl.extension.sdf) implementation(libs.kotlinx.coroutines.core) + implementation(libs.kotlinx.serialization.core) + implementation(libs.kotlinx.serialization.json) implementation(libs.slf4j.api) implementation(libs.kotlin.logging) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 356e1e7..6b26b7f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,14 +30,16 @@ orsl-extension-raymarching = { group = "org.openrndr.extra", name = "orsl-extens orsl-extension-sdf = { group = "org.openrndr.extra", name = "orsl-extension-sdf", version.ref = "orsl" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.9.0" } +kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.7.3" } +kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version = "1.7.3" } kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.0" } junit = { group = "junit", name = "junit", version = "4.13.2" } 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.3" } [plugins] kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" } runtime = { id = "org.beryx.runtime", version = "1.13.1" } gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" } -- cgit v1.3.1 From d8e3f5339987c0f17d149982dfb83982f40aa103 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Mon, 11 Nov 2024 14:32:13 +0100 Subject: Upgrade kotlin 2.0.20 to 2.0.21 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6b26b7f..1ca1dab 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "2.0.20" +kotlin = "2.0.21" openrndr = "0.4.5-alpha5" orx = "0.4.5-alpha5" orsl = "0.4.5-alpha5" -- cgit v1.3.1 From 163860755f2ee73f18a0926a7e11e826ebf9a04c Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Thu, 14 Nov 2024 15:11:19 +0100 Subject: Update to Gradle 8.11 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72..94113f2 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.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -- cgit v1.3.1 From 96984e812e81eb22d28f9207140a37791bf1c86c Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Thu, 14 Nov 2024 15:11:34 +0100 Subject: Update to openrndr/orx 0.4.5-alpha6 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1ca1dab..03229d6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "2.0.21" -openrndr = "0.4.5-alpha5" -orx = "0.4.5-alpha5" +openrndr = "0.4.5-alpha6" +orx = "0.4.5-alpha6" orsl = "0.4.5-alpha5" orml = "0.4.1" -- cgit v1.3.1 From 5d26459546ba58e5df9b96fbd2ea9a24d42030cd Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Mon, 25 Nov 2024 08:06:42 +0100 Subject: Update to Gradle 8.11.1 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 94113f2..e2847c8 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.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -- cgit v1.3.1 From 7e8183116648c526e5dbe26adc643b3280bf7791 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Wed, 27 Nov 2024 16:38:18 +0100 Subject: Update to Kotlin 2.1.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 03229d6..feb6bf3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "2.0.21" +kotlin = "2.1.0" openrndr = "0.4.5-alpha6" orx = "0.4.5-alpha6" orsl = "0.4.5-alpha5" -- cgit v1.3.1 From 9a11de6c8c904495d1b6b5a80eac004532f016a0 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Tue, 3 Dec 2024 10:33:52 +0100 Subject: Update kotlin-logging 7.0.0 -> 7.0.3 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index feb6bf3..c9661bf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,7 +32,7 @@ orsl-extension-sdf = { group = "org.openrndr.extra", name = "orsl-extension-sdf" kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.9.0" } kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.7.3" } kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version = "1.7.3" } -kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.0" } +kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.3" } junit = { group = "junit", name = "junit", version = "4.13.2" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.1" } csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version = "1.9.3" } -- cgit v1.3.1 From 146485a43037a8389ea8a93c97d4a96a99b30e60 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Fri, 20 Dec 2024 17:54:44 +0100 Subject: Update to Gradle 8.12 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c8..cea7a79 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.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -- cgit v1.3.1 From 117bdd2cc93a009498b51740c10622146c1111d4 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Sun, 22 Dec 2024 10:20:06 +0100 Subject: Update kotlinx-coroutines-core to 1.10.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c9661bf..8ca6e74 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,7 +29,7 @@ orsl-extension-pbr = { group = "org.openrndr.extra", name = "orsl-extension-pbr" orsl-extension-raymarching = { group = "org.openrndr.extra", name = "orsl-extension-raymarching", version.ref = "orsl" } orsl-extension-sdf = { group = "org.openrndr.extra", name = "orsl-extension-sdf", version.ref = "orsl" } -kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.9.0" } +kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.10.1" } kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.7.3" } kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version = "1.7.3" } kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.3" } -- cgit v1.3.1 From 92f16a0723fadc827aad54dadf7856546bc42107 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Mon, 6 Jan 2025 17:17:21 +0100 Subject: Update kotlinx-serialization to 1.8.0 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8ca6e74..295dbee 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,8 +30,8 @@ orsl-extension-raymarching = { group = "org.openrndr.extra", name = "orsl-extens orsl-extension-sdf = { group = "org.openrndr.extra", name = "orsl-extension-sdf", version.ref = "orsl" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.10.1" } -kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.7.3" } -kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version = "1.7.3" } +kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.8.0" } +kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version = "1.8.0" } kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.3" } junit = { group = "junit", name = "junit", version = "4.13.2" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.1" } -- cgit v1.3.1 From bdd88938f62132fc0293a1a8081c265de80fcad9 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Sat, 1 Feb 2025 09:56:40 +0100 Subject: Upgrade to Gradle 8.12.1, Kotlin 2.1.10, Versions 0.52.0 --- gradle/libs.versions.toml | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 295dbee..37b9023 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "2.1.0" +kotlin = "2.1.10" openrndr = "0.4.5-alpha6" orx = "0.4.5-alpha6" orsl = "0.4.5-alpha5" @@ -42,6 +42,6 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" } runtime = { id = "org.beryx.runtime", version = "1.13.1" } -gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" } -versions = { id = "com.github.ben-manes.versions", version = "0.51.0" } +#gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" } +versions = { id = "com.github.ben-manes.versions", version = "0.52.0" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cea7a79..e18bc25 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.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..f3b75f3 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum -- cgit v1.3.1 From ec0b0f37a97f57a0408b309d9af4b50ece0bd1bf Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Sun, 2 Feb 2025 18:43:28 +0100 Subject: Revert dependency accidentally commented out --- gradle/libs.versions.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 37b9023..efca7ca 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -42,6 +42,5 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" } runtime = { id = "org.beryx.runtime", version = "1.13.1" } -#gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" } +gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" } versions = { id = "com.github.ben-manes.versions", version = "0.52.0" } - -- cgit v1.3.1 From 3cc7bc69570525a64809be191c0e0a03ee675b80 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Tue, 4 Feb 2025 13:11:29 +0100 Subject: Upgrade to openrndr and orx 0.4.5-alpha7 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index efca7ca..5221c89 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "2.1.10" -openrndr = "0.4.5-alpha6" -orx = "0.4.5-alpha6" +openrndr = "0.4.5-alpha7" +orx = "0.4.5-alpha7" orsl = "0.4.5-alpha5" orml = "0.4.1" -- cgit v1.3.1 From 72859b66239ca7c6a071534e9de5001f4e609655 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Sun, 16 Feb 2025 17:51:48 +0800 Subject: Upgrade kotlin-logging to 7.0.4 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5221c89..8a6463f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,7 +32,7 @@ orsl-extension-sdf = { group = "org.openrndr.extra", name = "orsl-extension-sdf" kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.10.1" } kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.8.0" } kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version = "1.8.0" } -kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.3" } +kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.4" } junit = { group = "junit", name = "junit", version = "4.13.2" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.1" } csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version = "1.9.3" } -- cgit v1.3.1 From 8df24b1e9a5a0dcaad197d3f25602e0c6d23ca27 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Wed, 26 Feb 2025 02:07:26 +0100 Subject: Upate to Gradle 8.13, slf4j 2.0.17 --- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8a6463f..abbc3c4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ orx = "0.4.5-alpha7" orsl = "0.4.5-alpha5" orml = "0.4.1" -slf4j = "2.0.16" +slf4j = "2.0.17" log4j = "2.23.1" jackson = "2.17.2" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e18bc25..37f853b 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.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -- cgit v1.3.1 From 4f1c7d09d0b392e2968009e48d8b69358ae135af Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Sun, 9 Mar 2025 20:35:09 +0800 Subject: Upgrade kotlin-logging to 7.0.5 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index abbc3c4..5cf4e6f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,7 +32,7 @@ orsl-extension-sdf = { group = "org.openrndr.extra", name = "orsl-extension-sdf" kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.10.1" } kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.8.0" } kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version = "1.8.0" } -kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.4" } +kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.5" } junit = { group = "junit", name = "junit", version = "4.13.2" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.1" } csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version = "1.9.3" } -- cgit v1.3.1 From 186bc4f54c22af255e23fecdd78d9b915d2f4dce Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Tue, 11 Mar 2025 10:18:21 +0800 Subject: Upgrade to openrndr/orx 0.4.5-alpha8 --- gradle/libs.versions.toml | 4 ++-- src/main/kotlin/TemplateProgram.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5cf4e6f..5dc4225 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "2.1.10" -openrndr = "0.4.5-alpha7" -orx = "0.4.5-alpha7" +openrndr = "0.4.5-alpha8" +orx = "0.4.5-alpha8" orsl = "0.4.5-alpha5" orml = "0.4.1" diff --git a/src/main/kotlin/TemplateProgram.kt b/src/main/kotlin/TemplateProgram.kt index 5d13057..b8e2afe 100644 --- a/src/main/kotlin/TemplateProgram.kt +++ b/src/main/kotlin/TemplateProgram.kt @@ -2,7 +2,7 @@ import org.openrndr.application import org.openrndr.color.ColorRGBa import org.openrndr.draw.loadFont import org.openrndr.draw.loadImage -import org.openrndr.draw.tint +import org.openrndr.extra.color.colormatrix.tint import kotlin.math.cos import kotlin.math.sin -- cgit v1.3.1 From 019b4e8a9bcef655123aea28e184ec74c806b6a9 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Thu, 20 Mar 2025 22:16:28 +0800 Subject: Upgrade to kotlin 2.1.20 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5dc4225..9be730d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "2.1.10" +kotlin = "2.1.20" openrndr = "0.4.5-alpha8" orx = "0.4.5-alpha8" orsl = "0.4.5-alpha5" -- cgit v1.3.1 From e5de9153185f29ac030b569741197328c354dd13 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Thu, 3 Apr 2025 23:51:58 +0800 Subject: Upgrade to kotlin-logging 7.0.6, kotlinx-serialization-core 1.8.1 --- gradle/libs.versions.toml | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9be730d..a767d0b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,10 +4,18 @@ openrndr = "0.4.5-alpha8" orx = "0.4.5-alpha8" orsl = "0.4.5-alpha5" orml = "0.4.1" - slf4j = "2.0.17" log4j = "2.23.1" jackson = "2.17.2" +junit = "4.13.2" +kotlinxCoroutines = "1.10.1" +kotlinxSerialization = "1.8.1" +kotlinLogging = "7.0.6" +kotlinCsvJvm = "1.9.3" +jsoup = "1.17.1" +shadow = "8.1.1" +runtime = "1.13.1" +versions = "0.52.0" [libraries] kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" } @@ -29,18 +37,18 @@ orsl-extension-pbr = { group = "org.openrndr.extra", name = "orsl-extension-pbr" orsl-extension-raymarching = { group = "org.openrndr.extra", name = "orsl-extension-raymarching", version.ref = "orsl" } orsl-extension-sdf = { group = "org.openrndr.extra", name = "orsl-extension-sdf", version.ref = "orsl" } -kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.10.1" } -kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.8.0" } -kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version = "1.8.0" } -kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.5" } -junit = { group = "junit", name = "junit", version = "4.13.2" } -jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.1" } -csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version = "1.9.3" } +kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" } +kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" } +kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinxSerialization" } +kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version.ref = "kotlinLogging" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +jsoup = { group = "org.jsoup", name = "jsoup", version.ref = "jsoup" } +csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version.ref = "kotlinCsvJvm" } [plugins] kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } -shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" } -runtime = { id = "org.beryx.runtime", version = "1.13.1" } +shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" } +runtime = { id = "org.beryx.runtime", version.ref = "runtime" } gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" } -versions = { id = "com.github.ben-manes.versions", version = "0.52.0" } +versions = { id = "com.github.ben-manes.versions", version.ref = "versions" } -- cgit v1.3.1 From cd78681e48ce6028ea3f86870af68ea0e56a7931 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Fri, 11 Apr 2025 11:57:11 +0300 Subject: Upgrade kotlinx.coroutines to 1.10.2 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a767d0b..939ffbc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ slf4j = "2.0.17" log4j = "2.23.1" jackson = "2.17.2" junit = "4.13.2" -kotlinxCoroutines = "1.10.1" +kotlinxCoroutines = "1.10.2" kotlinxSerialization = "1.8.1" kotlinLogging = "7.0.6" kotlinCsvJvm = "1.9.3" -- cgit v1.3.1 From 7b7800bf2bd6c73973716451bac6bd91aaf8ac66 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Tue, 22 Apr 2025 12:10:27 +0200 Subject: Upgrade to openrndr/orx 0.4.5-alpha9, kotlin-logging 7.0.7 --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 939ffbc..4cac43b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "2.1.20" -openrndr = "0.4.5-alpha8" -orx = "0.4.5-alpha8" +openrndr = "0.4.5-alpha9" +orx = "0.4.5-alpha9" orsl = "0.4.5-alpha5" orml = "0.4.1" slf4j = "2.0.17" @@ -10,7 +10,7 @@ jackson = "2.17.2" junit = "4.13.2" kotlinxCoroutines = "1.10.2" kotlinxSerialization = "1.8.1" -kotlinLogging = "7.0.6" +kotlinLogging = "7.0.7" kotlinCsvJvm = "1.9.3" jsoup = "1.17.1" shadow = "8.1.1" -- cgit v1.3.1 From 1391cdfb267930f2058a4113f2bf185c04d1f350 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Fri, 25 Apr 2025 23:55:14 +0300 Subject: Upgrade to Gradle 8.14 --- gradle/wrapper/gradle-wrapper.jar | Bin 43583 -> 43705 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9..9bbc975 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 37f853b..ca025c8 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.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f3b75f3..faf9300 100755 --- a/gradlew +++ b/gradlew @@ -205,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_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. -- cgit v1.3.1 From c970649bf962dc6bc8116f3b10ca14155ee15cf2 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Tue, 13 May 2025 15:16:08 +0300 Subject: Update Kotlin to 2.1.21 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4cac43b..8b27b87 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "2.1.20" +kotlin = "2.1.21" openrndr = "0.4.5-alpha9" orx = "0.4.5-alpha9" orsl = "0.4.5-alpha5" -- cgit v1.3.1 From 1286dfb632ec0b8aa961de56f3313773644f4086 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Thu, 22 May 2025 21:41:10 +0200 Subject: Update Gradle to 8.14.1 --- gradle/wrapper/gradle-wrapper.jar | Bin 43705 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 4 ++-- gradlew.bat | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gradle') diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9bbc975..1b33c55 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 ca025c8..002b867 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.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index faf9300..23d15a9 100755 --- a/gradlew +++ b/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a21..db3a6ac 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%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" %* :end @rem End local scope for the variables with windows NT shell -- cgit v1.3.1 From fd9ad229eebe212806c6be286a57a24a89bdbe2a Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Thu, 5 Jun 2025 17:20:27 +0200 Subject: Update Gradle to 8.14.2 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 002b867..ff23a68 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.14.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -- cgit v1.3.1 From aab829db56fa7f507ffba0145bde63ecaf021379 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Wed, 9 Jul 2025 21:38:54 +0200 Subject: Upgrade to Gradle 8.14.3, Kotlin 2.2.0, kotlinx serialization 1.9.0 --- gradle/libs.versions.toml | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8b27b87..d8dd14a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "2.1.21" +kotlin = "2.2.0" openrndr = "0.4.5-alpha9" orx = "0.4.5-alpha9" orsl = "0.4.5-alpha5" @@ -9,7 +9,7 @@ log4j = "2.23.1" jackson = "2.17.2" junit = "4.13.2" kotlinxCoroutines = "1.10.2" -kotlinxSerialization = "1.8.1" +kotlinxSerialization = "1.9.0" kotlinLogging = "7.0.7" kotlinCsvJvm = "1.9.3" jsoup = "1.17.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ff23a68..d4081da 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.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -- cgit v1.3.1 From 5b0387a46788d6dfd85e4ed6976cfb05b58fd6d6 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Wed, 6 Aug 2025 11:57:54 +0200 Subject: Dependencies: update kotlinLogging to 7.0.11 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d8dd14a..a463ebf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ jackson = "2.17.2" junit = "4.13.2" kotlinxCoroutines = "1.10.2" kotlinxSerialization = "1.9.0" -kotlinLogging = "7.0.7" +kotlinLogging = "7.0.11" kotlinCsvJvm = "1.9.3" jsoup = "1.17.1" shadow = "8.1.1" -- cgit v1.3.1 From 91e9492bb1f0af255b965c953b0b55eac7568f50 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Thu, 21 Aug 2025 00:00:04 +0200 Subject: Update to kotlin 2.2.10, kotlinLogging 7.0.13, shadow 9.0.2 Replace com.github.johnrengelman.shadow with com.gradleup.shadow --- gradle/libs.versions.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a463ebf..e8beac2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "2.2.0" +kotlin = "2.2.10" openrndr = "0.4.5-alpha9" orx = "0.4.5-alpha9" orsl = "0.4.5-alpha5" @@ -10,10 +10,10 @@ jackson = "2.17.2" junit = "4.13.2" kotlinxCoroutines = "1.10.2" kotlinxSerialization = "1.9.0" -kotlinLogging = "7.0.11" +kotlinLogging = "7.0.13" kotlinCsvJvm = "1.9.3" jsoup = "1.17.1" -shadow = "8.1.1" +shadow = "9.0.2" runtime = "1.13.1" versions = "0.52.0" @@ -48,7 +48,7 @@ csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version.ref = [plugins] kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } -shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" } +shadow = { id = "com.gradleup.shadow", version.ref = "shadow" } runtime = { id = "org.beryx.runtime", version.ref = "runtime" } gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" } versions = { id = "com.github.ben-manes.versions", version.ref = "versions" } -- cgit v1.3.1 From 9670a351826e43363e99f3c1117d60f6390ce2f6 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Fri, 22 Aug 2025 14:04:07 +0200 Subject: Update to openrndr and orx 0.4.5-alpha10 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e8beac2..77378e3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "2.2.10" -openrndr = "0.4.5-alpha9" -orx = "0.4.5-alpha9" +openrndr = "0.4.5-alpha10" +orx = "0.4.5-alpha10" orsl = "0.4.5-alpha5" orml = "0.4.1" slf4j = "2.0.17" -- cgit v1.3.1 From 90f1b368e8681f7426d964e3accda816ca089d41 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Fri, 29 Aug 2025 22:58:23 +0200 Subject: Update to gradleup.shadow 9.1.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 77378e3..665ff48 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ kotlinxSerialization = "1.9.0" kotlinLogging = "7.0.13" kotlinCsvJvm = "1.9.3" jsoup = "1.17.1" -shadow = "9.0.2" +shadow = "9.1.0" runtime = "1.13.1" versions = "0.52.0" -- cgit v1.3.1 From 8fbf14946920834e53088b91283aa3cf76de04c4 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Wed, 3 Sep 2025 11:04:20 +0200 Subject: Update to openrndr and orx 0.4.5-alpha11 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 665ff48..cb2c596 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "2.2.10" -openrndr = "0.4.5-alpha10" -orx = "0.4.5-alpha10" +openrndr = "0.4.5-alpha11" +orx = "0.4.5-alpha11" orsl = "0.4.5-alpha5" orml = "0.4.1" slf4j = "2.0.17" -- cgit v1.3.1 From 13e53dbad6784570462aa759c9d292738f698425 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Sat, 6 Sep 2025 13:36:34 +0200 Subject: Upgrade to openrndr/orx 0.4.5 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle') diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cb2c596..5a37ace 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "2.2.10" -openrndr = "0.4.5-alpha11" -orx = "0.4.5-alpha11" +openrndr = "0.4.5" +orx = "0.4.5" orsl = "0.4.5-alpha5" orml = "0.4.1" slf4j = "2.0.17" -- cgit v1.3.1