Browse Source

Upgrade to Kotlin 1.6.0, Gradle 7.3

master
Edwin Jakobs 3 years ago
parent
commit
a02d3fc44f
  1. 6
      build.gradle.kts
  2. 2
      gradle/wrapper/gradle-wrapper.properties
  3. 2
      src/main/kotlin/TemplateLiveProgram.kt
  4. 2
      src/main/kotlin/TemplateProgram.kt

6
build.gradle.kts

@ -121,11 +121,11 @@ enum class Logging {
/* What type of logging should this project use? */ /* What type of logging should this project use? */
val applicationLogging = Logging.FULL val applicationLogging = Logging.FULL
val kotlinVersion = "1.5.21" val kotlinVersion = "1.6.0"
plugins { plugins {
java java
kotlin("jvm") version("1.5.21") kotlin("jvm") version("1.6.0")
id("com.github.johnrengelman.shadow") version ("6.1.0") id("com.github.johnrengelman.shadow") version ("6.1.0")
id("org.beryx.runtime") version ("1.11.4") id("org.beryx.runtime") version ("1.11.4")
} }
@ -173,7 +173,7 @@ dependencies {
implementation(openrndr("animatable")) implementation(openrndr("animatable"))
implementation(openrndr("extensions")) implementation(openrndr("extensions"))
implementation(openrndr("filter")) 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") implementation("io.github.microutils", "kotlin-logging-jvm","2.0.6")
when(applicationLogging) { when(applicationLogging) {

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.1.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
src/main/kotlin/TemplateLiveProgram.kt

@ -9,7 +9,7 @@ import org.openrndr.extra.olive.oliveProgram
* oliveProgram {} can be changed while the program is running. * oliveProgram {} can be changed while the program is running.
*/ */
suspend fun main() = application { fun main() = application {
configure { configure {
width = 800 width = 800
height = 800 height = 800

2
src/main/kotlin/TemplateProgram.kt

@ -6,7 +6,7 @@ import org.openrndr.draw.tint
import kotlin.math.cos import kotlin.math.cos
import kotlin.math.sin import kotlin.math.sin
suspend fun main() = application { fun main() = application {
configure { configure {
width = 768 width = 768
height = 576 height = 576

Loading…
Cancel
Save