Skip to content

Commit d6fa86d

Browse files
committed
Turn 'getJpackageResources' into ConfigurableFileCollection
This allows it to be non-existing.
1 parent 53b5fb2 commit d6fa86d

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

src/main/java/org/gradlex/javamodule/packaging/JavaModulePackagingExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ private void registerTargetSpecificTasks(Target target, String applicationJarTas
248248
t.getModulePath().from(runtimeClasspath);
249249

250250
t.getApplicationName().convention(getApplicationName());
251-
t.getJpackageResources().convention(getJpackageResources().dir(target.getOperatingSystem()));
251+
t.getJpackageResources().from(getJpackageResources().dir(target.getOperatingSystem()));
252252
t.getApplicationDescription().convention(getApplicationDescription());
253253
t.getVendor().convention(getVendor());
254254
t.getCopyright().convention(getCopyright());

src/main/java/org/gradlex/javamodule/packaging/tasks/Jpackage.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.gradle.api.tasks.CacheableTask;
2727
import org.gradle.api.tasks.Classpath;
2828
import org.gradle.api.tasks.Input;
29-
import org.gradle.api.tasks.InputDirectory;
3029
import org.gradle.api.tasks.InputFiles;
3130
import org.gradle.api.tasks.Internal;
3231
import org.gradle.api.tasks.Nested;
@@ -81,9 +80,9 @@ abstract public class Jpackage extends DefaultTask {
8180
@Optional
8281
abstract public Property<String> getApplicationDescription();
8382

84-
@InputDirectory
83+
@InputFiles
8584
@PathSensitive(PathSensitivity.RELATIVE)
86-
abstract public DirectoryProperty getJpackageResources();
85+
abstract public ConfigurableFileCollection getJpackageResources();
8786

8887
@InputFiles
8988
@PathSensitive(PathSensitivity.RELATIVE)

src/test/java/org/gradlex/javamodule/packaging/test/fixture/GradleBuild.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ public GradleBuild(Path dir) {
5353
this.libBuildFile = file("lib/build.gradle.kts");
5454
this.libModuleInfoFile = file("lib/src/main/java/module-info.java");
5555

56-
// https://github.com/gradlex-org/java-module-packaging/issues/56 ?
57-
projectDir.dir("app/src/main/resourcesPackage/windows");
58-
projectDir.dir("app/src/main/resourcesPackage/macos");
59-
projectDir.dir("app/src/main/resourcesPackage/linux");
60-
6156
settingsFile.writeText("""
6257
dependencyResolutionManagement { repositories.mavenCentral() }
6358
includeBuild(".")

0 commit comments

Comments
 (0)