From 71bb6c61c7ffdd5feca47b8168289a25d1b8c341 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Sat, 19 Mar 2022 07:49:58 +0100 Subject: Upgrade to Gradle 7.4.1, OPENRNDR 0.4.0-rc.7, ORX 0.4.0-rc.8, Jackson 2.13.2. Add orx-minim --- build.gradle.kts | 1 + gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f53bf8f..0ad8df2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,6 +35,7 @@ val orxFeatures = setOf( // "orx-kotlin-parser", // "orx-mesh-generators", // "orx-midi", +// "orx-minim", // "orx-no-clear", "orx-noise", // "orx-obj-loader", diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb87..00e33ed 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index edcd187..32cc277 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,8 +9,8 @@ dependencyResolutionManagement { versionCatalogs { create("libs") { version("kotlin", "1.6.10") - version("openrndr", if (openrndrUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.0-rc.6") - version("orx", if (orxUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.0-rc.7") + 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("orml", if (ormlUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.0") plugin("kotlin-jvm", "org.jetbrains.kotlin.jvm").version("1.6.10") @@ -25,7 +25,7 @@ dependencyResolutionManagement { library("slf4j-nop", "org.sl4j", "slf4j-nop").versionRef("slf4j") library("slf4j-simple", "org.sl4j", "slf4j-simple").versionRef("slf4j") - version("jackson", "2.13.1") + version("jackson", "2.13.2") library("jackson-databind", "com.fasterxml.jackson.core", "jackson-databind").versionRef("jackson") library("jackson-json", "com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml").versionRef("jackson") -- cgit v1.3.1