Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build.gradle

Author: mjpt777

build.gradle

@@ -86,7 +86,7 @@ def projectPom = {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.14.1'
+    gradleVersion = '3.1'
 }
 
 configurations {
@@ -115,7 +115,7 @@ subprojects {
     [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
     dependencies {
-        checkstyle 'com.puppycrawl.tools:checkstyle:7.0'
+        checkstyle 'com.puppycrawl.tools:checkstyle:7.1.1'
         checkstyle 'com.github.sevntu.checkstyle:sevntu-checks:1.21.0'
 
         testCompile 'org.hamcrest:hamcrest-all:1.3'
@@ -126,7 +126,7 @@ subprojects {
 
     checkstyle {
         configFile = new File(rootDir, 'config/checkstyle.xml')
-        toolVersion = '7.0'
+        toolVersion = '7.1.1'
     }
 
     compileJava {

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Sun Aug 14 20:15:26 BST 2016
+#Sat Sep 24 20:31:48 BST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -161,4 +161,9 @@ function splitJvmOpts() {
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew

@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

gradlew.bat

@@ -82,7 +82,7 @@ public static void main(final String[] args) throws Exception
         final String encodingFilename = System.getProperty(ENCODING_FILENAME);
         if (encodingFilename != null)
         {
-            try (final FileChannel channel = new FileOutputStream(encodingFilename).getChannel())
+            try (FileChannel channel = new FileOutputStream(encodingFilename).getChannel())
             {
                 byteBuffer.limit(encodingLength);
                 channel.write(byteBuffer);

sbe-samples/src/main/java/uk/co/real_logic/sbe/examples/ExampleUsingGeneratedStub.java

@@ -83,7 +83,7 @@ public static void main(final String[] args) throws Exception
         final String encodingFilename = System.getProperty(ENCODING_FILENAME);
         if (encodingFilename != null)
         {
-            try (final FileChannel channel = new FileOutputStream(encodingFilename).getChannel())
+            try (FileChannel channel = new FileOutputStream(encodingFilename).getChannel())
             {
                 byteBuffer.limit(encodingLength);
                 channel.write(byteBuffer);

sbe-samples/src/main/java/uk/co/real_logic/sbe/examples/ExampleUsingGeneratedStubExtension.java

@@ -93,11 +93,11 @@ public static void main(final String[] args) throws Exception
 
     private static void encodeSchema(final ByteBuffer byteBuffer) throws Exception
     {
-        try (final InputStream in = new FileInputStream("src/main/resources/example-schema.xml"))
+        try (InputStream in = new FileInputStream("src/main/resources/example-schema.xml"))
         {
             final MessageSchema schema = XmlSchemaParser.parse(in, ParserOptions.DEFAULT);
             final Ir ir = new IrGenerator().generate(schema);
-            try (final IrEncoder irEncoder = new IrEncoder(byteBuffer, ir))
+            try (IrEncoder irEncoder = new IrEncoder(byteBuffer, ir))
             {
                 irEncoder.encode();
             }
@@ -125,7 +125,7 @@ private static void encodeTestMessage(final ByteBuffer byteBuffer)
 
     private static Ir decodeIr(final ByteBuffer buffer) throws IOException
     {
-        try (final IrDecoder irDecoder = new IrDecoder(buffer))
+        try (IrDecoder irDecoder = new IrDecoder(buffer))
         {
             return irDecoder.decode();
         }

sbe-samples/src/main/java/uk/co/real_logic/sbe/examples/OtfExample.java

@@ -205,7 +205,7 @@ else if (fileName.endsWith(".sbeir"))
 
                 final File fullPath = new File(outputDirName, namePart + ".sbeir");
 
-                try (final IrEncoder irEncoder = new IrEncoder(fullPath.getAbsolutePath(), ir))
+                try (IrEncoder irEncoder = new IrEncoder(fullPath.getAbsolutePath(), ir))
                 {
                     irEncoder.encode();
                 }
@@ -223,7 +223,7 @@ else if (fileName.endsWith(".sbeir"))
     public static void validateAgainstSchema(final String sbeSchemaFilename, final String xsdFilename)
         throws Exception
     {
-        try (final BufferedInputStream in = new BufferedInputStream(new FileInputStream(sbeSchemaFilename)))
+        try (BufferedInputStream in = new BufferedInputStream(new FileInputStream(sbeSchemaFilename)))
         {
             XmlSchemaParser.validate(xsdFilename, in);
         }
@@ -247,7 +247,7 @@ public static MessageSchema parseSchema(final String sbeSchemaFilename)
                 .warningsFatal(Boolean.parseBoolean(System.getProperty(VALIDATION_WARNINGS_FATAL)))
                 .suppressOutput(Boolean.parseBoolean(System.getProperty(VALIDATION_SUPPRESS_OUTPUT)));
 
-        try (final BufferedInputStream in = new BufferedInputStream(new FileInputStream(sbeSchemaFilename)))
+        try (BufferedInputStream in = new BufferedInputStream(new FileInputStream(sbeSchemaFilename)))
         {
             return XmlSchemaParser.parse(in, optionsBuilder.build());
         }

sbe-tool/src/main/java/uk/co/real_logic/sbe/SbeTool.java

@@ -61,7 +61,7 @@ public CodeGenerator newInstance(final Ir ir, final String outputDir) throws IOE
      * @return a new instance of a {@link CodeGenerator} for the given target language.
      * @throws IOException if an error occurs when dealing with the output directory.
      */
-    public abstract CodeGenerator newInstance(final Ir ir, final String outputDir) throws IOException;
+    public abstract CodeGenerator newInstance(Ir ir, String outputDir) throws IOException;
 
     /**
      * Do a case insensitive lookup of a target language for code generation.