Merge remote-tracking branch 'origin/master' into rsgowman/protobuf_cpp

Also "fixed" BadFieldValueTagWithOtherValidTagsPresent test by changing
'false' to 'true'. Details: Depending on the version of nanopb, nanopb
would explicitly encode 'false', which shouldn't be done in proto3. When
it's explicitly encoded, the test worked properly. But when it was
(properly) dropped, the invalid tag is the only field that's actually
encoded, thus violating the assumptions of the test, leading to a test
failure. s/false/true fixes it, as now the boolean_value field is
(properly) encoded regardless of version.

3 files changed, 20 insertions, 19 deletions

diff --git a/scripts/push-pods.sh b/scripts/push-pods.sh
index 9f4c303..b79b76e 100755
--- a/scripts/push-pods.sh
+++ b/scripts/push-pods.sh
@@ -23,18 +23,18 @@
 
 pod cache clean FirebaseCore --all
 #pod cache clean FirebaseAuth --all
-#pod cache clean FirebaseDatabase --all
+pod cache clean FirebaseDatabase --all
 pod cache clean FirebaseFirestore --all
 #pod cache clean FirebaseFunctions --all
-#pod cache clean FirebaseMessaging --all
+pod cache clean FirebaseMessaging --all
 #pod cache clean FirebaseStorage --all
 
 pod repo push cpdc-internal-spec FirebaseCore.podspec
 #pod repo push cpdc-internal-spec FirebaseAuth.podspec
-#pod repo push cpdc-internal-spec FirebaseDatabase.podspec
+pod repo push cpdc-internal-spec FirebaseDatabase.podspec
 pod repo push cpdc-internal-spec FirebaseFirestore.podspec --allow-warnings
 #pod repo push cpdc-internal-spec FirebaseFunctions.podspec
-#pod repo push cpdc-internal-spec FirebaseMessaging.podspec
+pod repo push cpdc-internal-spec FirebaseMessaging.podspec
 #pod repo push cpdc-internal-spec FirebaseStorage.podspec
 
 # FirebaseFirestore warning (no plan to fix)
diff --git a/scripts/style.sh b/scripts/style.sh
index d8825f2..8eff1e8 100755
--- a/scripts/style.sh
+++ b/scripts/style.sh
@@ -122,6 +122,7 @@ s%^./%%
 # Checked-in generated code
 \%\.pb(objc|rpc)\.% d
 \%\.pb\.% d
+\%\.nanopb\.% d
 
 # Format C-ish sources only
 \%\.(h|m|mm|cc|swift)$% p
diff --git a/scripts/update-tags.sh b/scripts/update-tags.sh
index 0c018c3..d321dd8 100755
--- a/scripts/update-tags.sh
+++ b/scripts/update-tags.sh
@@ -27,35 +27,35 @@
 
 # Delete any existing tags at origin
 
-git push --delete origin '5.0.1'
-git push --delete origin 'Core-5.0.1'
+git push --delete origin '5.1.0'
+git push --delete origin 'Core-5.0.2'
 #git push --delete origin 'Auth-5.0.0'
-#git push --delete origin 'Database-5.0.0'
-git push --delete origin 'Firestore-0.12.1'
+git push --delete origin 'Database-5.0.1'
+git push --delete origin 'Firestore-0.12.2'
 #git push --delete origin 'Functions-2.0.0'
-#git push --delete origin 'Messaging-3.0.0'
+git push --delete origin 'Messaging-3.0.1'
 #git push --delete origin 'Storage-3.0.0'
 
 # Delete local tags
 
-git tag --delete '5.0.1'
-git tag --delete 'Core-5.0.1'
+git tag --delete '5.1.0'
+git tag --delete 'Core-5.0.2'
 #git tag --delete 'Auth-5.0.0'
-#git tag --delete 'Database-5.0.0'
-git tag --delete 'Firestore-0.12.1'
+git tag --delete 'Database-5.0.1'
+git tag --delete 'Firestore-0.12.2'
 #git tag --delete 'Functions-2.0.0'
-#git tag --delete 'Messaging-3.0.0'
+git tag --delete 'Messaging-3.0.1'
 #git tag --delete 'Storage-3.0.0'
 
 # Add and push the tags
 
-git tag '5.0.1'
-git tag 'Core-5.0.1'
+git tag '5.1.0'
+git tag 'Core-5.0.2'
 #git tag 'Auth-5.0.0'
-#git tag 'Database-5.0.0'
-git tag 'Firestore-0.12.1'
+git tag 'Database-5.0.1'
+git tag 'Firestore-0.12.2'
 #git tag 'Functions-2.0.0'
-#git tag 'Messaging-3.0.0'
+git tag 'Messaging-3.0.1'
 #git tag 'Storage-3.0.0'
 
 git push origin --tags