Small fix to make project creation work

forge · Aug 20, 2013 · e1c980b · e1c980b
1 parent cef0a0c
commit e1c980b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 22 deletions.
diff --git a/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/GradleFacetImpl.java b/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/GradleFacetImpl.java
@@ -45,6 +45,7 @@ public boolean install()
          if (!getBuildScriptResource().exists())
          {
             getBuildScriptResource().createNewFile();
+            getBuildScriptResource().setContents("apply plugin: 'java'\n");
          }
          if (!getSettingsScriptResource().exists())
          {
@@ -197,7 +198,8 @@ private void checkIfIsForgeLibraryInstalled()
       {
          getBuildScriptResource().setContents(newScript);
 
-         FileResource<?> forgeLib = getFaceted().getProjectRoot().getChildDirectory(GradleSourceUtil.FORGE_LIBRARY);
+         FileResource<?> forgeLib = (FileResource<?>)
+                  getFaceted().getProjectRoot().getChild(GradleSourceUtil.FORGE_LIBRARY);
          forgeLib.setContents(getClass().getResourceAsStream(GradleSourceUtil.FORGE_LIBRARY_RESOURCE));
       }
    }

diff --git a/impl/src/main/resources/forge.gradle b/impl/src/main/resources/forge.gradle
@@ -191,27 +191,29 @@ allprojects {
                 }
                 outputDec '</plugins>'
                 outputInc '<sourceSets>'
-                p.sourceSets.each { set ->
-                    outputInc '<sourceSet>'
-                    outputInc '<name>'
-                    output set.name
-                    outputDec '</name>'
-                    outputInc '<java>'
-                    set.java.srcDirs.each {
-                        outputInc '<directory>'
-                        outputRelative(it, project.projectDir)
-                        outputDec '</directory>'
-                    }
-                    outputDec '</java>'
-                    outputInc '<resources>'
-                    set.resources.srcDirs.each {
-                        outputInc '<directory>'
-                        outputRelative(it, project.projectDir)
-                        outputDec '</directory>'
-                    }
-                    outputDec '</resources>'
-                    outputDec '</sourceSet>'
-                }
+                if (p.hasProperty('sourceSets')) {
+	                p.sourceSets.each { set ->
+	                    outputInc '<sourceSet>'
+	                    outputInc '<name>'
+	                    output set.name
+	                    outputDec '</name>'
+	                    outputInc '<java>'
+	                    set.java.srcDirs.each {
+	                        outputInc '<directory>'
+	                        outputRelative(it, project.projectDir)
+	                        outputDec '</directory>'
+	                    }
+	                    outputDec '</java>'
+	                    outputInc '<resources>'
+	                    set.resources.srcDirs.each {
+	                        outputInc '<directory>'
+	                        outputRelative(it, project.projectDir)
+	                        outputDec '</directory>'
+	                    }
+	                    outputDec '</resources>'
+	                    outputDec '</sourceSet>'
+	                }
+	            }
                 outputDec '</sourceSets>'
                 outputDec '</project>'
             }