Skip to content

Commit 6d1e169

Browse files
committed
Change package resources default location
1 parent bde4e61 commit 6d1e169

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
import org.gradle.api.NonNullApi;
2020
import org.gradle.api.Plugin;
2121
import org.gradle.api.Project;
22+
import org.gradle.api.file.SourceDirectorySet;
2223
import org.gradle.api.plugins.JavaPlugin;
24+
import org.gradle.api.tasks.SourceSetContainer;
2325
import org.gradle.jvm.toolchain.JavaToolchainService;
2426
import org.gradle.util.GradleVersion;
2527

@@ -39,10 +41,13 @@ public void apply(Project project) {
3941
}
4042

4143
project.getPlugins().apply(JavaPlugin.class);
44+
SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
45+
SourceDirectorySet mainResources = sourceSets.getByName("main").getResources();
4246

4347
JavaModulePackagingExtension javaModulePackaging = project.getExtensions().create("javaModulePackaging", JavaModulePackagingExtension.class);
4448
javaModulePackaging.getApplicationName().convention(project.getName());
4549
javaModulePackaging.getApplicationVersion().convention(project.provider(() -> (String) project.getVersion()));
46-
javaModulePackaging.getJpackageResources().convention(project.getLayout().getProjectDirectory().dir("resources"));
50+
javaModulePackaging.getJpackageResources().convention(project.provider(() ->
51+
project.getLayout().getProjectDirectory().dir(mainResources.getSrcDirs().iterator().next().getParent() + "/resourcesPackage")));
4752
}
4853
}

0 commit comments

Comments
 (0)