From 6ca525341e2456b1ea584a6575f9b21006156147 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Sun, 6 Mar 2022 08:25:01 +0100 Subject: [PATCH] Upgrade to shadow plugin 7.1.2, slf4j 1.7.36, jackson 2.13.1 --- build.gradle.kts | 4 ++-- settings.gradle.kts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index cc768c2..f53bf8f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -204,8 +204,8 @@ class Openrndr { val orxVersion = libs.versions.orx.get() val ormlVersion = libs.versions.orml.get() - // choices are "orx-tensorflow-gpu", "orx-tensorflow-mkl", "orx-tensorflow" - val orxTensorflowBackend = "orx-tensorflow-mkl" + // choices are "orx-tensorflow-gpu", "orx-tensorflow" + val orxTensorflowBackend = "orx-tensorflow" val os = if (project.hasProperty("targetPlatform")) { val supportedPlatforms = setOf("windows", "macos", "linux-x64", "linux-arm64") diff --git a/settings.gradle.kts b/settings.gradle.kts index a69f5a4..edcd187 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,18 +14,18 @@ dependencyResolutionManagement { version("orml", if (ormlUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.0") plugin("kotlin-jvm", "org.jetbrains.kotlin.jvm").version("1.6.10") - plugin("shadow", "com.github.johnrengelman.shadow").version("7.1.0") + plugin("shadow", "com.github.johnrengelman.shadow").version("7.1.2") plugin("runtime", "org.beryx.runtime").version("1.12.7") plugin("gitarchive-tomarkdown", "org.openrndr.extra.gitarchiver.tomarkdown").versionRef("orx") library("kotlin-script-runtime", "org.jetbrains.kotlin", "kotlin-script-runtime").versionRef("kotlin") - version("slf4j", "1.7.32") + version("slf4j", "1.7.36") library("slf4j-nop", "org.sl4j", "slf4j-nop").versionRef("slf4j") library("slf4j-simple", "org.sl4j", "slf4j-simple").versionRef("slf4j") - version("jackson", "2.11.1") + version("jackson", "2.13.1") library("jackson-databind", "com.fasterxml.jackson.core", "jackson-databind").versionRef("jackson") library("jackson-json", "com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml").versionRef("jackson")