Avoid War and Jar task creation

GoogleCloudPlatform · Feb 18, 2021 · bae6dc2 · bae6dc2
1 parent 29190de
commit bae6dc2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/src/main/java/com/google/cloud/tools/gradle/appengine/appyaml/AppEngineAppYamlPlugin.java b/src/main/java/com/google/cloud/tools/gradle/appengine/appyaml/AppEngineAppYamlPlugin.java
@@ -90,11 +90,11 @@ private void configureExtensions() {
           // we can only set the default location of "archive" after project evaluation (callback)
           if (stageExtension.getArtifact() == null) {
             if (project.getPlugins().hasPlugin(WarPlugin.class)) {
-              War war = tasks.withType(War.class).getByName("war");
-              stageExtension.setArtifact(war.getArchivePath());
+              stageExtension.setArtifact(
+                  tasks.withType(War.class).named("war").map(war -> war.getArchivePath()));
             } else if (project.getPlugins().hasPlugin(JavaPlugin.class)) {
-              Jar jar = tasks.withType(Jar.class).getByName("jar");
-              stageExtension.setArtifact(jar.getArchivePath());
+              stageExtension.setArtifact(
+                  tasks.withType(Jar.class).named("jar").map(jar -> jar.getArchivePath()));
             } else {
               throw new GradleException("Could not find JAR or WAR configuration");
             }

diff --git a/src/main/java/com/google/cloud/tools/gradle/appengine/standard/AppEngineStandardPlugin.java b/src/main/java/com/google/cloud/tools/gradle/appengine/standard/AppEngineStandardPlugin.java
@@ -149,18 +149,10 @@ private void createExplodeWarTask() {
               task.dependsOn(WarPlugin.WAR_TASK_NAME);
               task.setGroup(APP_ENGINE_STANDARD_TASK_GROUP);
               task.setDescription("Explode a war into a directory");
+              task.setWarFile(
+                  tasks.withType(War.class).named("war").map(war -> war.getArchivePath()));
             });
 
-    project.afterEvaluate(
-        project ->
-            explodeWar.configure(
-                task ->
-                    task.setWarFile(
-                        tasks
-                            .withType(War.class)
-                            .getByName((WarPlugin.WAR_TASK_NAME))
-                            .getArchivePath())));
-
     tasks.named(BasePlugin.ASSEMBLE_TASK_NAME).configure(task -> task.dependsOn(explodeWar));
   }
 

diff --git a/src/main/java/com/google/cloud/tools/gradle/appengine/standard/ExplodeWarTask.java b/src/main/java/com/google/cloud/tools/gradle/appengine/standard/ExplodeWarTask.java
@@ -26,7 +26,7 @@ public class ExplodeWarTask extends Sync {
 
   private File explodedAppDirectory;
 
-  public void setWarFile(File warFile) {
+  public void setWarFile(Object warFile) {
     from(getProject().zipTree(warFile));
   }