Update Forge to 2.10.2-SNAPSHOT

forge · Sep 18, 2014 · d738e19 · d738e19
1 parent b4ca786
commit d738e19
Show file tree

Hide file tree

Showing 8 changed files with 105 additions and 64 deletions.
diff --git a/addon/pom.xml b/addon/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.jboss.forge.addon</groupId>
 		<artifactId>gradle-parent</artifactId>
-		<version>2.7.1-SNAPSHOT</version>
+		<version>2.10.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>gradle</artifactId>

diff --git a/api/pom.xml b/api/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>gradle-parent</artifactId>
-      <version>2.7.1-SNAPSHOT</version>
+      <version>2.10.2-SNAPSHOT</version>
    </parent>
    <artifactId>gradle-api</artifactId>
    <name>Forge - Gradle API</name>

diff --git a/impl-projects/pom.xml b/impl-projects/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>gradle-parent</artifactId>
-      <version>2.7.1-SNAPSHOT</version>
+      <version>2.10.2-SNAPSHOT</version>
    </parent>
    <artifactId>gradle-impl-projects</artifactId>
    <name>Forge - Gradle Projects Impl</name>

diff --git a/...cts/src/main/java/org/jboss/forge/addon/gradle/projects/facets/GradleJavaSourceFacet.java b/...cts/src/main/java/org/jboss/forge/addon/gradle/projects/facets/GradleJavaSourceFacet.java
@@ -6,9 +6,6 @@
  */
 package org.jboss.forge.addon.gradle.projects.facets;
 
-import java.io.FileNotFoundException;
-import java.util.List;
-
 import org.gradle.jarjar.com.google.common.collect.Lists;
 import org.jboss.forge.addon.facets.AbstractFacet;
 import org.jboss.forge.addon.facets.constraints.FacetConstraint;
@@ -26,7 +23,9 @@
 import org.jboss.forge.addon.resource.ResourceFilter;
 import org.jboss.forge.addon.resource.visit.ResourceVisit;
 import org.jboss.forge.furnace.util.Strings;
-import org.jboss.forge.roaster.model.source.*;
+import org.jboss.forge.roaster.model.source.JavaSource;
+
+import java.util.List;
 
 /**
  * @author Adam Wyłuda
@@ -134,38 +133,38 @@ public DirectoryResource getTestSourceDirectory()
    }
 
    @Override
-   public JavaResource saveJavaSource(JavaSource<?> source) throws FileNotFoundException
+   public JavaResource saveJavaSource(JavaSource<?> source)
    {
       return getJavaResource(Packages.toFileSyntax(source.getQualifiedName()) + ".java").setContents(source);
    }
 
    @Override
-   public JavaResource saveTestJavaSource(JavaSource<?> source) throws FileNotFoundException
+   public JavaResource saveTestJavaSource(JavaSource<?> source)
    {
       return getTestJavaResource(Packages.toFileSyntax(source.getQualifiedName()) + ".java").setContents(source);
    }
 
    @Override
-   public JavaResource getJavaResource(String relativePath) throws FileNotFoundException
+   public JavaResource getJavaResource(String relativePath)
    {
       return GradleResourceUtil.findFileResource(getMainJavaSources(), relativePath).reify(JavaResource.class);
    }
 
    @Override
-   public JavaResource getJavaResource(JavaSource<?> javaClass) throws FileNotFoundException
+   public JavaResource getJavaResource(JavaSource<?> javaClass)
    {
       String pkg = Strings.isNullOrEmpty(javaClass.getPackage()) ? "" : javaClass.getPackage() + ".";
       return getJavaResource(pkg + javaClass.getName());
    }
 
    @Override
-   public JavaResource getTestJavaResource(String relativePath) throws FileNotFoundException
+   public JavaResource getTestJavaResource(String relativePath)
    {
       return GradleResourceUtil.findFileResource(getTestJavaSources(), relativePath).reify(JavaResource.class);
    }
 
    @Override
-   public JavaResource getTestJavaResource(JavaSource<?> javaClass) throws FileNotFoundException
+   public JavaResource getTestJavaResource(JavaSource<?> javaClass)
    {
       String pkg = Strings.isNullOrEmpty(javaClass.getPackage()) ? "" : javaClass.getPackage() + ".";
       return getTestJavaResource(pkg + javaClass.getName());

diff --git a/...ects/src/main/java/org/jboss/forge/addon/gradle/projects/facets/GradlePackagingFacet.java b/...ects/src/main/java/org/jboss/forge/addon/gradle/projects/facets/GradlePackagingFacet.java
@@ -6,9 +6,6 @@
  */
 package org.jboss.forge.addon.gradle.projects.facets;
 
-import java.io.PrintStream;
-import java.util.List;
-
 import org.gradle.jarjar.com.google.common.collect.Lists;
 import org.jboss.forge.addon.facets.AbstractFacet;
 import org.jboss.forge.addon.facets.constraints.FacetConstraint;
