Update files for pr

Author: smac89

README.md

@@ -15,10 +15,11 @@ Please see the [Gradle Plugin Portal](https://plugins.gradle.org/plugin/io.netif
 ### Extension Properties
 The plugin defines the following extension properties in the `flatbuffers` closure:
 
-| Property  | Type   | Default Value | Required | Description                                        |
-|-----------|--------|---------------|----------|----------------------------------------------------|
-| flatcPath | String | flatc         | False    | The path to the flatc compiler.                    |
-| language  | String | null          | False    | The language to use when compiling the FlatBuffers.|
+|Property     | Type   | Default Value | Required | Description                                        |
+|--------------|--------|---------------|----------|----------------------------------------------------|
+| flatcPath    | String | flatc         | False    | The path to the flatc compiler.                    |
+| language     | String | null          | False    | The language to use when compiling the FlatBuffers.|
+| flatBuffersVersion | String | 1.10.0        | False    | The version of the java maven binaries to include. |
 
 *Note:* Please see the [Supported Languages](#supported-languages) section for valid `language` values.
 

build.gradle

@@ -21,17 +21,20 @@ pluginBundle {
     website = 'https://github.com/netifi/gradle-flatbuffers-plugin'
     vcsUrl = 'https://github.com/netifi/gradle-flatbuffers-plugin'
     tags = [ 'serialization', 'build', 'codegen' ]
-}
-
 
+    plugins {
+        flatBuffersPlugin {
+            description = "Gradle plugin for generating code from Google FlatBuffers schemas."
+            displayName = 'FlatBuffers Plugin'
+        }
+    }
+}
 
 gradlePlugin {
     plugins {
         flatBuffersPlugin {
             id = 'io.netifi.flatbuffers'
-            displayName = 'FlatBuffers Plugin'
             implementationClass = 'io.netifi.flatbuffers.plugin.FlatBuffersPlugin'
-            description = "Gradle plugin for generating code from Google FlatBuffers schemas."
         }
     }
 }

ci/travis.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 # This script builds the project in Travis
+export GRADLE_OPTS="-Dorg.gradle.daemon=false"
 
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
   echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"

src/main/groovy/io/netifi/flatbuffers/plugin/FlatBuffersPlugin.groovy

@@ -63,12 +63,12 @@ class FlatBuffersPlugin implements Plugin<Project> {
     /**
      * Adds a 'clean' flatBuffers for any FlatBuffers tasks in the project.
      *
-     * @param flatBuffers {@link FlatBuffers} flatBuffers
+     * @param flatBuffersTask {@link FlatBuffers} flatBuffers
      */
-    void addCleanTask(FlatBuffers flatBuffers) {
-        def taskName = "clean${GUtil.toCamelCase(flatBuffers.name)}"
+    void addCleanTask(FlatBuffers flatBuffersTask) {
+        def taskName = "clean${GUtil.toCamelCase(flatBuffersTask.name)}"
         project.tasks.create(name: taskName, type: Delete) { Delete task ->
-            task.delete flatBuffers.outputDir
+            task.delete flatBuffersTask.outputDir
         }
     }
 
@@ -109,10 +109,8 @@ class FlatBuffersPlugin implements Plugin<Project> {
         // Java specific dependencies
         project.pluginManager.withPlugin('java') {
             project.configurations.getByName(IMPLEMENTATION_CONFIGURATION_NAME) { Configuration config ->
-                config.defaultDependencies {
-                    def version = "com.google.flatbuffers:flatbuffers-java:${extension.flatBuffersVersion ?: '1.10.0'}"
-                    it.add(project.dependencies.create(version))
-                }
+                def flatBufferVersion = "com.google.flatbuffers:flatbuffers-java:${extension.flatBuffersVersion ?: '1.10.0'}"
+                config.dependencies.add(project.dependencies.create(flatBufferVersion))
             }
         }
     }

src/test/groovy/io/netifi/flatbuffers/plugin/FlatcExecutableFromPathTest.groovy

@@ -27,7 +27,7 @@ import java.nio.file.Paths
 
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 
-@IgnoreIf({ env.TRAVIS || env.CI })
+@IgnoreIf({ !(env.TRAVIS || env.CI) })
 @Requires({ os.linux })
 class FlatcExecutableFromPathTest extends Specification {
 
@@ -47,7 +47,7 @@ class FlatcExecutableFromPathTest extends Specification {
         testProjectDir.newFolder("src", "main", 'flatbuffers')
         bufferSpec = testProjectDir.newFile("src/main/flatbuffers/vehicle.fbs")
         outputDirPath = outputDir.absolutePath
-        flatcPath = "which -p flatc".execute().text
+        flatcPath = "which -p flatc".execute().text.trim()
     }
 
     def "can find flatc compiler on system path" () {
@@ -62,7 +62,7 @@ class FlatcExecutableFromPathTest extends Specification {
             
             flatbuffers {
                 language = 'java'
-                flatcPath = 'flatc'
+                flatcPath = '$flatcPath'
             }
             
             task flatBuffers1(type: FlatBuffers) {