Wip upgrade gradle, kotlinLogging, shadow, jpackage
gradle 9.0.0 kotlinLogging 7.0.10 shadow 8.3.8 jpackage 1.7.3
This commit is contained in:
@@ -103,9 +103,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,7 +198,12 @@ 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"
|
||||
@@ -216,13 +222,14 @@ tasks {
|
||||
|
||||
// ------------------------------------------------------------------------------------------------------------------ //
|
||||
|
||||
tasks.register<Zip>("jpackageZip") {
|
||||
archiveFileName = "openrndr-application.zip"
|
||||
from("${layout.buildDirectory.get()}/jpackage") {
|
||||
include("**/*")
|
||||
register<Zip>("jpackageZip") {
|
||||
archiveFileName = "openrndr-application.zip"
|
||||
from("${layout.buildDirectory.get()}/jpackage") {
|
||||
include("**/*")
|
||||
}
|
||||
dependsOn("jpackage")
|
||||
}
|
||||
}
|
||||
tasks.findByName("jpackageZip")?.dependsOn("jpackage")
|
||||
|
||||
// ------------------------------------------------------------------------------------------------------------------ //
|
||||
|
||||
@@ -232,7 +239,7 @@ runtime {
|
||||
skipInstaller = true
|
||||
if (OperatingSystem.current().isMacOsX) {
|
||||
jvmArgs.add("-XstartOnFirstThread")
|
||||
jvmArgs.add("-Duser.dir=${"$"}APPDIR/../Resources")
|
||||
jvmArgs.add($$"-Duser.dir=$APPDIR/../Resources")
|
||||
}
|
||||
}
|
||||
options = listOf("--strip-debug", "--compress", "1", "--no-header-files", "--no-man-pages")
|
||||
|
||||
@@ -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" }
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user