diff options
| author | vechro <vechro@vech.ro> | 2022-08-12 12:28:10 +0300 |
|---|---|---|
| committer | Edwin Jakobs <edwin@rndr.studio> | 2022-08-12 11:58:29 +0200 |
| commit | fd6333e2642f990a3c19b84d650d2c8830abc463 (patch) | |
| tree | 61114abb3e457c5f1e756ef7a57027e7dc26e962 | |
| parent | 787d0ab67348f9e4242acdd5751db2d0d2f62519 (diff) | |
| download | art-playground-openrndr-fd6333e2642f990a3c19b84d650d2c8830abc463.tar.gz art-playground-openrndr-fd6333e2642f990a3c19b84d650d2c8830abc463.zip | |
Use Kotlin 1.7.10 and target JVM 11
| -rw-r--r-- | build.gradle.kts | 22 | ||||
| -rw-r--r-- | settings.gradle.kts | 4 |
2 files changed, 14 insertions, 12 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index 0ad8df2..ebaf6d4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.internal.os.OperatingSystem -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform -import org.jetbrains.kotlin.utils.addToStdlib.ifTrue +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile group = "org.openrndr.template" version = "0.4.0" @@ -10,7 +9,7 @@ version = "0.4.0" val applicationMainClass = "TemplateProgramKt" /** ## additional ORX features to be added to this project */ -val orxFeatures = setOf( +val orxFeatures = setOf<String>( // "orx-boofcv", // "orx-camera", // "orx-chataigne", @@ -58,8 +57,7 @@ val orxFeatures = setOf( // "orx-timer", // "orx-triangulation", // "orx-video-profiles", - null -).filterNotNull() +) /** ## additional ORML features to be added to this project */ val ormlFeatures = setOf<String>( @@ -71,7 +69,7 @@ val ormlFeatures = setOf<String>( // "orml-ssd", // "orml-style-transfer", // "orml-super-resolution", -// "orml-u2net" +// "orml-u2net", ) /** ## additional OPENRNDR features to be added to this project */ @@ -86,6 +84,7 @@ val applicationLogging = Logging.FULL // ------------------------------------------------------------------------------------------------------------------ // +@Suppress("DSL_SCOPE_VIOLATION") plugins { java alias(libs.plugins.kotlin.jvm) @@ -126,11 +125,12 @@ dependencies { // ------------------------------------------------------------------------------------------------------------------ // -configure<JavaPluginConvention> { - sourceCompatibility = JavaVersion.VERSION_1_8 +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } tasks.withType<KotlinCompile> { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "11" } // ------------------------------------------------------------------------------------------------------------------ // @@ -238,7 +238,9 @@ class Openrndr { init { repositories { - listOf(openrndrVersion, orxVersion, ormlVersion).any { it.contains("SNAPSHOT") }.ifTrue { mavenLocal() } + if (listOf(openrndrVersion, orxVersion, ormlVersion).any { "SNAPSHOT" in it }) { + mavenLocal() + } maven(url = "https://maven.openrndr.org") } dependencies { diff --git a/settings.gradle.kts b/settings.gradle.kts index e21755a..ef109c8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,12 +8,12 @@ val ormlUseSnapshot = true dependencyResolutionManagement { versionCatalogs { create("libs") { - version("kotlin", "1.6.21") + version("kotlin", "1.7.10") version("openrndr", if (openrndrUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.0") version("orx", if (orxUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.0-1") version("orml", if (ormlUseSnapshot) "0.5.1-SNAPSHOT" else "0.4.0") - plugin("kotlin-jvm", "org.jetbrains.kotlin.jvm").version("1.6.21") + plugin("kotlin-jvm", "org.jetbrains.kotlin.jvm").versionRef("kotlin") plugin("shadow", "com.github.johnrengelman.shadow").version("7.1.2") plugin("runtime", "org.beryx.runtime").version("1.12.7") |