@@ -17,10 +14,16 @@
 import org.jboss.forge.addon.gradle.projects.model.GradleModelBuilder;
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.building.BuildException;
+import org.jboss.forge.addon.projects.building.BuildMessage;
+import org.jboss.forge.addon.projects.building.BuildResult;
 import org.jboss.forge.addon.projects.building.ProjectBuilder;
 import org.jboss.forge.addon.projects.facets.PackagingFacet;
 import org.jboss.forge.addon.resource.Resource;
 
+import java.io.PrintStream;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * @author Adam Wyłuda
  */
@@ -64,50 +67,7 @@ public Resource<?> getFinalArtifact()
    @Override
    public ProjectBuilder createBuilder()
    {
-      return new ProjectBuilder()
-      {
-         private List<String> arguments = Lists.newArrayList();
-         private boolean runTests = false;
-
-         @Override
-         public ProjectBuilder addArguments(String... args)
-         {
-            for (String arg : args)
-            {
-               arguments.add(arg);
-            }
-            return this;
-         }
-
-         @Override
-         public ProjectBuilder runTests(boolean test)
-         {
-            runTests = test;
-            return this;
-         }
-
-         @Override
-         public Resource<?> build() throws BuildException
-         {
-            if (!(arguments.contains("build") || arguments.contains("assemble")))
-            {
-               // According to:
-               // http://www.gradle.org/docs/current/userguide/img/javaPluginTasks.png
-               // build is assemble + test
-               arguments.add(runTests ? "build" : "assemble");
-            }
-            getGradleFacet().executeTask(runTests ? "test" : "", "",
-                     (String[]) arguments.toArray(new String[arguments.size()]));
-            return getFinalArtifact();
-         }
-
-         @Override
-         public Resource<?> build(PrintStream out, PrintStream err) throws BuildException
-         {
-            // TODO: Redirect to provided out and err
-            return build();
-         }
-      };
+      return new GradleProjectBuilder();
    }
 
    @Override
@@ -117,6 +77,13 @@ public Resource<?> executeBuild(String... args)
       return getFinalArtifact();
    }
 
+   @Override
+   public BuildResult getBuildResult()
+   {
+      // TODO Return real Gradle build result
+      return new GradleBuildResult();
+   }
+
    @Override
    public String getFinalName()
    {
@@ -137,4 +104,79 @@ private GradleFacet getGradleFacet()
    {
       return getFaceted().getFacet(GradleFacet.class);
    }
+
+   private class GradleProjectBuilder implements ProjectBuilder
+   {
+      private List<String> arguments = Lists.newArrayList();
+      private boolean runTests = false;
+      private boolean quiet = false;
+
+      @Override
+      public ProjectBuilder addArguments(String... args)
+      {
+         for (String arg : args)
+         {
+            arguments.add(arg);
+         }
+         return this;
+      }
+
+      @Override
+      public ProjectBuilder runTests(boolean runTests)
+      {
+         this.runTests = runTests;
+         return this;
+      }
+
+      @Override
+      public ProjectBuilder quiet(boolean quiet)
+      {
+         this.quiet = quiet;
+         return this;
+      }
+
+      @Override
+      public Resource<?> build() throws BuildException
+      {
+         if (!(arguments.contains("build") || arguments.contains("assemble")))
+         {
+            // According to:
+            // http://www.gradle.org/docs/current/userguide/img/javaPluginTasks.png
+            // build is assemble + test
+            arguments.add(runTests ? "build" : "assemble");
+         }
+
+         if (quiet)
+         {
+            arguments.add("--quiet");
+         }
+
+         getGradleFacet().executeTask(runTests ? "test" : "", "",
+                  (String[]) arguments.toArray(new String[arguments.size()]));
+         return getFinalArtifact();
+      }
+
+      @Override
+      public Resource<?> build(PrintStream out, PrintStream err) throws BuildException
+      {
+         // TODO: Redirect to provided out and err
+         return build();
+      }
+   }
+
+   private static class GradleBuildResult implements BuildResult
+   {
+
+      @Override
+      public boolean isSuccess()
+      {
+         return true;
+      }
+
+      @Override
+      public Iterable<BuildMessage> getMessages()
+      {
+         return Collections.emptyList();
+      }
+   }
 }
diff --git a/impl/pom.xml b/impl/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.jboss.forge.addon</groupId>
 		<artifactId>gradle-parent</artifactId>
-		<version>2.7.1-SNAPSHOT</version>
+		<version>2.10.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>gradle-impl</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 
    <groupId>org.jboss.forge.addon</groupId>
    <artifactId>gradle-parent</artifactId>
-   <version>2.7.1-SNAPSHOT</version>
+   <version>2.10.2-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>Forge - Gradle Addon Parent</name>
 
@@ -28,7 +28,7 @@
    </repositories>
 
    <properties>
-      <version.forge>2.7.1-SNAPSHOT</version.forge>
+      <version.forge>2.10.2-SNAPSHOT</version.forge>
       <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
       <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
    </properties>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>gradle-parent</artifactId>
-      <version>2.7.1-SNAPSHOT</version>
+      <version>2.10.2-SNAPSHOT</version>
    </parent>
    <artifactId>gradle-tests</artifactId>
    <name>Forge - Gradle Addon Tests</name>