Update jpackage task

Author: lilvadim

.github/workflows/gradle_package.yml

@@ -5,15 +5,15 @@
 # This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
 # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
 
-name: Package Distribution with Gradle
+name: Package Distribution Artifacts
 
 on:
   workflow_dispatch:
     inputs:
       version:
         description: "Version"
         required: false
-        default: SNAPSHOT
+        default: 1.0.0-SNAPSHOT
 
 permissions:
   contents: read
@@ -23,9 +23,9 @@ jobs:
     strategy:
       matrix:
         configuration: [
-          { runner: "macos-13", task: "jpackageMac", path: "build/dist/*" },
-          { runner: "macos-14", task: "jpackageMac", path: "build/dist/*" },
-          { runner: "windows-2022", task: "jpackageWin", path: "build/dist/*" }
+          { runner: "macos-13", path: "build/dist/*" },
+          { runner: "macos-14", path: "build/dist/*" },
+          { runner: "windows-2022", path: "build/dist/*" }
         ]
     runs-on: ${{ matrix.configuration.runner }}
     steps:
@@ -39,7 +39,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Package app with Gradle
-        run: ./gradlew ${{ matrix.configuration.task }}
+        run: ./gradlew jpackage
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:

.github/workflows/release.yml

@@ -1,3 +1,5 @@
+name: Release on Tag
+
 on:
   push:
     tags:
@@ -22,9 +24,9 @@ jobs:
     strategy:
       matrix:
         configuration: [
-          { runner: "macos-13", task: "jpackageMac", path: "build/dist" },
-          { runner: "macos-14", task: "jpackageMac", path: "build/dist" },
-          { runner: "windows-2022", task: "jpackageWin", path: "build/dist" }
+          { runner: "macos-13", path: "build/dist" },
+          { runner: "macos-14", path: "build/dist" },
+          { runner: "windows-2022", path: "build/dist" }
         ]
     runs-on: ${{ matrix.configuration.runner }}
     steps:
@@ -38,7 +40,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Package app with Gradle
-        run: ./gradlew ${{ matrix.configuration.task }} -Pversion="${{ github.ref_name }}"
+        run: ./gradlew jpackage -Pversion="${{ github.ref_name }}"
       - name: Upload Asset
         shell: bash
         run: |

build.gradle

@@ -1,6 +1,3 @@
-import io.github.fvarrui.javapackager.gradle.PackageTask
-import io.github.fvarrui.javapackager.model.SetupMode
-import io.github.fvarrui.javapackager.model.WindowsExeCreationTool
 import org.gradle.internal.jvm.Jvm
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -10,9 +7,6 @@ buildscript {
     repositories {
         mavenCentral()
     }
-    dependencies {
-        classpath "io.github.fvarrui:javapackager:1.7.6"
-    }
 }
 
 plugins {
@@ -23,8 +17,6 @@ plugins {
     id "org.jetbrains.dokka" version "2.0.0"
 }
 
-apply plugin: 'io.github.fvarrui.javapackager.plugin'
-
 group 'ru.nucodelabs'
 
 java {
@@ -198,52 +190,10 @@ test {
     finalizedBy cleanRunDir
 }
 
-javapackager {
-    mainClass = application.mainClass
-    bundleJre = true
-    organizationName = "NucodeLabs"
-    name = "GEM"
-    applicationName = "GEM"
-    version = project.version
-    vmArgs = ["-Djava.library.path=."] + moduleExportsJvmArgs
-    administratorRequired = false
-    additionalResources = [
-            file("lib/${System.mapLibraryName("MathVES_JNI")}"),
-            file("lib/${System.mapLibraryName("MathVES")}")
-    ]
-}
+/* jpackage */
 
-tasks.register('packageWindowsExe', PackageTask) {
-    dependsOn build
-    generateInstaller = false
-    winConfig {
-        generateSetup = false
-        generateMsi = false
-        exeCreationTool = WindowsExeCreationTool.launch4j
-        icoFile = file("src/main/resources/img/gem.ico")
-        setupMode = SetupMode.askTheUser
-        removeOldLibs = true
-        disableDirPage = false
-        disableFinishedPage = false
-        disableWelcomePage = false
-        createDesktopIconTask = false
-    }
-    finalizedBy distClr
-}
-
-tasks.register('packageLinuxApplication', PackageTask) {
-    dependsOn build
-    generateInstaller = true
-    linuxConfig {
-        generateDeb = true
-        generateRpm = true
-        wrapJar = true
-        pngFile = file("src/main/resources/img/gem.png")
-    }
-    finalizedBy distClr
-}
+def jpackageInputDir = layout.buildDirectory.dir("jars").get().asFile.absolutePath
 
-def jpackageInputDir = layout.buildDirectory.dir("jars")
 tasks.register("copyNativeDependencies", Copy) {
     from file("$projectDir/lib/${System.mapLibraryName("MathVES_JNI")}"),
             file("$projectDir/lib/${System.mapLibraryName("MathVES")}")
@@ -264,23 +214,24 @@ final Map<String, String> jpackageCommonOptions = [
         "APP_NAME"    : "GEM",
         "APP_VERSION" : project.version.toString().replaceAll(/[^0-9.]/, ""),
         "DEST"        : layout.buildDirectory.dir("dist").get().asFile.absolutePath,
-        "INPUT"       : layout.buildDirectory.dir("jars").get().asFile.absolutePath,
+        "INPUT"       : jpackageInputDir,
         "MAIN_CLASS"  : application.mainClass.get(),
         "MAIN_JAR"    : tasks.jar.archiveFileName.get(),
-        "APP_CONTENT" : file("src/main/resources").absolutePath,
-        "RESOURCE_DIR": file("package").absolutePath
+        "APP_CONTENT" : file("$projectDir/src/main/resources").absolutePath,
+        "RESOURCE_DIR": file("$projectDir/package_resources").absolutePath
 ]
 
-tasks.register("jpackageMac", Exec) {
+tasks.register("jpackage", Exec) {
     dependsOn "build", "copyJar", "copyDependencies", "copyNativeDependencies"
     workingDir = projectDir
-    commandLine "bash", "jpackage_mac.sh"
     environment(jpackageCommonOptions)
-}
 
-tasks.register("jpackageWin", Exec) {
-    dependsOn "build", "copyJar", "copyDependencies", "copyNativeDependencies"
-    workingDir = projectDir
-    commandLine "cmd", "/c", "jpackage_win.bat"
-    environment(jpackageCommonOptions)
-}
+    def os = DefaultNativePlatform.currentOperatingSystem
+    if (os.isMacOsX()) {
+        commandLine "bash", "jpackage_mac.sh"
+    } else if (os.isWindows()) {
+        commandLine "cmd", "/c", "jpackage_win.bat"
+    } else {
+        throw new StopActionException("Platform is not supported: ${os}")
+    }
+}