From d80bcfe970ea6cadfc32578efc612659496d79c9 Mon Sep 17 00:00:00 2001 From: Dario Ghunney Ware Date: Mon, 7 Jul 2025 14:37:35 +0100 Subject: [PATCH] Jpackage Input Path Fix (#3892) Corrected input path for jpackage plugin --- ## Checklist ### General - [x] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md) - [x] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/DeveloperGuide.md) (if applicable) - [x] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/HowToAddNewLanguage.md) (if applicable) - [x] I have performed a self-review of my own code - [x] My changes generate no new warnings ### Documentation - [x] I have updated relevant docs on [Stirling-PDF's doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/) (if functionality has heavily changed) - [x] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only) ### UI Changes (if applicable) - [ ] Screenshots or videos demonstrating the UI changes are attached (e.g., as comments or direct attachments in the PR) ### Testing (if applicable) - [ ] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/DeveloperGuide.md#6-testing) for more details. --- build.gradle | 36 +++--------------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/build.gradle b/build.gradle index ae5b877d7..728da9231 100644 --- a/build.gradle +++ b/build.gradle @@ -43,36 +43,6 @@ bootJar { enabled = false } -sourceSets { - main { - java { - if (System.getenv('DOCKER_ENABLE_SECURITY') == 'false' || System.getenv('DISABLE_ADDITIONAL_FEATURES') == 'true' - || (project.hasProperty('DISABLE_ADDITIONAL_FEATURES') - && System.getProperty('DISABLE_ADDITIONAL_FEATURES') == 'true')) { - exclude 'stirling/software/proprietary/security/**' - } - if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') { - exclude 'stirling/software/SPDF/UI/impl/**' - } - - } - } - - test { - java { - if (System.getenv('DOCKER_ENABLE_SECURITY') == 'false' || System.getenv('DISABLE_ADDITIONAL_FEATURES') == 'true' - || (project.hasProperty('DISABLE_ADDITIONAL_FEATURES') - && System.getProperty('DISABLE_ADDITIONAL_FEATURES') == 'true')) { - exclude 'stirling/software/proprietary/security/**' - } - - if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') { - exclude 'stirling/software/SPDF/UI/impl/**' - } - } - } -} - allprojects { group = 'stirling.software' version = '1.0.0' @@ -170,7 +140,7 @@ subprojects { test { useJUnitPlatform() } - + tasks.named("processResources") { dependsOn(rootProject.tasks.writeVersion) } @@ -232,7 +202,7 @@ static def getMacVersion(String version) { } jpackage { - input = layout.projectDirectory.dir("build/libs") + input = layout.projectDirectory.dir("stirling-pdf/build/libs") destination = layout.projectDirectory.dir("build/jpackage") mainJar = "Stirling-PDF-${project.version}.jar" appName = "Stirling PDF" @@ -375,7 +345,7 @@ tasks.register('jpackageMacX64') { commandLine 'jpackage', '--type', 'dmg', '--name', 'Stirling PDF (x86_64)', - '--input', 'build/libs', + '--input', 'stirling-pdf/build/libs', '--main-jar', "Stirling-PDF-${project.version}.jar", '--main-class', 'org.springframework.boot.loader.launch.JarLauncher', '--runtime-image', file(jrePath + "/zulu-17.jre/Contents/Home"),