From 788acbded0474730576b3505a4b8606b1efd5406 Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Sat, 11 Jul 2026 13:17:26 -0500
Subject: [PATCH] style(lint, android): format+ignore version file to avoid
 flaky lint exit

---
 .yarnrc.yml                                |  1 +
 package.json                               |  4 ++--
 packages/app/scripts/genversion-android.js |  4 ++--
 yarn.lock                                  | 10 +++++-----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.yarnrc.yml b/.yarnrc.yml
index 1cdf733628..449bfdadb0 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -49,3 +49,4 @@ npmPreapprovedPackages:
   - '@react-native-firebase/*'
   - 'firebase@12.15.0' # If adopting recent firebase-js-sdk, specify directly here
   - 'firebase-tools@15.22.4'
+  - 'google-java-format@2.3.0'
diff --git a/package.json b/package.json
index a33b152201..9d1e1a03ce 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "codegen:verify": "node ./scripts/codegen-verify.mjs && git diff --exit-code -- 'packages/*/android/**/generated/**' 'packages/*/ios/generated/**'",
     "lint": "yarn lint:js && yarn lint:android && yarn lint:ios:check",
     "lint:js": "eslint packages/* --max-warnings=0",
-    "lint:android": "(find packages/*/android/src -name '*.java' -not -path '*/generated/*' -print0 | xargs -0 google-java-format --set-exit-if-changed --replace || (echo \"\n\nandroid formatting error - please re-run\n\n\" && exit 1)) && (git diff --exit-code packages/*/android/src || (echo \"\n\nandroid files changed from linting, please examine and commit result\n\n\" && exit 1))",
+    "lint:android": "(find packages/*/android/src -name '*.java' -not -path '*/generated/*' ! -name 'ReactNativeFirebaseVersion.java' -print0 | xargs -0 google-java-format --set-exit-if-changed --replace || (echo \"\n\nandroid formatting error - please re-run\n\n\" && exit 1)) && (git diff --exit-code packages/*/android/src || (echo \"\n\nandroid files changed from linting, please examine and commit result\n\n\" && exit 1))",
     "lint:ios:check": "find packages/*/ios -type f \\( -name '*.h' -o -name '*.cpp' -o -name '*.m' -o -name '*.mm' \\) -not -path '*/generated/*' -print0 | xargs -0 clang-format --style=Google -n -Werror",
     "lint:ios:fix": "find packages/*/ios -type f \\( -name '*.h' -o -name '*.cpp' -o -name '*.m' -o -name '*.mm' \\) -not -path '*/generated/*' -print0 | xargs -0 clang-format -i --style=Google",
     "lint:markdown": "eslint \"docs/**/*.mdx\" --max-warnings=0 && prettier --check \"docs/**/*.mdx\"",
@@ -105,7 +105,7 @@
     "firebase": "^12.15.0",
     "firebase-tools": "^15.22.4",
     "genversion": "^3.2.0",
-    "google-java-format": "^2.2.0",
+    "google-java-format": "^2.3.0",
     "jest": "^30.3.0",
     "lerna": "^9.0.7",
     "patch-package": "^8.0.1",
diff --git a/packages/app/scripts/genversion-android.js b/packages/app/scripts/genversion-android.js
index 12af85b744..f8896d61f8 100644
--- a/packages/app/scripts/genversion-android.js
+++ b/packages/app/scripts/genversion-android.js
@@ -17,8 +17,8 @@ const outputPath = path.resolve(
   'src/reactnative/java/io/invertase/firebase/app',
   'ReactNativeFirebaseVersion.java',
 );
-const template = `
-package io.invertase.firebase.app;
+const template = `package io.invertase.firebase.app;
+
 /*
  * Copyright (c) 2016-present Invertase Limited & Contributors
  *
diff --git a/yarn.lock b/yarn.lock
index a68ee1efb2..0bf8582f94 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13406,16 +13406,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"google-java-format@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "google-java-format@npm:2.2.0"
+"google-java-format@npm:^2.3.0":
+  version: 2.3.0
+  resolution: "google-java-format@npm:2.3.0"
   dependencies:
     async: "npm:^3.2.6"
     glob: "npm:^13.0.0"
     resolve: "npm:^1.22.11"
   bin:
     google-java-format: index.js
-  checksum: 10/32bf7cffca834e79a32036baff49fd4e57bf5db19f050cebfa217c2edff1d9031dd65ae66986bb5ddc50b1e304fc380024fb5f0ef9675095ec0a6493e74227c5
+  checksum: 10/1f3af54590bb9422b051ef04281d505647a9beb6c63ce893d5126e57217149f349f8bfc1e74df83073a30e2b9c7db065dba3d79fd601ea2239a795f78ebf9dbb
   languageName: node
   linkType: hard
 
@@ -21393,7 +21393,7 @@ __metadata:
     firebase: "npm:^12.15.0"
     firebase-tools: "npm:^15.22.4"
     genversion: "npm:^3.2.0"
-    google-java-format: "npm:^2.2.0"
+    google-java-format: "npm:^2.3.0"
     jest: "npm:^30.3.0"
     lerna: "npm:^9.0.7"
     patch-package: "npm:^8.0.1"