Update google-java-format to 1.25.0

Release notes: https://github.com/google/google-java-format/releases/tag/v1.25.0
MGaetan89 · Nov 22, 2024 · 48b5aa0 · 48b5aa0
1 parent cd13f1d
commit 48b5aa0
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 10 deletions.
diff --git a/.github/workflows/check_code_style.yml b/.github/workflows/check_code_style.yml
@@ -35,7 +35,7 @@ jobs:
 
       - name: Download google-java-format
         run: |
-          googleJavaFormatVersion="1.24.0"
+          googleJavaFormatVersion="1.25.0"
           curl -L -o $HOME/google-java-format.jar https://github.com/google/google-java-format/releases/download/v${googleJavaFormatVersion}/google-java-format-${googleJavaFormatVersion}-all-deps.jar
           curl -L -o $HOME/google-java-format-diff.py https://raw.githubusercontent.com/google/google-java-format/v${googleJavaFormatVersion}/scripts/google-java-format-diff.py
           chmod +x $HOME/google-java-format-diff.py

diff --git a/robolectric/src/main/java/org/robolectric/plugins/SQLiteModeConfigurer.java b/robolectric/src/main/java/org/robolectric/plugins/SQLiteModeConfigurer.java
@@ -1,6 +1,5 @@
 package org.robolectric.plugins;
 
-
 import com.google.auto.service.AutoService;
 import java.util.Properties;
 import javax.annotation.Nonnull;

diff --git a/robolectric/src/test/java/org/robolectric/shadows/ViewStubTest.java b/robolectric/src/test/java/org/robolectric/shadows/ViewStubTest.java
@@ -20,7 +20,6 @@
 import org.robolectric.annotation.ResourcesMode;
 
 @RunWith(AndroidJUnit4.class)
-
 public class ViewStubTest {
   private Context ctxt;
 

diff --git a/robolectric/src/test/java/org/robolectric/shadows/XmlPullParserTest.java b/robolectric/src/test/java/org/robolectric/shadows/XmlPullParserTest.java
@@ -20,7 +20,6 @@
 import org.xmlpull.v1.XmlPullParserException;
 
 @RunWith(AndroidJUnit4.class)
-
 public class XmlPullParserTest {
 
   // emulator output:

diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityRecord.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityRecord.java
@@ -80,7 +80,6 @@ public void setWindowId(int id) {
     reflector(AccessibilityRecordReflector.class, realRecord).setWindowId(id);
   }
 
-
   public View getSourceRoot() {
     return sourceRoot;
   }

diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAssetInputStream.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAssetInputStream.java
@@ -1,7 +1,5 @@
 package org.robolectric.shadows;
 
-
-
 @SuppressWarnings("UnusedDeclaration")
 public abstract class ShadowAssetInputStream {
 

diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWindowManagerGlobal.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWindowManagerGlobal.java
@@ -483,7 +483,7 @@ static BackMotionEvent newBackMotionEvent(
                 edge, // swipe edge
                 null);
       } else {
-            throw new IllegalStateException("Could not find a BackMotionEvent constructor to call");
+        throw new IllegalStateException("Could not find a BackMotionEvent constructor to call");
       }
     }
 

diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/WifiUsabilityStatsEntryBuilder.java b/shadows/framework/src/main/java/org/robolectric/shadows/WifiUsabilityStatsEntryBuilder.java
@@ -1,6 +1,5 @@
 package org.robolectric.shadows;
 
-
 import android.net.wifi.WifiUsabilityStatsEntry;
 import android.net.wifi.WifiUsabilityStatsEntry.ContentionTimeStats;
 import android.net.wifi.WifiUsabilityStatsEntry.RadioStats;

diff --git a/utils/src/main/java/org/robolectric/util/inject/PluginFinder.java b/utils/src/main/java/org/robolectric/util/inject/PluginFinder.java
@@ -84,7 +84,7 @@ private <T> Iterable<Class<? extends T>> filter(Iterable<Class<? extends T>> cla
       } else {
         // Check for the misspelled annotation.
         Supercedes supercedes = clazz.getAnnotation(Supercedes.class);
-      if (supercedes != null) {
+        if (supercedes != null) {
           superseded.add(supercedes.value());
         }
       }
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,7 +80,6 @@ public void setWindowId(int id) { @@
         reflector(AccessibilityRecordReflector.class, realRecord).setWindowId(id);
       }
       public View getSourceRoot() {
         return sourceRoot;
       }
@@ Expand Down @@