diff --git a/.github/workflows/check_code_style.yml b/.github/workflows/check_code_style.yml index 00575150bd3..5a00834c0c0 100644 --- 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 index ccd2e07d3f0..8a420ad3ea4 100644 --- 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 index 8a98071dd82..60ea9b40906 100644 --- 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 index 76cdfeb97d0..861d4e7e9a8 100644 --- 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 index 16c4da75ee4..ad4b42094d1 100644 --- 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 index 5e0f186c41f..649ffb232b2 100644 --- 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 index 47467bb172a..2b23a9ebf56 100644 --- 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 index 9333de87efa..fdcc15c4b24 100644 --- 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 index c631bc555a0..b570aa7bd78 100644 --- 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 Iterable> filter(Iterable> cla } else { // Check for the misspelled annotation. Supercedes supercedes = clazz.getAnnotation(Supercedes.class); - if (supercedes != null) { + if (supercedes != null) { superseded.add(supercedes.value()); } }