Upgrade Google formatter (#409)

GoogleCloudPlatform · Sep 13, 2021 · b11124b · b11124b
1 parent 9215abb
commit b11124b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ out
 /.settings
 /.classpath
 /.project
+bin/
diff --git a/build.gradle b/build.gradle
@@ -161,6 +161,10 @@ release {
 /* RELEASING */
 
 /* FORMATTING */
+googleJavaFormat {
+  toolVersion = '1.7'
+}
+
 check.dependsOn verifyGoogleJavaFormat
 // to auto-format run ./gradlew googleJavaFormat
 

diff --git a/src/main/java/com/google/cloud/tools/gradle/appengine/util/NullSafe.java b/src/main/java/com/google/cloud/tools/gradle/appengine/util/NullSafe.java
@@ -40,8 +40,7 @@ public static <S, R> R convert(S source, Function<S, R> converter) {
   public static <S, R> List<R> convert(List<S> source, Function<S, R> converter) {
     return (source == null)
         ? null
-        : source
-            .stream()
+        : source.stream()
             .filter(Objects::nonNull)
             .map(converter)
             .filter(Objects::nonNull)

diff --git a/src/test/java/com/google/cloud/tools/gradle/appengine/standard/RunExtensionTest.java b/src/test/java/com/google/cloud/tools/gradle/appengine/standard/RunExtensionTest.java
@@ -80,8 +80,7 @@ public void testProjectAsService_multiModuleBuilds() throws IOException {
 
   private Set<String> getAssembleDependencies(Project project, String taskName) {
     Task task = project.getTasks().findByPath(taskName);
-    return task.getDependsOn()
-        .stream()
+    return task.getDependsOn().stream()
         .filter(t -> t instanceof Task)
         .map(t -> (Task) t)
         .filter(t -> t.getName().equals(BasePlugin.ASSEMBLE_TASK_NAME))