build.gradle splitting, Java 7, lint

Author: Capstan

build.gradle

@@ -1,4 +1,5 @@
-/* * Copyright (c) 2014, Francis Galiegue ([email protected])
+/*
+ * Copyright (c) 2014, Francis Galiegue ([email protected])
  *
  * This software is dual-licensed under:
  *
@@ -18,15 +19,21 @@
 
 buildscript {
     repositories {
+        mavenCentral()
         maven {
             url "http://repo.springsource.org/plugins-release";
         }
     }
     dependencies {
+        classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.2.0'
         classpath(group: "org.springframework.build.gradle", name: "propdeps-plugin", version: "0.0.7");
     }
 };
 
+plugins {
+    id("net.ltgt.errorprone") version "0.8.1" apply false
+}
+
 configure(allprojects) {
     apply(plugin: "propdeps");
     apply(plugin: "propdeps-maven");
@@ -37,51 +44,45 @@ configure(allprojects) {
 apply(plugin: "java");
 apply(plugin: "maven");
 apply(plugin: "signing");
-apply(plugin: "osgi");
+apply(plugin: "biz.aQute.bnd.builder");
 apply(plugin: "idea");
 apply(plugin: "eclipse");
+apply(plugin: "net.ltgt.errorprone");
+
+apply(from: "project.gradle");
 
 group = "com.github.java-json-tools";
-version = "1.11-SNAPSHOT";
-sourceCompatibility = "1.6";
-targetCompatibility = "1.6"; // defaults to sourceCompatibility
+
+ext.forRelease = !version.endsWith("-SNAPSHOT");
 
 /*
- * List of dependencies
+ * Repositories to use
  */
