Browse Source

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.

master
Edwin Jakobs 2 years ago
parent
commit
3b957d53e3
  1. 9
      build.gradle.kts
  2. 1
      gradle.properties
  3. 2
      gradle/wrapper/gradle-wrapper.properties
  4. 8
      settings.gradle.kts

9
build.gradle.kts

@ -11,7 +11,7 @@ val applicationMainClass = "TemplateProgramKt"
/** ## additional ORX features to be added to this project */ /** ## additional ORX features to be added to this project */
val orxFeatures = setOf<String>( val orxFeatures = setOf<String>(
// "orx-boofcv", // "orx-boofcv",
// "orx-camera", "orx-camera",
// "orx-chataigne", // "orx-chataigne",
"orx-color", "orx-color",
"orx-compositor", "orx-compositor",
@ -22,7 +22,7 @@ val orxFeatures = setOf<String>(
"orx-fx", "orx-fx",
// "orx-glslify", // "orx-glslify",
// "orx-gradient-descent", // "orx-gradient-descent",
"orx-git-archiver", // "orx-git-archiver",
"orx-gui", "orx-gui",
"orx-image-fit", "orx-image-fit",
// "orx-integral-image", // "orx-integral-image",
@ -35,7 +35,7 @@ val orxFeatures = setOf<String>(
// "orx-mesh-generators", // "orx-mesh-generators",
// "orx-midi", // "orx-midi",
// "orx-minim", // "orx-minim",
// "orx-no-clear", "orx-no-clear",
"orx-noise", "orx-noise",
// "orx-obj-loader", // "orx-obj-loader",
"orx-olive", "orx-olive",
@ -56,7 +56,8 @@ val orxFeatures = setOf<String>(
// "orx-time-operators", // "orx-time-operators",
// "orx-timer", // "orx-timer",
// "orx-triangulation", // "orx-triangulation",
// "orx-video-profiles", "orx-video-profiles",
"orx-view-box",
) )
/** ## additional ORML features to be added to this project */ /** ## additional ORML features to be added to this project */

1
gradle.properties

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

2
gradle/wrapper/gradle-wrapper.properties

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

8
settings.gradle.kts

@ -9,13 +9,13 @@ dependencyResolutionManagement {
versionCatalogs { versionCatalogs {
create("libs") { create("libs") {
version("kotlin", "1.7.21") version("kotlin", "1.7.21")
version("openrndr", if (openrndrUseSnapshot) "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.1") 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") version("orml", if (ormlUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.1")
plugin("kotlin-jvm", "org.jetbrains.kotlin.jvm").versionRef("kotlin") plugin("kotlin-jvm", "org.jetbrains.kotlin.jvm").versionRef("kotlin")
plugin("shadow", "com.github.johnrengelman.shadow").version("7.1.2") 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") plugin("gitarchive-tomarkdown", "org.openrndr.extra.gitarchiver.tomarkdown").versionRef("orx")
@ -44,7 +44,7 @@ dependencyResolutionManagement {
library("junit", "junit:junit:4.13.2") library("junit", "junit:junit:4.13.2")
library("jsoup", "org.jsoup:jsoup:1.15.3") 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") library("csv", "com.github.doyaaaaaken:kotlin-csv-jvm:1.7.0")
} }
} }

Loading…
Cancel
Save