Fix war-overlay compability

freefair · Apr 9, 2018 · 684d780 · 684d780
1 parent a59ee7b
commit 684d780
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/io/freefair/gradle/plugins/JSassWarPlugin.java b/src/main/java/io/freefair/gradle/plugins/JSassWarPlugin.java
@@ -31,11 +31,11 @@ public void apply(Project project) {
             War war = (War) p.getTasks().getByName(WarPlugin.WAR_TASK_NAME);
             if (jSassBasePlugin.getExtension().isInplace()) {
                 compileWebappSass.setDestinationDir(warPluginConvention.getWebAppDir());
+                war.dependsOn(compileWebappSass);
             } else {
-                compileWebappSass.setDestinationDir(new File(p.getBuildDir(), "generated/webappCss"));
-                war.from(compileWebappSass.getDestinationDir());
+                compileWebappSass.setDestinationDir(new File(p.getBuildDir(), "jsass/webapp"));
+                war.from(compileWebappSass);
             }
-            war.dependsOn(compileWebappSass);
         });
     }
 }