-dependencies {
-    provided(group: "com.google.code.findbugs", name: "jsr305", version: "2.0.1");
-    compile(group: "com.github.java-json-tools", name: "jackson-coreutils", version: "1.9");
-    testCompile(group: "org.testng", name: "testng", version: "6.8.7") {
-        exclude(group: "junit", module: "junit");
-        exclude(group: "org.beanshell", module: "bsh");
-        exclude(group: "org.yaml", module: "snakeyaml");
-    };
-    testCompile(group: "org.mockito", name: "mockito-core", version: "1.9.5");
-    testCompile(group: "org.assertj", name: "assertj-core", version: "1.7.0");
-}
-
-javadoc.options {
-    def currentJavaVersion = org.gradle.api.JavaVersion.current()
-    // FIXME: https://github.com/gradle/gradle/issues/11182
-    if (currentJavaVersion.compareTo(org.gradle.api.JavaVersion.VERSION_1_9) >= 0) {
-        addStringOption("-release", "6");
+repositories {
+    mavenCentral();
+    if (!forRelease) {
+        maven {
+            url "https://oss.sonatype.org/content/repositories/snapshots"
+        }
+    }
+    /* Allow staging references for last pre-release testing. */
+    if (project.properties.containsKey("sonatypeUsername")) {
+        maven {
+            url "https://oss.sonatype.org/service/local/staging/deploy/maven2"
+            credentials {
+                username = project.properties["sonatypeUsername"]
+                password = project.properties["sonatypePassword"]
+            }
+        }
     }
-    links("https://docs.oracle.com/javase/6/docs/api/");
-    links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/");
-    links("https://fasterxml.github.com/jackson-databind/javadoc/2.2.0/");
-    links("https://fasterxml.github.com/jackson-core/javadoc/2.2.0/");
-    links("https://fasterxml.github.com/jackson-annotations/javadoc/2.2.0/");
-    links("https://www.javadoc.io/doc/com.google.guava/guava/16.0.1/");
-    links("https://fge.github.io/msg-simple/");
-    links("https://fge.github.io/jackson-coreutils/");
 }
 
 /*
- * Repositories to use
+ * Add errorprone checking.
  */
-repositories {
-    mavenCentral();
+dependencies {
+    errorprone("com.google.errorprone:error_prone_core:2.3.3")
+    errorproneJavac("com.google.errorprone:javac:9+181-r4173-1")
 }
 
 /*
@@ -102,6 +103,20 @@ task sourcesJar(type: Jar, dependsOn: classes) {
     from sourceSets.main.allSource;
 }
 
+/*
+ * Lint all the things!
+ */
+allprojects {
+    gradle.projectsEvaluated {
+        tasks.withType(JavaCompile) {
+            options.compilerArgs << "-Xlint:all" << "-Xlint:-serial" << "-Werror"
+        }
+        tasks.withType(Javadoc) {
+            options.addStringOption('Xwerror', '-quiet')
+        }
+    }
+}
+
 /*
  * Javadoc: we need to tell where the overview.html is, it will not pick it up
  * automatically...
@@ -138,8 +153,7 @@ task pom {
  */
 
 project.ext {
-    description = "JSON Patch (RFC 6902) and JSON Merge Patch (RFC 7386) implementation in Java";
-    scmUrl = sprintf("[email protected]:java-json-tools/%s.git", name)
+    scmUrl = sprintf("[email protected]:java-json-tools/%s.git", name);
     projectURL = sprintf("https://github.com/java-json-tools/%s", name);
     sonatypeStaging = "https://oss.sonatype.org/service/local/staging/deploy/maven2/";
     sonatypeSnapshots = "https://oss.sonatype.org/content/repositories/snapshots/";
@@ -152,7 +166,7 @@ task checkSigningRequirements {
         requiredProperties.each {
             if (project.properties[it] == null) {
                 noDice = true;
-                System.err.printf("property \"%s\" is not defined!")
+                System.err.printf("property \"%s\" is not defined!\n", it);
             }
         }
         if (noDice)
@@ -228,7 +242,6 @@ uploadArchives {
     }
 }
 
-ext.forRelease = !version.endsWith("-SNAPSHOT");
 signing {
     required { forRelease && gradle.taskGraph.hasTask("uploadArchives") };
     sign configurations.archives;

project.gradle

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2014, Francis Galiegue ([email protected])
+ *
+ * This software is dual-licensed under:
+ *
+ * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any
+ *   later version;
+ * - the Apache Software License (ASL) version 2.0.
+ *
+ * The text of this file and of both licenses is available at the root of this
+ * project or, if you have the jar distribution, in directory META-INF/, under
+ * the names LGPL-3.0.txt and ASL-2.0.txt respectively.
+ *
+ * Direct link to the sources:
+ *
+ * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt
+ * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt
+ */
+
+/*
+ * Project-specific settings. Unfortunately we cannot put the name in there!
+ */
+group = "com.github.java-json-tools";
+version = "1.11-SNAPSHOT";
+sourceCompatibility = JavaVersion.VERSION_1_7;
+targetCompatibility = JavaVersion.VERSION_1_7; // defaults to sourceCompatibility
+project.ext.description = "JSON Patch (RFC 6902) and JSON Merge Patch (RFC 7386) implementation in Java";
+
+/*
+ * List of dependencies
+ */
+dependencies {
+    provided(group: "com.google.code.findbugs", name: "jsr305", version: "2.0.1");
+    compile(group: "com.github.java-json-tools", name: "jackson-coreutils", version: "1.9");
+    testCompile(group: "org.testng", name: "testng", version: "6.8.7") {
+        exclude(group: "junit", module: "junit");
+        exclude(group: "org.beanshell", module: "bsh");
+        exclude(group: "org.yaml", module: "snakeyaml");
+    };
+    testCompile(group: "org.mockito", name: "mockito-core", version: "1.9.5");
+    testCompile(group: "org.assertj", name: "assertj-core", version: "1.7.0");
+}
+
+javadoc.options {
+    def currentJavaVersion = org.gradle.api.JavaVersion.current()
+    // FIXME: https://github.com/gradle/gradle/issues/11182
+    if (currentJavaVersion.compareTo(org.gradle.api.JavaVersion.VERSION_1_9) >= 0) {
+        addStringOption("-release", "7");
+    }
+    links("https://docs.oracle.com/javase/7/docs/api/");
+    links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/");
+    links("https://fasterxml.github.com/jackson-databind/javadoc/2.2.0/");
+    links("https://fasterxml.github.com/jackson-core/javadoc/2.2.0/");
+    links("https://fasterxml.github.com/jackson-annotations/javadoc/2.2.0/");
+    links("https://www.javadoc.io/doc/com.google.guava/guava/16.0.1/");
+    links("https://fge.github.io/msg-simple/");
+    links("https://fge.github.io/jackson-coreutils/");
+}

settings.gradle

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2014, Francis Galiegue ([email protected])
+ *
+ * This software is dual-licensed under:
+ *
+ * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any
+ *   later version;
+ * - the Apache Software License (ASL) version 2.0.
+ *
+ * The text of this file and of both licenses is available at the root of this
+ * project or, if you have the jar distribution, in directory META-INF/, under
+ * the names LGPL-3.0.txt and ASL-2.0.txt respectively.
+ *
+ * Direct link to the sources:
+ *
+ * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt
+ * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt
+ */
+
+rootProject.name = "json-patch";

src/main/java/com/github/fge/jsonpatch/diff/JsonDiff.java

@@ -235,6 +235,7 @@ private static void computeUnchanged(final Map<JsonPointer, JsonNode> ret,
                 break;
             case ARRAY:
                 computeArray(ret, pointer, first, second);
+                break;
             default:
                 /* nothing */
         }