From f5d9accd71e6478642ff79b4ae512d1c17386d14 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Fri, 8 Jul 2022 22:19:51 +0200 Subject: Upgrade to OPENRNDR 0.4.0, ORX 0.4.0, Kotlin 1.6.21, Jackson 2.13.3, log4j 2.18.0 --- README.md | 2 +- settings.gradle.kts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d0fb1d3..8e1009d 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ You will find some [basic instructions](https://guide.openrndr.org/#/02_Getting_ - `jpackageZip` creates a zip with a stand-alone executable for the current platform (works with Java 14 only) ## Cross builds -To create runnable jars for a platform different from the platform you use to build one uses `./gradlew jar --PtargetPlatform=`. The supported platforms are `windows`, `macos`, `linux-x64` and `linux-arm64`. Note that the `linux-arm64` platform will only work with OPENRNDR snapshot builds from master and OPENRNDR 0.3.39 (a future version). +To create runnable jars for a platform different from the platform you use to build one uses `./gradlew jar --PtargetPlatform=`. The supported platforms are `windows`, `macos`, `linux-x64` and `linux-arm64`. ## Github Actions diff --git a/settings.gradle.kts b/settings.gradle.kts index 32cc277..c710adc 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,12 +8,12 @@ val ormlUseSnapshot = true dependencyResolutionManagement { versionCatalogs { create("libs") { - version("kotlin", "1.6.10") - version("openrndr", if (openrndrUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.0-rc.7") - version("orx", if (orxUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.0-rc.8") + version("kotlin", "1.6.21") + version("openrndr", if (openrndrUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.0") + version("orx", if (orxUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.0-1") version("orml", if (ormlUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.0") - plugin("kotlin-jvm", "org.jetbrains.kotlin.jvm").version("1.6.10") + plugin("kotlin-jvm", "org.jetbrains.kotlin.jvm").version("1.6.21") plugin("shadow", "com.github.johnrengelman.shadow").version("7.1.2") plugin("runtime", "org.beryx.runtime").version("1.12.7") @@ -25,11 +25,11 @@ dependencyResolutionManagement { library("slf4j-nop", "org.sl4j", "slf4j-nop").versionRef("slf4j") library("slf4j-simple", "org.sl4j", "slf4j-simple").versionRef("slf4j") - version("jackson", "2.13.2") + version("jackson", "2.13.3") library("jackson-databind", "com.fasterxml.jackson.core", "jackson-databind").versionRef("jackson") library("jackson-json", "com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml").versionRef("jackson") - version("log4j", "2.17.2") + version("log4j", "2.18.0") library("log4j-slf4j", "org.apache.logging.log4j", "log4j-slf4j-impl").versionRef("log4j") version("kotlinx-coroutines", "1.6.0") -- cgit v1.3.1