Compare commits

...

2 Commits

Author SHA1 Message Date
Abe Pazos
34d0087cc3 make jpackageZip work on Linux
Note: using @incubating useFileSystemPermissions()

Note: type = ImageType.DEFAULT not working on Linux, using APP_IMAGE, even if it creates a zip file (?)
2025-08-01 15:06:32 +02:00
Abe Pazos
4ace0c4512 Wip upgrade gradle, kotlinLogging, shadow, jpackage
gradle 9.0.0
kotlinLogging 7.0.10
shadow 8.3.8
jpackage 1.7.3
2025-08-01 10:32:37 +02:00
3 changed files with 62 additions and 36 deletions

View File

@@ -3,6 +3,7 @@ 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.panteleyev.jpackage.ImageType
group = "org.openrndr.template"
version = "1.0.0"
@@ -103,9 +104,10 @@ val applicationLogging = Logging.FULL
@Suppress("DSL_SCOPE_VIOLATION")
plugins {
java
application
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.shadow)
alias(libs.plugins.runtime)
alias(libs.plugins.jpackage)
alias(libs.plugins.gitarchive.tomarkdown).apply(false)
alias(libs.plugins.versions)
alias(libs.plugins.kotlin.serialization)
@@ -197,46 +199,70 @@ tasks {
exclude(dependency("org.bytedeco:.*"))
}
}
named<org.beryx.runtime.JPackageTask>("jpackage") {
}
// ------------------------------------------------------------------------------------------------------------------ //
tasks {
named("jpackage") {
doLast {
val destPath = if (OperatingSystem.current().isMacOsX)
"build/jpackage/openrndr-application.app/Contents/Resources/data"
val destPath = "build/jpackage/" + if (OperatingSystem.current().isMacOsX)
"openrndr-application.app/Contents/Resources/data"
else
"build/jpackage/openrndr-application/data"
"openrndr-application/data"
copy {
from("data") {
include("**/*")
}
from("data") { include("**/*") }
into(destPath)
}
}
}
}
// ------------------------------------------------------------------------------------------------------------------ //
tasks.register<Zip>("jpackageZip") {
register<Zip>("jpackageZip") {
archiveFileName = "openrndr-application.zip"
from("${layout.buildDirectory.get()}/jpackage") {
include("**/*")
}
isPreserveFileTimestamps = true
isReproducibleFileOrder = true
useFileSystemPermissions()
dependsOn("jpackage")
}
}
tasks.findByName("jpackageZip")?.dependsOn("jpackage")
// ------------------------------------------------------------------------------------------------------------------ //
runtime {
jpackage {
imageName = "openrndr-application"
skipInstaller = true
if (OperatingSystem.current().isMacOsX) {
jvmArgs.add("-XstartOnFirstThread")
jvmArgs.add("-Duser.dir=${"$"}APPDIR/../Resources")
tasks.register("copyDependencies", Copy::class) {
from(configurations.runtimeClasspath).into(layout.buildDirectory.dir("jars"))
}
tasks.register("copyJar", Copy::class) {
from(tasks.jar).into(layout.buildDirectory.dir("jars"))
}
options = listOf("--strip-debug", "--compress", "1", "--no-header-files", "--no-man-pages")
modules = listOf("jdk.unsupported", "java.management", "java.desktop")
tasks.jpackage {
dependsOn("build", "copyDependencies", "copyJar")
appName = "openrndr-application"
mac {
javaOptions = listOf(
"-XstartOnFirstThread",
$$"-Duser.dir=$APPDIR/../Resources"
)
}
windows {
}
linux {
type = ImageType.APP_IMAGE
}
input = layout.buildDirectory.dir("jars")
destination = layout.buildDirectory.dir("jpackage")
mainJar = tasks.jar.get().archiveFileName.get()
mainClass = applicationMainClass
addModules = listOf("jdk.unsupported", "java.management", "java.desktop")
jLinkOptions = listOf("--strip-debug", "--compress", "1", "--no-header-files", "--no-man-pages")
}
// ------------------------------------------------------------------------------------------------------------------ //

View File

@@ -10,11 +10,11 @@ jackson = "2.17.2"
junit = "4.13.2"
kotlinxCoroutines = "1.10.2"
kotlinxSerialization = "1.9.0"
kotlinLogging = "7.0.7"
kotlinLogging = "7.0.10"
kotlinCsvJvm = "1.9.3"
jsoup = "1.17.1"
shadow = "8.1.1"
runtime = "1.13.1"
shadow = "8.3.8"
jpackage = "1.7.3"
versions = "0.52.0"
[libraries]
@@ -48,7 +48,7 @@ csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version.ref =
[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.ref = "shadow" }
runtime = { id = "org.beryx.runtime", version.ref = "runtime" }
shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
jpackage = { id = "org.panteleyev.jpackageplugin", version.ref = "jpackage"}
gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" }
versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }

View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME