Browse Source

Upgrade to Gradle 7.0.2, OPENRNDR/ORX 0.3.58, Kotlin 1.5.0

master
Edwin Jakobs 4 years ago
parent
commit
d103e206d2
  1. 14
      build.gradle.kts
  2. 2
      gradle/wrapper/gradle-wrapper.properties

14
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 */ /* the name of this project, default is the template version but you are free to change these */
group = "org.openrndr.template" group = "org.openrndr.template"
version = "0.3.17" version = "0.3.18"
val applicationMainClass = "TemplateProgramKt" val applicationMainClass = "TemplateProgramKt"
@ -79,10 +79,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.46" val openrndrVersion = if (openrndrUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.58"
val orxUseSnapshot = false val orxUseSnapshot = false
val orxVersion = if (orxUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.56" val orxVersion = if (orxUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.58"
val ormlUseSnapshot = false val ormlUseSnapshot = false
val ormlVersion = if (ormlUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.0-rc.5" val ormlVersion = if (ormlUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.0-rc.5"
@ -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.4.32" val kotlinVersion = "1.5.0"
plugins { plugins {
java java
kotlin("jvm") version("1.4.32") kotlin("jvm") version("1.5.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")
} }
@ -174,8 +174,8 @@ dependencies {
implementation(openrndr("extensions")) implementation(openrndr("extensions"))
implementation(openrndr("filter")) implementation(openrndr("filter"))
implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.4.2") implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.5.0-RC")
implementation("io.github.microutils", "kotlin-logging-jvm","2.0.4") implementation("io.github.microutils", "kotlin-logging-jvm","2.0.6")
when(applicationLogging) { when(applicationLogging) {
Logging.NONE -> { Logging.NONE -> {

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

Loading…
Cancel
Save