aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdwin Jakobs <edwin@rndr.studio>2023-01-27 09:09:58 +0100
committerEdwin Jakobs <edwin@rndr.studio>2023-01-27 09:09:58 +0100
commitcb6aa04f918ec8306f9376b9257cf9c394fa3256 (patch)
tree986bdb3cd984092860c488ec8212800f032fad92
parent091115f49a5e88d9a854bb8ac7fe13e7c2d5b8de (diff)
downloadart-playground-openrndr-cb6aa04f918ec8306f9376b9257cf9c394fa3256.tar.gz
art-playground-openrndr-cb6aa04f918ec8306f9376b9257cf9c394fa3256.zip
Upgrade to openrndr 0.4.2, kotlin 1.8, slf4j 2.0.6, kotlin-logging 3.0.4
Diffstat (limited to '')
-rw-r--r--build.gradle.kts3
-rw-r--r--settings.gradle.kts13
2 files changed, 9 insertions, 7 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index 365c45c..44645ea 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -116,7 +116,8 @@ dependencies {
runtimeOnly(libs.slf4j.simple)
}
Logging.FULL -> {
- runtimeOnly(libs.log4j.slf4j)
+ runtimeOnly(libs.log4j.slf4j2)
+ runtimeOnly(libs.log4j.core)
runtimeOnly(libs.jackson.databind)
runtimeOnly(libs.jackson.json)
}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c5a22f8..f2c9406 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -8,9 +8,9 @@ val ormlUseSnapshot = true
dependencyResolutionManagement {
versionCatalogs {
create("libs") {
- version("kotlin", "1.7.21")
- version("openrndr", if (openrndrUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.2-rc.3")
- version("orx", if (orxUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.2-rc.3")
+ version("kotlin", "1.8.0")
+ version("openrndr", if (openrndrUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.2")
+ version("orx", if (orxUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.2")
version("orml", if (ormlUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.1")
plugin("kotlin-jvm", "org.jetbrains.kotlin.jvm").versionRef("kotlin")
@@ -21,7 +21,7 @@ dependencyResolutionManagement {
library("kotlin-script-runtime", "org.jetbrains.kotlin", "kotlin-script-runtime").versionRef("kotlin")
- version("slf4j", "1.7.36")
+ version("slf4j", "2.0.6")
library("slf4j-api", "org.slf4j", "slf4j-api").versionRef("slf4j")
library("slf4j-nop", "org.slf4j", "slf4j-nop").versionRef("slf4j")
library("slf4j-simple", "org.slf4j", "slf4j-simple").versionRef("slf4j")
@@ -31,7 +31,8 @@ dependencyResolutionManagement {
library("jackson-json", "com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml").versionRef("jackson")
version("log4j", "2.19.0")
- library("log4j-slf4j", "org.apache.logging.log4j", "log4j-slf4j-impl").versionRef("log4j")
+ library("log4j-slf4j2", "org.apache.logging.log4j", "log4j-slf4j2-impl").versionRef("log4j")
+ library("log4j-core", "org.apache.logging.log4j", "log4j-core").versionRef("log4j")
version("kotlinx-coroutines", "1.6.4")
library(
@@ -40,7 +41,7 @@ dependencyResolutionManagement {
"kotlinx-coroutines-core"
).versionRef("kotlinx-coroutines")
- library("kotlin-logging", "io.github.microutils:kotlin-logging-jvm:2.1.23")
+ library("kotlin-logging", "io.github.microutils:kotlin-logging-jvm:3.0.4")
library("junit", "junit:junit:4.13.2")
library("jsoup", "org.jsoup:jsoup:1.15.3")