cailean/openrndr-template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepare for OPENRNDR 0.3.43

Browse Source
This commit is contained in:
Edwin Jakobs
2020-07-06 15:07:34 +02:00
parent 88782c614f
commit 55eff802c5
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
build.gradle.kts
View File

@@ -13,7 +13,9 @@ val applicationMainClass = "TemplateProgramKt"
val orxFeatures = setOf( val orxFeatures = setOf(
// "orx-boofcv", // "orx-boofcv",
// "orx-camera", // "orx-camera",
// "orx-chataigne",
"orx-compositor", "orx-compositor",
// "orx-dnk3"
// "orx-easing", // "orx-easing",
// "orx-file-watcher", // "orx-file-watcher",
// "orx-parameters", // "orx-parameters",
@@ -21,11 +23,11 @@ val orxFeatures = setOf(
"orx-fx", "orx-fx",
// "orx-glslify", // "orx-glslify",
// "orx-gradient-descent", // "orx-gradient-descent",
"orx-gui",
"orx-image-fit",
// "orx-integral-image", // "orx-integral-image",
// "orx-interval-tree", // "orx-interval-tree",
// "orx-jumpflood", // "orx-jumpflood",
"orx-gui",
"orx-image-fit",
// "orx-kdtree", // "orx-kdtree",
// "orx-mesh-generators", // "orx-mesh-generators",
// "orx-midi", // "orx-midi",
@@ -36,14 +38,16 @@ val orxFeatures = setOf(
// "orx-osc", // "orx-osc",
// "orx-palette", // "orx-palette",
// "orx-poisson-fill", // "orx-poisson-fill",
// "orx-rabbit-control
// "orx-runway", // "orx-runway",
// "orx-shader-phrases",
"orx-shade-styles", "orx-shade-styles",
// "orx-shader-phrases",
// "orx-shapes", // "orx-shapes",
// "orx-syphon", // "orx-syphon",
// "orx-temporal-blur", // "orx-temporal-blur",
// "orx-time-operators, // "orx-time-operators,
// "orx-kinect-v1", // "orx-kinect-v1",
"orx-panel" "orx-panel"
) )
@@ -54,10 +58,10 @@ val openrndrFeatures = setOf(
/* Which version of OPENRNDR and ORX should be used? */ /* Which version of OPENRNDR and ORX should be used? */
val openrndrUseSnapshot = false val openrndrUseSnapshot = false
val openrndrVersion = if (openrndrUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.42" val openrndrVersion = if (openrndrUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.43-rc.15"
val orxUseSnapshot = false val orxUseSnapshot = false
val orxVersion = if (orxUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.51" val orxVersion = if (orxUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.52-rc.6"
//<editor-fold desc="This is code for OPENRNDR, no need to edit this .. most of the times"> //<editor-fold desc="This is code for OPENRNDR, no need to edit this .. most of the times">
val supportedPlatforms = setOf("windows", "macos", "linux-x64", "linux-arm64") val supportedPlatforms = setOf("windows", "macos", "linux-x64", "linux-arm64")
@@ -95,8 +99,8 @@ val kotlinVersion = "1.3.72"
plugins { plugins {
java java
kotlin("jvm") version("1.3.72") kotlin("jvm") version("1.3.72")
id("com.github.johnrengelman.shadow") version ("5.2.0") id("com.github.johnrengelman.shadow") version ("6.0.0")
id("org.beryx.runtime") version ("1.8.1") id("org.beryx.runtime") version ("1.9.1")
} }
repositories { repositories {
@@ -139,8 +143,8 @@ dependencies {
implementation(openrndr("extensions")) implementation(openrndr("extensions"))
implementation(openrndr("filter")) implementation(openrndr("filter"))
implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.3.6") implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.3.7")
implementation("io.github.microutils", "kotlin-logging","1.7.9") implementation("io.github.microutils", "kotlin-logging","1.7.10")
when(applicationLogging) { when(applicationLogging) {
Logging.NONE -> { Logging.NONE -> {
@@ -150,9 +154,9 @@ dependencies {
runtimeOnly("org.slf4j","slf4j-simple","1.7.30") runtimeOnly("org.slf4j","slf4j-simple","1.7.30")
} }
Logging.FULL -> { Logging.FULL -> {
runtimeOnly("org.apache.logging.log4j", "log4j-slf4j-impl", "2.13.1") runtimeOnly("org.apache.logging.log4j", "log4j-slf4j-impl", "2.13.3")
runtimeOnly("com.fasterxml.jackson.core", "jackson-databind", "2.10.3") runtimeOnly("com.fasterxml.jackson.core", "jackson-databind", "2.11.1")
runtimeOnly("com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml", "2.10.3") runtimeOnly("com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml", "2.11.1")
} }
} }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
#Thu Aug 01 12:32:31 CEST 2019 #Thu Aug 01 12:32:31 CEST 2019
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists