From 15fb5393e76164abd67912449ad973a8c48bba84 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Mon, 15 Jan 2024 14:15:29 +0100 Subject: Add ORSL dependencies --- build.gradle.kts | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index 4819ef2..b057833 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -114,6 +114,17 @@ dependencies { // implementation(libs.gson) // implementation(libs.csv) + /* ORSL dependencies */ + +// implementation(libs.orsl.shader.generator) +// implementation(libs.orsl.extension.color) +// implementation(libs.orsl.extension.easing) +// implementation(libs.orsl.extension.gradient) +// implementation(libs.orsl.extension.noise) +// implementation(libs.orsl.extension.pbr) +// implementation(libs.orsl.extension.raymarching) +// implementation(libs.orsl.extension.sdf) + implementation(libs.kotlinx.coroutines.core) implementation(libs.slf4j.api) implementation(libs.kotlin.logging) -- cgit v1.3.1 From cf4ebfc490c2cd182c7da7be366170f61f11227a Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Mon, 18 Mar 2024 13:07:33 +0100 Subject: add new orx'es to build.gradle.kts --- build.gradle.kts | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index b057833..f2087fb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,6 +14,7 @@ val orxFeatures = setOf( "orx-camera", // "orx-chataigne", "orx-color", + "orx-composition", "orx-compositor", // "orx-compute-graph", // "orx-compute-graph-nodes", @@ -22,6 +23,8 @@ val orxFeatures = setOf( // "orx-easing", "orx-envelopes", // "orx-expression-evaluator", +// "orx-fcurve", +// "orx-fft", // "orx-file-watcher", "orx-fx", // "orx-git-archiver", @@ -57,9 +60,11 @@ val orxFeatures = setOf( "orx-shade-styles", // "orx-shader-phrases", "orx-shapes", + "orx-svg", // "orx-syphon", // "orx-temporal-blur", // "orx-tensorflow", +// "orx-text-writer", // "orx-time-operators", // "orx-timer", // "orx-triangulation", -- cgit v1.3.1 From dec0b36aafbbe7ef892bec9b1c0c6624827d99ca Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Sat, 23 Mar 2024 10:33:53 +0100 Subject: Upgrade Gradle to 8.7, disable orx-svg, orx-composition as they are not yet available in 0.4.5alpha2 --- build.gradle.kts | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew.bat | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index f2087fb..f4925f7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,7 @@ val orxFeatures = setOf( "orx-camera", // "orx-chataigne", "orx-color", - "orx-composition", +//// "orx-composition", "orx-compositor", // "orx-compute-graph", // "orx-compute-graph-nodes", @@ -60,7 +60,7 @@ val orxFeatures = setOf( "orx-shade-styles", // "orx-shader-phrases", "orx-shapes", - "orx-svg", +//// "orx-svg", // "orx-syphon", // "orx-temporal-blur", // "orx-tensorflow", diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22c..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail -- cgit v1.3.1 From 5b2634fdd1f1d6eb82f93ae1fbe7533db6bd1b71 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Wed, 24 Apr 2024 08:35:35 +0200 Subject: Update to 0.4.5-alpha3, remove openrndr-svg Add orx-svg and orx-composition --- build.gradle.kts | 5 ++--- gradle/libs.versions.toml | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index f4925f7..83e1a2f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,7 @@ val orxFeatures = setOf( "orx-camera", // "orx-chataigne", "orx-color", -//// "orx-composition", +// "orx-composition", "orx-compositor", // "orx-compute-graph", // "orx-compute-graph-nodes", @@ -60,7 +60,7 @@ val orxFeatures = setOf( "orx-shade-styles", // "orx-shader-phrases", "orx-shapes", -//// "orx-svg", +// "orx-svg", // "orx-syphon", // "orx-temporal-blur", // "orx-tensorflow", @@ -302,7 +302,6 @@ class Openrndr { implementation(openrndr("openal")) runtimeOnly(openrndrNatives("openal")) implementation(openrndr("application")) - implementation(openrndr("svg")) implementation(openrndr("animatable")) implementation(openrndr("extensions")) implementation(openrndr("filter")) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8835d9b..bfae9f8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] kotlin = "1.9.23" -openrndr = "0.4.5-alpha2" -orx = "0.4.5-alpha2" -orsl = "0.4.5-alpha2" +openrndr = "0.4.5-alpha3" +orx = "0.4.5-alpha3" +orsl = "0.4.5-alpha3" orml = "0.4.1" slf4j = "2.0.13" -- cgit v1.3.1 From df784c99c16a62aa718590427ed5a67dfa855fda Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Mon, 27 May 2024 22:42:21 +0200 Subject: Update to Kotlin 2.0.0 --- build.gradle.kts | 7 +++++++ gradle/libs.versions.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index 83e1a2f..8b6a2d9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.internal.os.OperatingSystem import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform +import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile group = "org.openrndr.template" @@ -158,6 +159,12 @@ java { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } +kotlin { + compilerOptions { + languageVersion.set(KotlinVersion.KOTLIN_2_0) + apiVersion.set(KotlinVersion.KOTLIN_2_0) + } +} tasks.withType { kotlinOptions.jvmTarget = "11" } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f904a40..4b6f1b9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "1.9.24" +kotlin = "2.0.0" openrndr = "0.4.5-alpha3" orx = "0.4.5-alpha3" orsl = "0.4.5-alpha3" -- cgit v1.3.1 From 3cdf6ea7804c08c2749eec48fe16da4a7eb872c5 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Sat, 1 Jun 2024 07:55:38 +0200 Subject: Upgrade to JDK 17 --- build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index 8b6a2d9..8421b86 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -156,8 +156,8 @@ dependencies { // ------------------------------------------------------------------------------------------------------------------ // java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { compilerOptions { @@ -166,7 +166,7 @@ kotlin { } } tasks.withType { - kotlinOptions.jvmTarget = "11" + kotlinOptions.jvmTarget = "17" } // ------------------------------------------------------------------------------------------------------------------ // -- cgit v1.3.1 From 440d67654d546a9acab4b681495d453a6a937286 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Tue, 30 Jul 2024 17:19:55 +0200 Subject: Solve `kotlinOptions` deprecation warning --- build.gradle.kts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index 8421b86..1704a2c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.internal.os.OperatingSystem import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinVersion -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile group = "org.openrndr.template" version = "1.0.0" @@ -163,11 +163,9 @@ kotlin { compilerOptions { languageVersion.set(KotlinVersion.KOTLIN_2_0) apiVersion.set(KotlinVersion.KOTLIN_2_0) + jvmTarget.set(JvmTarget.JVM_17) } } -tasks.withType { - kotlinOptions.jvmTarget = "17" -} // ------------------------------------------------------------------------------------------------------------------ // -- cgit v1.3.1 From e4dfb4aaed81b38100f5ca6aac06e1c482e75a78 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Mon, 11 Nov 2024 14:31:46 +0100 Subject: Replace gson with kotlinx.serialization --- build.gradle.kts | 4 +++- gradle/libs.versions.toml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index 1704a2c..ba9ce0a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -107,6 +107,7 @@ plugins { alias(libs.plugins.runtime) alias(libs.plugins.gitarchive.tomarkdown).apply(false) alias(libs.plugins.versions) + alias(libs.plugins.kotlin.serialization) } repositories { @@ -117,7 +118,6 @@ repositories { dependencies { // implementation(libs.jsoup) -// implementation(libs.gson) // implementation(libs.csv) /* ORSL dependencies */ @@ -132,6 +132,8 @@ dependencies { // implementation(libs.orsl.extension.sdf) implementation(libs.kotlinx.coroutines.core) + implementation(libs.kotlinx.serialization.core) + implementation(libs.kotlinx.serialization.json) implementation(libs.slf4j.api) implementation(libs.kotlin.logging) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 356e1e7..6b26b7f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,14 +30,16 @@ orsl-extension-raymarching = { group = "org.openrndr.extra", name = "orsl-extens orsl-extension-sdf = { group = "org.openrndr.extra", name = "orsl-extension-sdf", version.ref = "orsl" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.9.0" } +kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.7.3" } +kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version = "1.7.3" } kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.0" } junit = { group = "junit", name = "junit", version = "4.13.2" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.1" } -gson = { group = "com.google.code.gson", name = "gson", version = "2.10.1" } csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version = "1.9.3" } [plugins] kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" } runtime = { id = "org.beryx.runtime", version = "1.13.1" } gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" } -- cgit v1.3.1 From 4d65172d939d0de018e02492bba34b00febd224d Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Mon, 11 Nov 2024 14:32:38 +0100 Subject: Upgrade .set() syntax to `=` in Gradle --- build.gradle.kts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index ba9ce0a..9cfe718 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -163,9 +163,9 @@ java { } kotlin { compilerOptions { - languageVersion.set(KotlinVersion.KOTLIN_2_0) - apiVersion.set(KotlinVersion.KOTLIN_2_0) - jvmTarget.set(JvmTarget.JVM_17) + languageVersion = KotlinVersion.KOTLIN_2_0 + apiVersion = KotlinVersion.KOTLIN_2_0 + jvmTarget = JvmTarget.JVM_17 } } @@ -175,7 +175,7 @@ project.setProperty("mainClassName", applicationMainClass) application { if (hasProperty("openrndr.application")) { - mainClass.set("${property("openrndr.application")}") + mainClass = "${property("openrndr.application")}" } } @@ -214,7 +214,7 @@ tasks { // ------------------------------------------------------------------------------------------------------------------ // tasks.register("jpackageZip") { - archiveFileName.set("openrndr-application.zip") + archiveFileName = "openrndr-application.zip" from("${layout.buildDirectory.get()}/jpackage") { include("**/*") } @@ -232,14 +232,14 @@ runtime { jvmArgs.add("-Duser.dir=${"$"}APPDIR/../Resources") } } - options.set(listOf("--strip-debug", "--compress", "1", "--no-header-files", "--no-man-pages")) - modules.set(listOf("jdk.unsupported", "java.management", "java.desktop")) + options = listOf("--strip-debug", "--compress", "1", "--no-header-files", "--no-man-pages") + modules = listOf("jdk.unsupported", "java.management", "java.desktop") } // ------------------------------------------------------------------------------------------------------------------ // tasks.register("gitArchiveToMarkDown") { - historySize.set(20) + historySize = 20 } // ------------------------------------------------------------------------------------------------------------------ // -- cgit v1.3.1 From 9e08c6cfb6a1483e6e30ae4c022ac7d4d2d2f41f Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Thu, 21 Nov 2024 11:18:38 +0100 Subject: Fix #53 - ffmpeg warnings after shadowJar --- build.gradle.kts | 1 + 1 file changed, 1 insertion(+) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index 9cfe718..d330e31 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -192,6 +192,7 @@ tasks { exclude(dependency("org.apache.logging.log4j:log4j-slf4j2-impl:.*")) exclude(dependency("com.fasterxml.jackson.core:jackson-databind:.*")) exclude(dependency("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:.*")) + exclude(dependency("org.bytedeco:.*")) } } named("jpackage") { -- cgit v1.3.1 From 5ff7884bd590a56aa3db1c0abe5be622b91a186e Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Sun, 2 Feb 2025 18:53:14 +0100 Subject: Add orx-math Note: not in any ORX alpha release at the time of writing, only available when building your own orx SNAPSHOT. --- build.gradle.kts | 1 + 1 file changed, 1 insertion(+) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index d330e31..f2f9a33 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,6 +41,7 @@ val orxFeatures = setOf( // "orx-kinect-v1", // "orx-kotlin-parser", // "orx-marching-squares", +// "orx-math", // "orx-mesh-generators", // "orx-midi", // "orx-minim", -- cgit v1.3.1 From cd5a98322b56784cf9f95f55deff1ef012ec525c Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Fri, 2 May 2025 19:02:48 +0300 Subject: Fix deprecation warnings --- build.gradle.kts | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index f2f9a33..a756617 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -142,9 +142,11 @@ dependencies { Logging.NONE -> { runtimeOnly(libs.slf4j.nop) } + Logging.SIMPLE -> { runtimeOnly(libs.slf4j.simple) } + Logging.FULL -> { runtimeOnly(libs.log4j.slf4j2) runtimeOnly(libs.log4j.core) @@ -172,12 +174,11 @@ kotlin { // ------------------------------------------------------------------------------------------------------------------ // -project.setProperty("mainClassName", applicationMainClass) - application { - if (hasProperty("openrndr.application")) { - mainClass = "${property("openrndr.application")}" - } + mainClass = if (hasProperty("openrndr.application")) + "${property("openrndr.application")}" + else + applicationMainClass } tasks { @@ -198,7 +199,7 @@ tasks { } named("jpackage") { doLast { - val destPath = if(OperatingSystem.current().isMacOsX) + val destPath = if (OperatingSystem.current().isMacOsX) "build/jpackage/openrndr-application.app/Contents/Resources/data" else "build/jpackage/openrndr-application/data" @@ -290,11 +291,13 @@ class Openrndr { "aarch64", "arm-v8" -> "macos-arm64" else -> "macos" } + currOs.isLinux -> when (currArch) { "x86-64" -> "linux-x64" "aarch64" -> "linux-arm64" else -> throw IllegalArgumentException("architecture not supported: $currArch") } + else -> throw IllegalArgumentException("os not supported: ${currOs.name}") } @@ -331,25 +334,26 @@ class Openrndr { } } } + val openrndr = Openrndr() if (properties["openrndr.tasks"] == "true") { - task("create executable jar for $applicationMainClass") { + tasks.register("create executable jar for $applicationMainClass") { group = " \uD83E\uDD8C OPENRNDR" dependsOn("shadowJar") } - task("run $applicationMainClass") { + tasks.register("run $applicationMainClass") { group = " \uD83E\uDD8C OPENRNDR" dependsOn("run") } - task("create standalone executable for $applicationMainClass") { + tasks.register("create standalone executable for $applicationMainClass") { group = " \uD83E\uDD8C OPENRNDR" dependsOn("jpackageZip") } - task("add IDE file scopes") { + tasks.register("add IDE file scopes") { group = " \uD83E\uDD8C OPENRNDR" val scopesFolder = File("${project.projectDir}/.idea/scopes") scopesFolder.mkdirs() -- cgit v1.3.1 From 3ed7c18932ff3a58190be9bb16e06ca86762305a Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Wed, 3 Sep 2025 11:11:35 +0200 Subject: build.gradle.kts: add orx-axidraw, reformatting --- build.gradle.kts | 46 ++++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 26 deletions(-) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index a756617..0124af9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,6 +11,7 @@ val applicationMainClass = "TemplateProgramKt" /** ## additional ORX features to be added to this project */ val orxFeatures = setOf( +// "orx-axidraw", // "orx-boofcv", "orx-camera", // "orx-chataigne", @@ -139,14 +140,8 @@ dependencies { implementation(libs.kotlin.logging) when (applicationLogging) { - Logging.NONE -> { - runtimeOnly(libs.slf4j.nop) - } - - Logging.SIMPLE -> { - runtimeOnly(libs.slf4j.simple) - } - + Logging.NONE -> runtimeOnly(libs.slf4j.nop) + Logging.SIMPLE -> runtimeOnly(libs.slf4j.simple) Logging.FULL -> { runtimeOnly(libs.log4j.slf4j2) runtimeOnly(libs.log4j.core) @@ -197,6 +192,11 @@ tasks { exclude(dependency("org.bytedeco:.*")) } } +} + +// ------------------------------------------------------------------------------------------------------------------ // + +tasks { named("jpackage") { doLast { val destPath = if (OperatingSystem.current().isMacOsX) @@ -205,26 +205,20 @@ tasks { "build/jpackage/openrndr-application/data" copy { - from("data") { - include("**/*") - } + from("data") { include("**/*") } into(destPath) } } } -} - -// ------------------------------------------------------------------------------------------------------------------ // -tasks.register("jpackageZip") { - archiveFileName = "openrndr-application.zip" - from("${layout.buildDirectory.get()}/jpackage") { - include("**/*") + register("jpackageZip") { + archiveFileName = "openrndr-application.zip" + from("${layout.buildDirectory.get()}/jpackage") { + include("**/*") + } + dependsOn("jpackage") } } -tasks.findByName("jpackageZip")?.dependsOn("jpackage") - -// ------------------------------------------------------------------------------------------------------------------ // runtime { jpackage { @@ -241,8 +235,10 @@ runtime { // ------------------------------------------------------------------------------------------------------------------ // -tasks.register("gitArchiveToMarkDown") { - historySize = 20 +tasks { + register("gitArchiveToMarkDown") { + historySize = 20 + } } // ------------------------------------------------------------------------------------------------------------------ // @@ -253,9 +249,7 @@ tasks { val nonStableKeywords = listOf("alpha", "beta", "rc") - fun isNonStable( - version: String - ) = nonStableKeywords.any { + fun isNonStable(version: String) = nonStableKeywords.any { version.lowercase().contains(it) } -- cgit v1.3.1