From 85b4423a08e60e83b5cd12ae167134e50eeadf36 Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Tue, 12 Mar 2024 15:21:12 +0200 Subject: [PATCH] ci(all): Update Google Java Format tool (#2674) --- .github/workflows/all_plugins.yaml | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../plus/androidalarmmanager/FlutterBackgroundExecutor.java | 1 + .../example/android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../plus/androidintent/AndroidIntentPlugin.java | 2 +- .../android/app/gradle/wrapper/gradle-wrapper.properties | 2 +- .../dev/fluttercommunity/plus/connectivity/Connectivity.java | 3 ++- 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/all_plugins.yaml b/.github/workflows/all_plugins.yaml index c2468e713a..836b54095f 100644 --- a/.github/workflows/all_plugins.yaml +++ b/.github/workflows/all_plugins.yaml @@ -93,7 +93,7 @@ jobs: - name: "Install Tools" run: | ./.github/workflows/scripts/install-tools.sh - curl -sL https://github.com/google/google-java-format/releases/download/google-java-format-1.3/google-java-format-1.3-all-deps.jar -o $HOME/google-java-format.jar + curl -sL https://github.com/google/google-java-format/releases/download/v1.21.0/google-java-format-1.21.0-all-deps.jar -o $HOME/google-java-format.jar - name: "Bootstrap Workspace" run: melos bootstrap - name: "Validate Dart formatting" diff --git a/packages/android_alarm_manager_plus/android/gradle/wrapper/gradle-wrapper.properties b/packages/android_alarm_manager_plus/android/gradle/wrapper/gradle-wrapper.properties index e921389607..7825683d62 100644 --- a/packages/android_alarm_manager_plus/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/android_alarm_manager_plus/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Oct 05 10:00:26 EEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/FlutterBackgroundExecutor.java b/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/FlutterBackgroundExecutor.java index 4145ea81b5..b333e9c3a6 100644 --- a/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/FlutterBackgroundExecutor.java +++ b/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/FlutterBackgroundExecutor.java @@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.json.JSONException; import org.json.JSONObject; + /** * An background execution abstraction which handles initializing a background isolate running a * callback dispatcher, used to invoke Dart callbacks while backgrounded. diff --git a/packages/android_alarm_manager_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/android_alarm_manager_plus/example/android/gradle/wrapper/gradle-wrapper.properties index 281a79ce92..e1bda4fd50 100644 --- a/packages/android_alarm_manager_plus/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/android_alarm_manager_plus/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Oct 05 12:15:50 EEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/packages/android_intent_plus/android/gradle/wrapper/gradle-wrapper.properties b/packages/android_intent_plus/android/gradle/wrapper/gradle-wrapper.properties index 774fae8767..e411586a54 100644 --- a/packages/android_intent_plus/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/android_intent_plus/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/AndroidIntentPlugin.java b/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/AndroidIntentPlugin.java index 1efef8ec8f..f5fd38176f 100644 --- a/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/AndroidIntentPlugin.java +++ b/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/AndroidIntentPlugin.java @@ -20,7 +20,7 @@ public final class AndroidIntentPlugin implements FlutterPlugin, ActivityAware { *

See {@code io.flutter.plugins.androidintentexample.MainActivity} for an example. */ public AndroidIntentPlugin() { - sender = new IntentSender(/*activity=*/ null, /*applicationContext=*/ null); + sender = new IntentSender(/* activity= */ null, /* applicationContext= */ null); impl = new MethodCallHandlerImpl(sender); } diff --git a/packages/android_intent_plus/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/android_intent_plus/example/android/app/gradle/wrapper/gradle-wrapper.properties index 774fae8767..e411586a54 100644 --- a/packages/android_intent_plus/example/android/app/gradle/wrapper/gradle-wrapper.properties +++ b/packages/android_intent_plus/example/android/app/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java b/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java index 3942342ced..2e54d37758 100644 --- a/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java +++ b/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java @@ -60,7 +60,8 @@ List getNetworkTypes() { types.add(CONNECTIVITY_NONE); } } else { - // For legacy versions, return a single type as before or adapt similarly if multiple types need to be supported + // For legacy versions, return a single type as before or adapt similarly if multiple types + // need to be supported return getNetworkTypesLegacy(); }