cailean/openrndr-template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix deprecation warnings

Browse Source
This commit is contained in:
Abe Pazos
2025-05-02 19:02:48 +03:00
parent fef8e76e52
commit cd5a98322b
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
build.gradle.kts
View File

@@ -142,9 +142,11 @@ dependencies {
Logging.NONE -> { Logging.NONE -> {
runtimeOnly(libs.slf4j.nop) runtimeOnly(libs.slf4j.nop)
} }
Logging.SIMPLE -> { Logging.SIMPLE -> {
runtimeOnly(libs.slf4j.simple) runtimeOnly(libs.slf4j.simple)
} }
Logging.FULL -> { Logging.FULL -> {
runtimeOnly(libs.log4j.slf4j2) runtimeOnly(libs.log4j.slf4j2)
runtimeOnly(libs.log4j.core) runtimeOnly(libs.log4j.core)
@@ -172,12 +174,11 @@ kotlin {
// ------------------------------------------------------------------------------------------------------------------ // // ------------------------------------------------------------------------------------------------------------------ //
project.setProperty("mainClassName", applicationMainClass)
application { application {
if (hasProperty("openrndr.application")) { mainClass = if (hasProperty("openrndr.application"))
mainClass = "${property("openrndr.application")}" "${property("openrndr.application")}"
} else
applicationMainClass
} }
tasks { tasks {
@@ -198,7 +199,7 @@ tasks {
} }
named<org.beryx.runtime.JPackageTask>("jpackage") { named<org.beryx.runtime.JPackageTask>("jpackage") {
doLast { doLast {
val destPath = if(OperatingSystem.current().isMacOsX) val destPath = if (OperatingSystem.current().isMacOsX)
"build/jpackage/openrndr-application.app/Contents/Resources/data" "build/jpackage/openrndr-application.app/Contents/Resources/data"
else else
"build/jpackage/openrndr-application/data" "build/jpackage/openrndr-application/data"
@@ -290,11 +291,13 @@ class Openrndr {
"aarch64", "arm-v8" -> "macos-arm64" "aarch64", "arm-v8" -> "macos-arm64"
else -> "macos" else -> "macos"
} }
currOs.isLinux -> when (currArch) { currOs.isLinux -> when (currArch) {
"x86-64" -> "linux-x64" "x86-64" -> "linux-x64"
"aarch64" -> "linux-arm64" "aarch64" -> "linux-arm64"
else -> throw IllegalArgumentException("architecture not supported: $currArch") else -> throw IllegalArgumentException("architecture not supported: $currArch")
} }
else -> throw IllegalArgumentException("os not supported: ${currOs.name}") else -> throw IllegalArgumentException("os not supported: ${currOs.name}")
} }
@@ -331,25 +334,26 @@ class Openrndr {
} }
} }
} }
val openrndr = Openrndr() val openrndr = Openrndr()
if (properties["openrndr.tasks"] == "true") { if (properties["openrndr.tasks"] == "true") {
task("create executable jar for $applicationMainClass") { tasks.register("create executable jar for $applicationMainClass") {
group = " \uD83E\uDD8C OPENRNDR" group = " \uD83E\uDD8C OPENRNDR"
dependsOn("shadowJar") dependsOn("shadowJar")
} }
task("run $applicationMainClass") { tasks.register("run $applicationMainClass") {
group = " \uD83E\uDD8C OPENRNDR" group = " \uD83E\uDD8C OPENRNDR"
dependsOn("run") dependsOn("run")
} }
task("create standalone executable for $applicationMainClass") { tasks.register("create standalone executable for $applicationMainClass") {
group = " \uD83E\uDD8C OPENRNDR" group = " \uD83E\uDD8C OPENRNDR"
dependsOn("jpackageZip") dependsOn("jpackageZip")
} }
task("add IDE file scopes") { tasks.register("add IDE file scopes") {
group = " \uD83E\uDD8C OPENRNDR" group = " \uD83E\uDD8C OPENRNDR"
val scopesFolder = File("${project.projectDir}/.idea/scopes") val scopesFolder = File("${project.projectDir}/.idea/scopes")
scopesFolder.mkdirs() scopesFolder.mkdirs()