From f426e6e583a1cdc431b7ed77c1318975fdbf7a29 Mon Sep 17 00:00:00 2001 From: Tejas Deshpande Date: Wed, 11 Nov 2020 13:36:13 -0500 Subject: [PATCH 1/6] Revert "Revert changes in Crashlytics version - as it's causing an issue with the version associated with the crash upload (#6955)" This reverts commit 1adc4a1e6402440573dea2d77d00ba5bf608b88b. --- .../Crashlytics/Components/FIRCLSContext.m | 8 +++++--- .../Controllers/FIRCLSReportUploader.m | 4 ++-- Crashlytics/Crashlytics/FIRCrashlytics.m | 3 ++- Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h | 6 ------ .../Settings/FIRCLSSettingsOnboardingManager.m | 2 +- .../FIRCLSDownloadAndSaveSettingsOperation.m | 2 +- .../Settings/Operations/FIRCLSNetworkOperation.m | 5 +++-- Crashlytics/Shared/FIRCLSConstants.h | 10 ++++++++-- Crashlytics/Shared/FIRCLSConstants.m | 15 +++++++++++++-- FirebaseCrashlytics.podspec | 4 ---- 10 files changed, 35 insertions(+), 24 deletions(-) diff --git a/Crashlytics/Crashlytics/Components/FIRCLSContext.m b/Crashlytics/Crashlytics/Components/FIRCLSContext.m index a7a20e75d23..06effbfebb5 100644 --- a/Crashlytics/Crashlytics/Components/FIRCLSContext.m +++ b/Crashlytics/Crashlytics/Components/FIRCLSContext.m @@ -17,6 +17,8 @@ #include #include +#import "Crashlytics/Shared/FIRCLSConstants.h" + #import "Crashlytics/Crashlytics/Models/FIRCLSFileManager.h" #import "Crashlytics/Crashlytics/Models/FIRCLSInstallIdentifierModel.h" #import "Crashlytics/Crashlytics/Models/FIRCLSInternalReport.h" @@ -400,9 +402,9 @@ static bool FIRCLSContextRecordIdentity(FIRCLSFile* file, const FIRCLSContextIni FIRCLSFileWriteHashStart(file); - FIRCLSFileWriteHashEntryString(file, "generator", CLS_SDK_GENERATOR_NAME); - FIRCLSFileWriteHashEntryString(file, "display_version", CLS_SDK_DISPLAY_VERSION); - FIRCLSFileWriteHashEntryString(file, "build_version", CLS_SDK_DISPLAY_VERSION); + FIRCLSFileWriteHashEntryString(file, "generator", FIRCLSSDKGeneratorName().UTF8String); + FIRCLSFileWriteHashEntryString(file, "display_version", FIRCLSSDKVersion().UTF8String); + FIRCLSFileWriteHashEntryString(file, "build_version", FIRCLSSDKVersion().UTF8String); FIRCLSFileWriteHashEntryUint64(file, "started_at", time(NULL)); FIRCLSFileWriteHashEntryString(file, "session_id", initData->sessionId); diff --git a/Crashlytics/Crashlytics/Controllers/FIRCLSReportUploader.m b/Crashlytics/Crashlytics/Controllers/FIRCLSReportUploader.m index 2a6010080e5..7ca98706478 100644 --- a/Crashlytics/Crashlytics/Controllers/FIRCLSReportUploader.m +++ b/Crashlytics/Crashlytics/Controllers/FIRCLSReportUploader.m @@ -318,7 +318,7 @@ - (NSMutableURLRequest *)mutableRequestWithURL:(NSURL *)url timeout:(NSTimeInter NSString *localeId = [self localeIdentifier]; - [request setValue:@CLS_SDK_GENERATOR_NAME forHTTPHeaderField:FIRCLSNetworkUserAgent]; + [request setValue:FIRCLSSDKGeneratorName() forHTTPHeaderField:FIRCLSNetworkUserAgent]; [request setValue:FIRCLSNetworkApplicationJson forHTTPHeaderField:FIRCLSNetworkAccept]; [request setValue:FIRCLSNetworkUTF8 forHTTPHeaderField:FIRCLSNetworkAcceptCharset]; [request setValue:localeId forHTTPHeaderField:FIRCLSNetworkAcceptLanguage]; @@ -326,7 +326,7 @@ - (NSMutableURLRequest *)mutableRequestWithURL:(NSURL *)url timeout:(NSTimeInter [request setValue:FIRCLSDeveloperToken forHTTPHeaderField:FIRCLSNetworkCrashlyticsDeveloperToken]; [request setValue:FIRCLSApplicationGetSDKBundleID() forHTTPHeaderField:FIRCLSNetworkCrashlyticsAPIClientId]; - [request setValue:@CLS_SDK_DISPLAY_VERSION + [request setValue:FIRCLSSDKVersion() forHTTPHeaderField:FIRCLSNetworkCrashlyticsAPIClientDisplayVersion]; [request setValue:[[self dataSource] googleAppID] forHTTPHeaderField:FIRCLSNetworkCrashlyticsGoogleAppId]; diff --git a/Crashlytics/Crashlytics/FIRCrashlytics.m b/Crashlytics/Crashlytics/FIRCrashlytics.m index 9d2ed5b2791..65606582a7b 100644 --- a/Crashlytics/Crashlytics/FIRCrashlytics.m +++ b/Crashlytics/Crashlytics/FIRCrashlytics.m @@ -37,6 +37,7 @@ #import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h" #import "Crashlytics/Shared/FIRCLSByteUtility.h" +#import "Crashlytics/Shared/FIRCLSConstants.h" #import "Crashlytics/Shared/FIRCLSFABHost.h" #import "Crashlytics/Crashlytics/Controllers/FIRCLSReportManager.h" @@ -94,7 +95,7 @@ - (instancetype)initWithApp:(FIRApp *)app FIRCLSProfileMark mark = FIRCLSProfilingStart(); - NSLog(@"[Firebase/Crashlytics] Version %@", @CLS_SDK_DISPLAY_VERSION); + NSLog(@"[Firebase/Crashlytics] Version %@", FIRCLSSDKVersion()); FIRCLSDeveloperLog("Crashlytics", @"Running on %@, %@ (%@)", FIRCLSHostModelInfo(), FIRCLSHostOSDisplayVersion(), FIRCLSHostOSBuildVersion()); diff --git a/Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h b/Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h index 9f57e532ee8..0cad3064b24 100644 --- a/Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h +++ b/Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h @@ -17,8 +17,6 @@ #include // macro trickiness -#define STR_HELPER(x) #x -#define STR(x) STR_HELPER(x) #define CONCAT_EXPANDED(a, b) a##b #define CONCAT(a, b) CONCAT_EXPANDED(a, b) @@ -47,10 +45,6 @@ #define CLS_TARGET_OS_OSX (TARGET_OS_MAC && !TARGET_OS_IPHONE) #define CLS_TARGET_OS_HAS_UIKIT (TARGET_OS_IOS || TARGET_OS_TV) -#define CLS_SDK_DISPLAY_VERSION STR(DISPLAY_VERSION) - -#define CLS_SDK_GENERATOR_NAME (STR(CLS_SDK_NAME) "/" CLS_SDK_DISPLAY_VERSION) - // arch definitions #if defined(__arm__) || defined(__arm64__) || defined(__arm64e__) #include diff --git a/Crashlytics/Crashlytics/Settings/FIRCLSSettingsOnboardingManager.m b/Crashlytics/Crashlytics/Settings/FIRCLSSettingsOnboardingManager.m index 37e494cd9aa..41b7ffce245 100644 --- a/Crashlytics/Crashlytics/Settings/FIRCLSSettingsOnboardingManager.m +++ b/Crashlytics/Crashlytics/Settings/FIRCLSSettingsOnboardingManager.m @@ -84,7 +84,7 @@ - (void)beginSettingsAndOnboardingWithGoogleAppId:(NSString *)googleAppID // backwards compatibility // TODO(b/141747635) self.kitVersionsByKitBundleIdentifier = @{ - FIRCLSApplicationGetSDKBundleID() : @CLS_SDK_DISPLAY_VERSION, + FIRCLSApplicationGetSDKBundleID() : FIRCLSSDKVersion(), }; [self beginSettingsDownload:token waitForCompletion:waitForCompletion]; diff --git a/Crashlytics/Crashlytics/Settings/Operations/FIRCLSDownloadAndSaveSettingsOperation.m b/Crashlytics/Crashlytics/Settings/Operations/FIRCLSDownloadAndSaveSettingsOperation.m index 75eb70c0604..3eb6b0397e8 100644 --- a/Crashlytics/Crashlytics/Settings/Operations/FIRCLSDownloadAndSaveSettingsOperation.m +++ b/Crashlytics/Crashlytics/Settings/Operations/FIRCLSDownloadAndSaveSettingsOperation.m @@ -88,7 +88,7 @@ - (NSMutableURLRequest *)mutableRequestWithDefaultHTTPHeaderFieldsAndTimeoutForU forHTTPHeaderField:@"X-Crashlytics-OS-Build-Version"]; [request setValue:FIRCLSHostOSDisplayVersion() forHTTPHeaderField:@"X-Crashlytics-OS-Display-Version"]; - [request setValue:FIRCLSVersion forHTTPHeaderField:@"X-Crashlytics-API-Client-Version"]; + [request setValue:FIRCLSSDKVersion() forHTTPHeaderField:@"X-Crashlytics-API-Client-Version"]; return request; } diff --git a/Crashlytics/Crashlytics/Settings/Operations/FIRCLSNetworkOperation.m b/Crashlytics/Crashlytics/Settings/Operations/FIRCLSNetworkOperation.m index 8c857ff2aab..f55cebfdc95 100644 --- a/Crashlytics/Crashlytics/Settings/Operations/FIRCLSNetworkOperation.m +++ b/Crashlytics/Crashlytics/Settings/Operations/FIRCLSNetworkOperation.m @@ -74,7 +74,7 @@ - (NSMutableURLRequest *)mutableRequestWithDefaultHTTPHeadersForURL:(NSURL *)url [request setValue:FIRCLSDeveloperToken forHTTPHeaderField:FIRCLSNetworkCrashlyticsDeveloperToken]; [request setValue:FIRCLSApplicationGetSDKBundleID() forHTTPHeaderField:FIRCLSNetworkCrashlyticsAPIClientId]; - [request setValue:FIRCLSVersion + [request setValue:FIRCLSSDKVersion() forHTTPHeaderField:FIRCLSNetworkCrashlyticsAPIClientDisplayVersion]; [request setValue:self.googleAppID forHTTPHeaderField:FIRCLSNetworkCrashlyticsGoogleAppId]; @@ -82,7 +82,8 @@ - (NSMutableURLRequest *)mutableRequestWithDefaultHTTPHeadersForURL:(NSURL *)url } - (NSString *)userAgentString { - return [NSString stringWithFormat:@"%@/%@", FIRCLSApplicationGetSDKBundleID(), FIRCLSVersion]; + return + [NSString stringWithFormat:@"%@/%@", FIRCLSApplicationGetSDKBundleID(), FIRCLSSDKVersion()]; } - (NSString *)localeIdentifier { diff --git a/Crashlytics/Shared/FIRCLSConstants.h b/Crashlytics/Shared/FIRCLSConstants.h index c17ee02c5f3..c7034c61e39 100644 --- a/Crashlytics/Shared/FIRCLSConstants.h +++ b/Crashlytics/Shared/FIRCLSConstants.h @@ -14,9 +14,9 @@ #import -FOUNDATION_EXPORT NSString *const FIRCLSDeveloperToken; +NS_ASSUME_NONNULL_BEGIN -FOUNDATION_EXPORT NSString *const FIRCLSVersion; +FOUNDATION_EXPORT NSString *const FIRCLSDeveloperToken; // User Messages FOUNDATION_EXPORT NSString *const FIRCLSMissingConsumerKeyMsg; @@ -43,3 +43,9 @@ FOUNDATION_EXPORT NSString *const FIRCLSNetworkCrashlyticsGoogleAppId; FOUNDATION_EXPORT NSString *const FIRCLSNetworkCrashlyticsOrgId; FOUNDATION_EXPORT NSString *const FIRCLSNetworkUserAgent; FOUNDATION_EXPORT NSString *const FIRCLSNetworkUTF8; + +NSString *FIRCLSSDKGeneratorName(void); + +NSString *FIRCLSSDKVersion(void); + +NS_ASSUME_NONNULL_END diff --git a/Crashlytics/Shared/FIRCLSConstants.m b/Crashlytics/Shared/FIRCLSConstants.m index e9f58760ca6..2f1fd7fc9fe 100644 --- a/Crashlytics/Shared/FIRCLSConstants.m +++ b/Crashlytics/Shared/FIRCLSConstants.m @@ -13,14 +13,13 @@ // limitations under the License. #import "Crashlytics/Shared/FIRCLSConstants.h" +#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #define STR_HELPER(x) #x #define STR(x) STR_HELPER(x) NSString* const FIRCLSDeveloperToken = @"77f0789d8e230eccdb4b99b82dccd78d47f9b604"; -NSString* const FIRCLSVersion = @STR(DISPLAY_VERSION); - // User Messages NSString* const FIRCLSMissingConsumerKeyMsg = @"consumer key is nil or zero length"; NSString* const FIRCLSMissingConsumerSecretMsg = @"consumer secret is nil or zero length"; @@ -47,3 +46,15 @@ NSString* const FIRCLSNetworkCrashlyticsOrgId = @"X-Crashlytics-Org-Id"; NSString* const FIRCLSNetworkUserAgent = @"User-Agent"; NSString* const FIRCLSNetworkUTF8 = @"utf-8"; + +NSString* FIRCLSSDKGeneratorName(void) { + return [NSString stringWithFormat:@"%s / %s", STR(CLS_SDK_NAME), FIRFirebaseVersion().UTF8String]; +} + +NSString* FIRCLSSDKVersion(void) { +#ifdef CRASHLYTICS_1P + return [FIRFirebaseVersion() stringByAppendingString:@"_1P"]; +#else + return FIRFirebaseVersion(); +#endif +} diff --git a/FirebaseCrashlytics.podspec b/FirebaseCrashlytics.podspec index 9e11b46368a..b7bedeef32c 100644 --- a/FirebaseCrashlytics.podspec +++ b/FirebaseCrashlytics.podspec @@ -62,7 +62,6 @@ Pod::Spec.new do |s| s.ios.pod_target_xcconfig = { 'GCC_C_LANGUAGE_STANDARD' => 'c99', 'GCC_PREPROCESSOR_DEFINITIONS' => - 'DISPLAY_VERSION=' + s.version.to_s + ' ' + 'CLS_SDK_NAME="Crashlytics iOS SDK" ' + # For nanopb: 'PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1', @@ -72,7 +71,6 @@ Pod::Spec.new do |s| s.osx.pod_target_xcconfig = { 'GCC_C_LANGUAGE_STANDARD' => 'c99', 'GCC_PREPROCESSOR_DEFINITIONS' => - 'DISPLAY_VERSION=' + s.version.to_s + ' ' + 'CLS_SDK_NAME="Crashlytics Mac SDK" ' + # For nanopb: 'PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1', @@ -82,7 +80,6 @@ Pod::Spec.new do |s| s.tvos.pod_target_xcconfig = { 'GCC_C_LANGUAGE_STANDARD' => 'c99', 'GCC_PREPROCESSOR_DEFINITIONS' => - 'DISPLAY_VERSION=' + s.version.to_s + ' ' + 'CLS_SDK_NAME="Crashlytics tvOS SDK" ' + # For nanopb: 'PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1', @@ -92,7 +89,6 @@ Pod::Spec.new do |s| s.watchos.pod_target_xcconfig = { 'GCC_C_LANGUAGE_STANDARD' => 'c99', 'GCC_PREPROCESSOR_DEFINITIONS' => - 'DISPLAY_VERSION=' + s.version.to_s + ' ' + 'CLS_SDK_NAME="Crashlytics watchOS SDK" ' + # For nanopb: 'PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1', From a8abd5e3739e2dfa1a7885ea1932a56f7293829d Mon Sep 17 00:00:00 2001 From: Tejas Deshpande Date: Wed, 11 Nov 2020 13:40:11 -0500 Subject: [PATCH 2/6] Fix the issue that was causing the problem --- Crashlytics/Shared/FIRCLSConstants.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Crashlytics/Shared/FIRCLSConstants.m b/Crashlytics/Shared/FIRCLSConstants.m index 2f1fd7fc9fe..44a3447daf0 100644 --- a/Crashlytics/Shared/FIRCLSConstants.m +++ b/Crashlytics/Shared/FIRCLSConstants.m @@ -48,7 +48,7 @@ NSString* const FIRCLSNetworkUTF8 = @"utf-8"; NSString* FIRCLSSDKGeneratorName(void) { - return [NSString stringWithFormat:@"%s / %s", STR(CLS_SDK_NAME), FIRFirebaseVersion().UTF8String]; + return [NSString stringWithFormat:@"%s/%s", STR(CLS_SDK_NAME), FIRCLSSDKVersion().UTF8String]; } NSString* FIRCLSSDKVersion(void) { From 3f0f9c85a275f9770431917cf7b29fd386c57f73 Mon Sep 17 00:00:00 2001 From: Tejas Deshpande Date: Wed, 11 Nov 2020 14:03:16 -0500 Subject: [PATCH 3/6] Add unit test to make sure this is caught in case of changes. --- .../Protogen/nanopb/crashlytics.nanopb.c | 6 +-- Crashlytics/UnitTests/FIRCLSConstantsTest.m | 37 +++++++++++++++++++ Crashlytics/generate_project.sh | 2 +- 3 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 Crashlytics/UnitTests/FIRCLSConstantsTest.m diff --git a/Crashlytics/Protogen/nanopb/crashlytics.nanopb.c b/Crashlytics/Protogen/nanopb/crashlytics.nanopb.c index 1ef7dc842d1..23f41d90ab4 100644 --- a/Crashlytics/Protogen/nanopb/crashlytics.nanopb.c +++ b/Crashlytics/Protogen/nanopb/crashlytics.nanopb.c @@ -17,7 +17,7 @@ /* Automatically generated nanopb constant definitions */ /* Generated by nanopb-0.3.9.6 */ -#include "Crashlytics/Protogen/nanopb/crashlytics.nanopb.h" +#include "crashlytics.nanopb.h" /* @@protoc_insertion_point(includes) */ #if PB_PROTO_HEADER_VERSION != 30 @@ -54,7 +54,7 @@ const pb_field_t google_crashlytics_FilesPayload_File_fields[3] = { #if !defined(PB_FIELD_32BIT) /* If you get an error here, it means that you need to define PB_FIELD_32BIT * compile-time option. You can do that in pb.h or on compiler command line. - * + * * The reason you need to do this is that some of your messages contain tag * numbers or field sizes that are larger than what can fit in 8 or 16 bit * field descriptors. @@ -65,7 +65,7 @@ PB_STATIC_ASSERT((pb_membersize(google_crashlytics_Report, apple_payload) < 6553 #if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT) /* If you get an error here, it means that you need to define PB_FIELD_16BIT * compile-time option. You can do that in pb.h or on compiler command line. - * + * * The reason you need to do this is that some of your messages contain tag * numbers or field sizes that are larger than what can fit in the default * 8 bit descriptors. diff --git a/Crashlytics/UnitTests/FIRCLSConstantsTest.m b/Crashlytics/UnitTests/FIRCLSConstantsTest.m new file mode 100644 index 00000000000..c0edd80702e --- /dev/null +++ b/Crashlytics/UnitTests/FIRCLSConstantsTest.m @@ -0,0 +1,37 @@ +// +// FIRCLSConstantsTest.m +// FirebaseCrashlytics-iOS-Unit-unit +// +// Created by Tejas Deshpande on 11/11/20. +// + +#import + +#import "Crashlytics/Shared/FIRCLSConstants.h" +#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" + +#define STR_HELPER(x) #x +#define STR(x) STR_HELPER(x) + +@interface FIRCLSConstantsTest : XCTestCase + +@end + +@implementation FIRCLSConstantsTest + +- (void)testGeneratorName { + NSString *expectedGeneratorName = + [NSString stringWithFormat:@"%s/%s", STR(CLS_SDK_NAME), FIRCLSSDKVersion().UTF8String]; + XCTAssertEqualObjects(expectedGeneratorName, FIRCLSSDKGeneratorName()); +} + +- (void)testSdkVersion { +#ifdef CRASHLYTICS_1P + NSString *expectedSdkVersion = [FIRFirebaseVersion() stringByAppendingString:@"_1P"]; +#else + NSString *expectedSdkVersion = FIRFirebaseVersion(); +#endif + XCTAssertEqualObjects(expectedSdkVersion, FIRCLSSDKVersion()); +} + +@end diff --git a/Crashlytics/generate_project.sh b/Crashlytics/generate_project.sh index ab499d445bf..c098132cba5 100755 --- a/Crashlytics/generate_project.sh +++ b/Crashlytics/generate_project.sh @@ -19,4 +19,4 @@ readonly DIR="$( git rev-parse --show-toplevel )" "$DIR/Crashlytics/ProtoSupport/generate_crashlytics_protos.sh" || echo "Something went wrong generating protos."; -pod gen "${DIR}/FirebaseCrashlytics.podspec" --auto-open --gen-directory="${DIR}/gen" --local-sources="${DIR}" --platforms=ios,macos,tvos,watchos --clean +pod gen "${DIR}/FirebaseCrashlytics.podspec" --auto-open --gen-directory="${DIR}/gen" --local-sources="${DIR}" --platforms=ios,macos,tvos --clean From 63eddb1f4ded1976f0b89143ac573146071ef05f Mon Sep 17 00:00:00 2001 From: Tejas Deshpande Date: Wed, 11 Nov 2020 14:14:18 -0500 Subject: [PATCH 4/6] Revert change needed for generate_project script to work locally --- Crashlytics/generate_project.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Crashlytics/generate_project.sh b/Crashlytics/generate_project.sh index c098132cba5..ab499d445bf 100755 --- a/Crashlytics/generate_project.sh +++ b/Crashlytics/generate_project.sh @@ -19,4 +19,4 @@ readonly DIR="$( git rev-parse --show-toplevel )" "$DIR/Crashlytics/ProtoSupport/generate_crashlytics_protos.sh" || echo "Something went wrong generating protos."; -pod gen "${DIR}/FirebaseCrashlytics.podspec" --auto-open --gen-directory="${DIR}/gen" --local-sources="${DIR}" --platforms=ios,macos,tvos --clean +pod gen "${DIR}/FirebaseCrashlytics.podspec" --auto-open --gen-directory="${DIR}/gen" --local-sources="${DIR}" --platforms=ios,macos,tvos,watchos --clean From 3b2ffa950029b5fc5f81c67dc87b5ab73a724dbe Mon Sep 17 00:00:00 2001 From: Tejas Deshpande Date: Wed, 11 Nov 2020 14:23:33 -0500 Subject: [PATCH 5/6] Revert Crashlytics/Protogen/nanopb/crashlytics.nanopb.c --- Crashlytics/Protogen/nanopb/crashlytics.nanopb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Crashlytics/Protogen/nanopb/crashlytics.nanopb.c b/Crashlytics/Protogen/nanopb/crashlytics.nanopb.c index 23f41d90ab4..1ef7dc842d1 100644 --- a/Crashlytics/Protogen/nanopb/crashlytics.nanopb.c +++ b/Crashlytics/Protogen/nanopb/crashlytics.nanopb.c @@ -17,7 +17,7 @@ /* Automatically generated nanopb constant definitions */ /* Generated by nanopb-0.3.9.6 */ -#include "crashlytics.nanopb.h" +#include "Crashlytics/Protogen/nanopb/crashlytics.nanopb.h" /* @@protoc_insertion_point(includes) */ #if PB_PROTO_HEADER_VERSION != 30 @@ -54,7 +54,7 @@ const pb_field_t google_crashlytics_FilesPayload_File_fields[3] = { #if !defined(PB_FIELD_32BIT) /* If you get an error here, it means that you need to define PB_FIELD_32BIT * compile-time option. You can do that in pb.h or on compiler command line. - * + * * The reason you need to do this is that some of your messages contain tag * numbers or field sizes that are larger than what can fit in 8 or 16 bit * field descriptors. @@ -65,7 +65,7 @@ PB_STATIC_ASSERT((pb_membersize(google_crashlytics_Report, apple_payload) < 6553 #if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT) /* If you get an error here, it means that you need to define PB_FIELD_16BIT * compile-time option. You can do that in pb.h or on compiler command line. - * + * * The reason you need to do this is that some of your messages contain tag * numbers or field sizes that are larger than what can fit in the default * 8 bit descriptors. From 7079b5574031a8c01b4a576e4dfac9bdb6027f4a Mon Sep 17 00:00:00 2001 From: Tejas Deshpande Date: Wed, 11 Nov 2020 14:29:23 -0500 Subject: [PATCH 6/6] Fix copyright --- Crashlytics/UnitTests/FIRCLSConstantsTest.m | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Crashlytics/UnitTests/FIRCLSConstantsTest.m b/Crashlytics/UnitTests/FIRCLSConstantsTest.m index c0edd80702e..62c3c6cfb82 100644 --- a/Crashlytics/UnitTests/FIRCLSConstantsTest.m +++ b/Crashlytics/UnitTests/FIRCLSConstantsTest.m @@ -1,9 +1,16 @@ +// Copyright 2020 Google LLC // -// FIRCLSConstantsTest.m -// FirebaseCrashlytics-iOS-Unit-unit +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // -// Created by Tejas Deshpande on 11/11/20. +// http://www.apache.org/licenses/LICENSE-2.0 // +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. #import