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.

This commit is contained in:
Edwin Jakobs
2023-01-23 08:37:19 +01:00
parent 4631eced38
commit 3b957d53e3
4 changed files with 12 additions and 10 deletions

View File

@@ -11,7 +11,7 @@ val applicationMainClass = "TemplateProgramKt"
/** ## additional ORX features to be added to this project */
val orxFeatures = setOf<String>(
// "orx-boofcv",
// "orx-camera",
"orx-camera",
// "orx-chataigne",
"orx-color",
"orx-compositor",
@@ -22,7 +22,7 @@ val orxFeatures = setOf<String>(
"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<String>(
// "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<String>(
// "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 */

View File

@@ -1 +1,2 @@
kotlin.code.style=official
kotlin.code.style=official
org.gradle.unsafe.configuration-cache=true

View File

@@ -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

View File

@@ -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")
}
}