Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow running the task on subprojects too. #107

Merged
merged 14 commits into from
May 13, 2021
Merged

Allow running the task on subprojects too. #107

Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
33b0a12
Added iOS Extension
jperedadnr Aug 22, 2019
4c00eaf
Merge branch 'master' of https://github.com/gluonhq/client-gradle-plugin
jperedadnr Aug 26, 2019
1619f00
Use development version of omega
jperedadnr Aug 26, 2019
430e82e
Merge branch 'master' of https://github.com/gluonhq/client-gradle-plugin
jperedadnr Sep 26, 2019
230d0df
Merge upstream changes
jperedadnr Apr 12, 2020
be9442c
Merge branch 'master' of https://github.com/gluonhq/client-gradle-plugin
jperedadnr Sep 25, 2020
3681a6e
Merge branch 'master' of https://github.com/gluonhq/client-gradle-plugin
jperedadnr Feb 15, 2021
7d4ef27
Merge branch 'master' of https://github.com/gluonhq/client-gradle-plugin
jperedadnr Feb 16, 2021
23cd568
Merge branch 'master' of https://github.com/gluonhq/client-gradle-plugin
jperedadnr Feb 17, 2021
6667945
Merge branch 'master' of https://github.com/gluonhq/client-gradle-plugin
jperedadnr Feb 28, 2021
81acd01
Allow running the task on subprojects too.
jperedadnr Feb 28, 2021
f88daab
Merge branch 'master' of https://github.com/gluonhq/client-gradle-plugin
jperedadnr May 4, 2021
d84c7f5
Merge branch 'master' into 102-subprojects
jperedadnr May 4, 2021
d73cdf6
Add javafx-plugin to properly define command line arguments
jperedadnr May 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/main/java/com/gluonhq/gradle/tasks/ClientNativeRunAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@

public class ClientNativeRunAgent extends ClientNativeBase {

private static final String CONFIG_JAVAFX_RUN_TASK = "configJavafxRun";

private static final String AGENTLIB_NATIVE_IMAGE_AGENT_STRING =
"-agentlib:native-image-agent=access-filter-file=src/main/resources/META-INF/native-image/filter-file.json,config-merge-dir=src/main/resources/META-INF/native-image";

Expand All @@ -66,9 +68,9 @@ public ClientNativeRunAgent(Project project) {
super(project);
clientExtension = project.getExtensions().getByType(ClientExtension.class);

Task javafxRun = project.getTasks().findByPath(":configJavafxRun");
Task javafxRun = project.getTasks().findByName(CONFIG_JAVAFX_RUN_TASK);
if (javafxRun == null) {
throw new GradleException("javafxplugin:configJavafxRun task not found.");
throw new GradleException("javafxplugin:" + CONFIG_JAVAFX_RUN_TASK + " task not found.");
}
this.dependsOn(javafxRun.getPath());
}
Expand All @@ -87,7 +89,7 @@ public void action() {

try {
// folder
Path path = Path.of(project.getRootDir().getAbsolutePath(), "src", "main", "resources", "META-INF", "native-image");
Path path = Path.of(project.getProjectDir().getAbsolutePath(), "src", "main", "resources", "META-INF", "native-image");
if (Files.exists(path)) {
// TODO: Delete files
// otherwise it keeps merging results from different runs
Expand Down