Skip to content

Commit f33276f

Browse files
vimanyuwilhuffpaulb777
authored
Update nanopb py3 0.3.9.5 -> 0.3.9.6 (#6214)
* update nanopb from 0.3.9.5 to 0.3.9.6 This fixes issues building firestore SDK with Python3. Interestingly, latest version 0.4.2 still errors during the build but 0.3.9.6 works. The git commit for this fix in nanopb nanopb/nanopb@63f8e5e * Update generated sources * updating just nanopb dependency version nanopb updated from 0.3.9.5 to 0.3.9.6 (pod version 1.30905.0 to 1.30906.0) * Add missing source specifier * Generated files for protos using nanopb 0.3.9.6 * removed unnecessary whitespaces in files generated by protoc * using more qualified relative paths for header includes * Changelog Co-authored-by: Marek Gilbert <[email protected]> Co-authored-by: Paul Beusterien <[email protected]>
1 parent 160f21a commit f33276f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+65
-56
lines changed

Crashlytics/ProtoSupport/generate_crashlytics_protos.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
readonly DIR="$( git rev-parse --show-toplevel )"
2424

2525
# Current release of nanopb being used to build the CCT protos
26-
readonly NANOPB_VERSION="0.3.9.5"
26+
readonly NANOPB_VERSION="0.3.9.6"
2727
readonly NANOPB_TEMPDIR="${DIR}/Crashlytics/nanopb_temp"
2828

2929
readonly LIBRARY_DIR="${DIR}/Crashlytics/Crashlytics/"

Crashlytics/Protogen/nanopb/crashlytics.nanopb.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
/* Automatically generated nanopb constant definitions */
18-
/* Generated by nanopb-0.3.9.5 */
18+
/* Generated by nanopb-0.3.9.6 */
1919

2020
#include "Crashlytics/Protogen/nanopb/crashlytics.nanopb.h"
2121

@@ -54,6 +54,7 @@ const pb_field_t google_crashlytics_FilesPayload_File_fields[3] = {
5454
#if !defined(PB_FIELD_32BIT)
5555
/* If you get an error here, it means that you need to define PB_FIELD_32BIT
5656
* compile-time option. You can do that in pb.h or on compiler command line.
57+
*
5758
* The reason you need to do this is that some of your messages contain tag
5859
* numbers or field sizes that are larger than what can fit in 8 or 16 bit
5960
* field descriptors.
@@ -64,6 +65,7 @@ PB_STATIC_ASSERT((pb_membersize(google_crashlytics_Report, apple_payload) < 6553
6465
#if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
6566
/* If you get an error here, it means that you need to define PB_FIELD_16BIT
6667
* compile-time option. You can do that in pb.h or on compiler command line.
68+
*
6769
* The reason you need to do this is that some of your messages contain tag
6870
* numbers or field sizes that are larger than what can fit in the default
6971
* 8 bit descriptors.

Crashlytics/Protogen/nanopb/crashlytics.nanopb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
/* Automatically generated nanopb header */
18-
/* Generated by nanopb-0.3.9.5 */
18+
/* Generated by nanopb-0.3.9.6 */
1919

2020
#ifndef PB_GOOGLE_CRASHLYTICS_CRASHLYTICS_NANOPB_H_INCLUDED
2121
#define PB_GOOGLE_CRASHLYTICS_CRASHLYTICS_NANOPB_H_INCLUDED

Firebase/CoreDiagnostics/FIRCDLibrary/Protogen/nanopb/firebasecore.nanopb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
/* Automatically generated nanopb constant definitions */
18-
/* Generated by nanopb-0.3.9.5 */
18+
/* Generated by nanopb-0.3.9.6 */
1919

2020
#include "firebasecore.nanopb.h"
2121

Firebase/CoreDiagnostics/FIRCDLibrary/Protogen/nanopb/firebasecore.nanopb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
/* Automatically generated nanopb header */
18-
/* Generated by nanopb-0.3.9.5 */
18+
/* Generated by nanopb-0.3.9.6 */
1919

2020
#ifndef PB_LOGS_PROTO_MOBILESDK_IOS_FIREBASECORE_NANOPB_H_INCLUDED
2121
#define PB_LOGS_PROTO_MOBILESDK_IOS_FIREBASECORE_NANOPB_H_INCLUDED

Firebase/CoreDiagnostics/ProtoSupport/generate_nanopb_protos.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
readonly REPO_DIR="$( git rev-parse --show-toplevel )"
2424

2525
# Current release of nanopb being used to build the CCT protos
26-
readonly NANOPB_VERSION="0.3.9.5"
26+
readonly NANOPB_VERSION="0.3.9.6"
2727
readonly NANOPB_TEMPDIR="$(mktemp -d)"
2828

2929
readonly LIBRARY_DIR="${REPO_DIR}/Firebase/CoreDiagnostics/FIRCDLibrary"
@@ -53,4 +53,4 @@ python "${REPO_DIR}/Firebase/CoreDiagnostics/ProtoSupport/nanopb_build_protos.py
5353
--output_dir="${PROTOGEN_DIR}" \
5454
--include="${PROTO_DIR}"
5555

56-
rm -rf "${NANOPB_TEMPDIR}"
56+
rm -rf "${NANOPB_TEMPDIR}"

FirebaseCore/CHANGELOG.md

Lines changed: 5 additions & 1 deletion

FirebaseCoreDiagnostics.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ non-Cocoapod integration. This library also respects the Firebase global data co
5555
s.dependency 'GoogleDataTransport', '~> 7.2'
5656
s.dependency 'GoogleUtilities/Environment', '~> 6.7'
5757
s.dependency 'GoogleUtilities/Logger', '~> 6.7'
58-
s.dependency 'nanopb', '~> 1.30905.0'
58+
s.dependency 'nanopb', '~> 1.30906.0'
5959

6060
s.test_spec 'unit' do |unit_tests|
6161
unit_tests.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}

FirebaseCrashlytics.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Pod::Spec.new do |s|
5252
s.dependency 'FirebaseInstallations', '~> 1.6'
5353
s.dependency 'PromisesObjC', '~> 1.2'
5454
s.dependency 'GoogleDataTransport', '~> 7.2'
55-
s.dependency 'nanopb', '~> 1.30905.0'
55+
s.dependency 'nanopb', '~> 1.30906.0'
5656

5757
s.libraries = 'c++', 'z'
5858
s.ios.frameworks = 'Security', 'SystemConfiguration'

FirebaseFirestore.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
7171

7272
s.dependency 'gRPC-C++', '~> 1.28.0'
7373
s.dependency 'leveldb-library', '~> 1.22'
74-
s.dependency 'nanopb', '~> 1.30905.0'
74+
s.dependency 'nanopb', '~> 1.30906.0'
7575

7676
s.ios.frameworks = 'MobileCoreServices', 'SystemConfiguration', 'UIKit'
7777
s.osx.frameworks = 'SystemConfiguration'

0 commit comments

Comments
 (0)