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(-) (limited to 'gradle/libs.versions.toml') 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(-) (limited to 'gradle/libs.versions.toml') 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 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(-) (limited to 'gradle/libs.versions.toml') 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 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(-) (limited to 'gradle/libs.versions.toml') 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(+) (limited to 'gradle/libs.versions.toml') 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 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(-) (limited to 'gradle/libs.versions.toml') 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(-) (limited to 'gradle/libs.versions.toml') 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 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(-) (limited to 'gradle/libs.versions.toml') 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 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(-) (limited to 'gradle/libs.versions.toml') 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(-) (limited to 'gradle/libs.versions.toml') 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