aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdwin Jakobs <edwin@rndr.studio>2021-07-22 16:26:58 +0200
committerEdwin Jakobs <edwin@rndr.studio>2021-07-22 16:26:58 +0200
commitdf1782f3172cc57e6d1f24ee44c18d81be9332df (patch)
tree1b8f82d03a93900fb278ac44fe005ac4ee0d2281
parentd103e206d2976ae8d4b2003a4e4ad8cbd5a0d55c (diff)
downloadart-playground-openrndr-df1782f3172cc57e6d1f24ee44c18d81be9332df.tar.gz
art-playground-openrndr-df1782f3172cc57e6d1f24ee44c18d81be9332df.zip
Prepare template for OPENRNDR 0.4
-rw-r--r--README.md4
-rw-r--r--build.gradle.kts23
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
-rw-r--r--src/main/kotlin/TemplateLiveProgram.kt2
-rw-r--r--src/main/kotlin/TemplateProgram.kt2
5 files changed, 18 insertions, 15 deletions
diff --git a/README.md b/README.md
index b8c168d..fa05376 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,8 @@
# OPENRNDR template project
+
+Attention: you are using a template for OPENRNDR 0.4, which is currently not been released yet. This template assumes
+that you have build and published `OPENRNDR-0.5.1-SNAPSHOT` and `ORX-0.5.1-SNAPSHOT` to your local maven repository.
+
A feature rich template for creating OPENRNDR programs based on Gradle/Kts
The template consists of a configuration for Gradle and an example OPENRNDR program. The Gradle configuration should serve as the
diff --git a/build.gradle.kts b/build.gradle.kts
index 2867d91..6bbac8e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
/* the name of this project, default is the template version but you are free to change these */
group = "org.openrndr.template"
-version = "0.3.18"
+version = "0.4.0"
val applicationMainClass = "TemplateProgramKt"
@@ -78,14 +78,14 @@ val openrndrFeatures = setOf(
)
/* Which version of OPENRNDR and ORX should be used? */
-val openrndrUseSnapshot = false
-val openrndrVersion = if (openrndrUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.58"
+val openrndrUseSnapshot = true
+val openrndrVersion = if (openrndrUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.0"
-val orxUseSnapshot = false
-val orxVersion = if (orxUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.58"
+val orxUseSnapshot = true
+val orxVersion = if (orxUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.0"
-val ormlUseSnapshot = false
-val ormlVersion = if (ormlUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.0-rc.5"
+val ormlUseSnapshot = true
+val ormlVersion = if (ormlUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.0"
// choices are "orx-tensorflow-gpu", "orx-tensorflow-mkl", "orx-tensorflow"
val orxTensorflowBackend = "orx-tensorflow-mkl"
@@ -121,11 +121,11 @@ enum class Logging {
/* What type of logging should this project use? */
val applicationLogging = Logging.FULL
-val kotlinVersion = "1.5.0"
+val kotlinVersion = "1.5.21"
plugins {
java
- kotlin("jvm") version("1.5.0")
+ kotlin("jvm") version("1.5.21")
id("com.github.johnrengelman.shadow") version ("6.1.0")
id("org.beryx.runtime") version ("1.11.4")
}
@@ -168,13 +168,12 @@ dependencies {
runtimeOnly(openrndrNatives("gl3"))
implementation(openrndr("openal"))
runtimeOnly(openrndrNatives("openal"))
- implementation(openrndr("core"))
+ implementation(openrndr("application"))
implementation(openrndr("svg"))
implementation(openrndr("animatable"))
implementation(openrndr("extensions"))
implementation(openrndr("filter"))
-
- implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.5.0-RC")
+ implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.5.0")
implementation("io.github.microutils", "kotlin-logging-jvm","2.0.6")
when(applicationLogging) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0f80bbf..05679dc 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.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/TemplateLiveProgram.kt b/src/main/kotlin/TemplateLiveProgram.kt
index 314bc54..24625d3 100644
--- a/src/main/kotlin/TemplateLiveProgram.kt
+++ b/src/main/kotlin/TemplateLiveProgram.kt
@@ -9,7 +9,7 @@ import org.openrndr.extra.olive.oliveProgram
* oliveProgram {} can be changed while the program is running.
*/
-fun main() = application {
+suspend fun main() = application {
configure {
width = 800
height = 800
diff --git a/src/main/kotlin/TemplateProgram.kt b/src/main/kotlin/TemplateProgram.kt
index 5d13057..aebcb63 100644
--- a/src/main/kotlin/TemplateProgram.kt
+++ b/src/main/kotlin/TemplateProgram.kt
@@ -6,7 +6,7 @@ import org.openrndr.draw.tint
import kotlin.math.cos
import kotlin.math.sin
-fun main() = application {
+suspend fun main() = application {
configure {
width = 768
height = 576