From a02d3fc44f82f8dd84e5f04285071882d0470f3e Mon Sep 17 00:00:00 2001
From: Edwin Jakobs <edwin@rndr.studio>
Date: Sat, 20 Nov 2021 21:18:56 +0100
Subject: [PATCH] Upgrade to Kotlin 1.6.0, Gradle 7.3

---
 build.gradle.kts                         | 6 +++---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 src/main/kotlin/TemplateLiveProgram.kt   | 2 +-
 src/main/kotlin/TemplateProgram.kt       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6bbac8e..8d054cb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -121,11 +121,11 @@ enum class Logging {
 /*  What type of logging should this project use? */
 val applicationLogging = Logging.FULL
 
-val kotlinVersion = "1.5.21"
+val kotlinVersion = "1.6.0"
 
 plugins {
     java
-    kotlin("jvm") version("1.5.21")
+    kotlin("jvm") version("1.6.0")
     id("com.github.johnrengelman.shadow") version ("6.1.0")
     id("org.beryx.runtime") version ("1.11.4")
 }
@@ -173,7 +173,7 @@ dependencies {
     implementation(openrndr("animatable"))
     implementation(openrndr("extensions"))
     implementation(openrndr("filter"))
-    implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.5.0")
+    implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.5.2")
     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 05679dc..e750102 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.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/TemplateLiveProgram.kt b/src/main/kotlin/TemplateLiveProgram.kt
index 24625d3..314bc54 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.
  */
 
-suspend fun main() = application {
+fun main() = application {
     configure {
         width = 800
         height = 800
diff --git a/src/main/kotlin/TemplateProgram.kt b/src/main/kotlin/TemplateProgram.kt
index aebcb63..5d13057 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
 
-suspend fun main() = application {
+fun main() = application {
     configure {
         width = 768
         height = 576