From 3b957d53e38f39d2fb3644cef9425ff3434791c4 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Mon, 23 Jan 2023 08:37:19 +0100 Subject: [PATCH] Upgrade OPENRNDR to 0.4.2-rc.3, runtime to 1.13.0, gson to 2.10.1. Enable gradle configuration cache. Change default orx features. --- build.gradle.kts | 9 +++++---- gradle.properties | 3 ++- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 8 ++++---- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7a8a3f6..e7da148 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ val applicationMainClass = "TemplateProgramKt" /** ## additional ORX features to be added to this project */ val orxFeatures = setOf( // "orx-boofcv", -// "orx-camera", + "orx-camera", // "orx-chataigne", "orx-color", "orx-compositor", @@ -22,7 +22,7 @@ val orxFeatures = setOf( "orx-fx", // "orx-glslify", // "orx-gradient-descent", - "orx-git-archiver", +// "orx-git-archiver", "orx-gui", "orx-image-fit", // "orx-integral-image", @@ -35,7 +35,7 @@ val orxFeatures = setOf( // "orx-mesh-generators", // "orx-midi", // "orx-minim", -// "orx-no-clear", + "orx-no-clear", "orx-noise", // "orx-obj-loader", "orx-olive", @@ -56,7 +56,8 @@ val orxFeatures = setOf( // "orx-time-operators", // "orx-timer", // "orx-triangulation", -// "orx-video-profiles", + "orx-video-profiles", + "orx-view-box", ) /** ## additional ORML features to be added to this project */ diff --git a/gradle.properties b/gradle.properties index 29e08e8..2253c62 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,2 @@ -kotlin.code.style=official \ No newline at end of file +kotlin.code.style=official +org.gradle.unsafe.configuration-cache=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..070cb70 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.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index 58ca5aa..c5a22f8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,13 +9,13 @@ dependencyResolutionManagement { versionCatalogs { create("libs") { version("kotlin", "1.7.21") - version("openrndr", if (openrndrUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.1") - version("orx", if (orxUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.1") + 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("orml", if (ormlUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.1") plugin("kotlin-jvm", "org.jetbrains.kotlin.jvm").versionRef("kotlin") plugin("shadow", "com.github.johnrengelman.shadow").version("7.1.2") - plugin("runtime", "org.beryx.runtime").version("1.12.7") + plugin("runtime", "org.beryx.runtime").version("1.13.0") plugin("gitarchive-tomarkdown", "org.openrndr.extra.gitarchiver.tomarkdown").versionRef("orx") @@ -44,7 +44,7 @@ dependencyResolutionManagement { library("junit", "junit:junit:4.13.2") library("jsoup", "org.jsoup:jsoup:1.15.3") - library("gson", "com.google.code.gson:gson:2.9.1") + library("gson", "com.google.code.gson:gson:2.10.1") library("csv", "com.github.doyaaaaaken:kotlin-csv-jvm:1.7.0") } }