Compare commits
2 Commits
master
...
wipGradle9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
34d0087cc3 | ||
|
|
4ace0c4512 |
@@ -3,6 +3,7 @@ import org.gradle.internal.os.OperatingSystem
|
|||||||
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
|
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
|
||||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
|
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
|
||||||
|
import org.panteleyev.jpackage.ImageType
|
||||||
|
|
||||||
group = "org.openrndr.template"
|
group = "org.openrndr.template"
|
||||||
version = "1.0.0"
|
version = "1.0.0"
|
||||||
@@ -103,9 +104,10 @@ val applicationLogging = Logging.FULL
|
|||||||
@Suppress("DSL_SCOPE_VIOLATION")
|
@Suppress("DSL_SCOPE_VIOLATION")
|
||||||
plugins {
|
plugins {
|
||||||
java
|
java
|
||||||
|
application
|
||||||
alias(libs.plugins.kotlin.jvm)
|
alias(libs.plugins.kotlin.jvm)
|
||||||
alias(libs.plugins.shadow)
|
alias(libs.plugins.shadow)
|
||||||
alias(libs.plugins.runtime)
|
alias(libs.plugins.jpackage)
|
||||||
alias(libs.plugins.gitarchive.tomarkdown).apply(false)
|
alias(libs.plugins.gitarchive.tomarkdown).apply(false)
|
||||||
alias(libs.plugins.versions)
|
alias(libs.plugins.versions)
|
||||||
alias(libs.plugins.kotlin.serialization)
|
alias(libs.plugins.kotlin.serialization)
|
||||||
@@ -197,46 +199,70 @@ tasks {
|
|||||||
exclude(dependency("org.bytedeco:.*"))
|
exclude(dependency("org.bytedeco:.*"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
named<org.beryx.runtime.JPackageTask>("jpackage") {
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------------------------------------------------------------ //
|
||||||
|
|
||||||
|
tasks {
|
||||||
|
named("jpackage") {
|
||||||
doLast {
|
doLast {
|
||||||
val destPath = if (OperatingSystem.current().isMacOsX)
|
val destPath = "build/jpackage/" + if (OperatingSystem.current().isMacOsX)
|
||||||
"build/jpackage/openrndr-application.app/Contents/Resources/data"
|
"openrndr-application.app/Contents/Resources/data"
|
||||||
else
|
else
|
||||||
"build/jpackage/openrndr-application/data"
|
"openrndr-application/data"
|
||||||
|
|
||||||
copy {
|
copy {
|
||||||
from("data") {
|
from("data") { include("**/*") }
|
||||||
include("**/*")
|
|
||||||
}
|
|
||||||
into(destPath)
|
into(destPath)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------------------------ //
|
register<Zip>("jpackageZip") {
|
||||||
|
archiveFileName = "openrndr-application.zip"
|
||||||
tasks.register<Zip>("jpackageZip") {
|
from("${layout.buildDirectory.get()}/jpackage") {
|
||||||
archiveFileName = "openrndr-application.zip"
|
include("**/*")
|
||||||
from("${layout.buildDirectory.get()}/jpackage") {
|
|
||||||
include("**/*")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
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")
|
|
||||||
}
|
}
|
||||||
|
isPreserveFileTimestamps = true
|
||||||
|
isReproducibleFileOrder = true
|
||||||
|
useFileSystemPermissions()
|
||||||
|
dependsOn("jpackage")
|
||||||
}
|
}
|
||||||
options = listOf("--strip-debug", "--compress", "1", "--no-header-files", "--no-man-pages")
|
}
|
||||||
modules = listOf("jdk.unsupported", "java.management", "java.desktop")
|
|
||||||
|
// ------------------------------------------------------------------------------------------------------------------ //
|
||||||
|
|
||||||
|
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"))
|
||||||
|
}
|
||||||
|
|
||||||
|
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")
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------------------------ //
|
// ------------------------------------------------------------------------------------------------------------------ //
|
||||||
|
|||||||
@@ -10,11 +10,11 @@ jackson = "2.17.2"
|
|||||||
junit = "4.13.2"
|
junit = "4.13.2"
|
||||||
kotlinxCoroutines = "1.10.2"
|
kotlinxCoroutines = "1.10.2"
|
||||||
kotlinxSerialization = "1.9.0"
|
kotlinxSerialization = "1.9.0"
|
||||||
kotlinLogging = "7.0.7"
|
kotlinLogging = "7.0.10"
|
||||||
kotlinCsvJvm = "1.9.3"
|
kotlinCsvJvm = "1.9.3"
|
||||||
jsoup = "1.17.1"
|
jsoup = "1.17.1"
|
||||||
shadow = "8.1.1"
|
shadow = "8.3.8"
|
||||||
runtime = "1.13.1"
|
jpackage = "1.7.3"
|
||||||
versions = "0.52.0"
|
versions = "0.52.0"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
@@ -48,7 +48,7 @@ csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version.ref =
|
|||||||
[plugins]
|
[plugins]
|
||||||
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
|
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
|
||||||
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
|
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
|
||||||
shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
|
shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
|
||||||
runtime = { id = "org.beryx.runtime", version.ref = "runtime" }
|
jpackage = { id = "org.panteleyev.jpackageplugin", version.ref = "jpackage"}
|
||||||
gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" }
|
gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" }
|
||||||
versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
|
versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
|
||||||
|
|||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
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
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
Reference in New Issue
Block a user