Merge pull request #235 from google/gjf_1.2

Upgrade to google-java-format v1.2

Author: alicederyn

build.gradle

@@ -107,28 +107,14 @@ jar {
 shadowJar {
   classifier = null
 
-  ['com.google', 'org.apache', 'org.eclipse', 'org.osgi'].each {
+  ['com.google', 'org.apache', 'org.openjdk', 'org.osgi'].each {
     relocate it, "org.inferred.freebuilder.shaded.$it"
   }
 
   // Exclude common META-INF detritus
   exclude 'META-INF/*.txt'
   exclude 'META-INF/maven/**'
 
-  // Exclude Eclipse (via google-java-format) detritus
-  exclude 'META-INF/eclipse.inf'
-  exclude 'META-INF/services/org.osgi.*'
-  exclude '.api_description'
-  exclude '.options'
-  exclude 'about.html'
-  exclude 'about_files/*.txt'
-  exclude 'ant_tasks/*'
-  exclude 'plugin.xml'
-  exclude 'jdtCompilerAdapter.jar'
-  exclude '*.profile'
-  exclude '*.properties'
-  exclude '*.list'
-
   // Exclude all of jsr305 except Nullable, Nonnull and meta.When
   exclude 'javax/annotation/C*'
   exclude 'javax/annotation/D*'

gradle.properties

@@ -1,6 +1,6 @@
 autoService=com.google.auto.service:auto-service:1.0-rc2
 commonsLang3=org.apache.commons:commons-lang3:3.4
-googleJavaFormat=com.google.googlejavaformat:google-java-format:1.0
+googleJavaFormat=com.google.googlejavaformat:google-java-format:1.2
 guava=com.google.guava:guava:16.0
 guavaTestlib=com.google.guava:guava-testlib:17.0
 gwtUser=com.google.gwt:gwt-user:2.6.1