Skip to content

Commit 42118c9

Browse files
authored
Stop using statics in header (#4149)
1 parent 8b23a32 commit 42118c9

File tree

3 files changed

+15
-16
lines changed

3 files changed

+15
-16
lines changed

FirebaseCoreDiagnosticsInterop.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'FirebaseCoreDiagnosticsInterop'
3-
s.version = '1.0.0'
3+
s.version = '1.1.0'
44
s.summary = 'Interfaces that allow other Firebase SDKs to use CoreDiagnostics functionality.'
55

66
s.description = <<-DESC

Interop/CoreDiagnostics/Public/FIRCoreDiagnosticsData.h

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,36 +19,34 @@
1919
NS_ASSUME_NONNULL_BEGIN
2020

2121
/** If present, is a BOOL wrapped in an NSNumber. */
22-
static NSString *const kFIRCDIsDataCollectionDefaultEnabledKey =
23-
@"FIRCDIsDataCollectionDefaultEnabledKey";
22+
#define kFIRCDIsDataCollectionDefaultEnabledKey @"FIRCDIsDataCollectionDefaultEnabledKey"
2423

2524
/** If present, is an int32_t wrapped in an NSNumber. */
26-
static NSString *const kFIRCDConfigurationTypeKey = @"FIRCDConfigurationTypeKey";
25+
#define kFIRCDConfigurationTypeKey @"FIRCDConfigurationTypeKey"
2726

2827
/** If present, is an NSString. */
29-
static NSString *const kFIRCDSdkNameKey = @"FIRCDSdkNameKey";
28+
#define kFIRCDSdkNameKey @"FIRCDSdkNameKey"
3029

3130
/** If present, is an NSString. */
32-
static NSString *const kFIRCDSdkVersionKey = @"FIRCDSdkVersionKey";
31+
#define kFIRCDSdkVersionKey @"FIRCDSdkVersionKey"
3332

3433
/** If present, is an int32_t wrapped in an NSNumber. */
35-
static NSString *const kFIRCDllAppsCountKey = @"FIRCDllAppsCountKey";
34+
#define kFIRCDllAppsCountKey @"FIRCDllAppsCountKey"
3635

3736
/** If present, is an NSString. */
38-
static NSString *const kFIRCDGoogleAppIDKey = @"FIRCDGoogleAppIDKey";
37+
#define kFIRCDGoogleAppIDKey @"FIRCDGoogleAppIDKey"
3938

4039
/** If present, is an NSString. */
41-
static NSString *const kFIRCDBundleIDKey = @"FIRCDBundleID";
40+
#define kFIRCDBundleIDKey @"FIRCDBundleID"
4241

4342
/** If present, is a BOOL wrapped in an NSNumber. */
44-
static NSString *const kFIRCDUsingOptionsFromDefaultPlistKey =
45-
@"FIRCDUsingOptionsFromDefaultPlistKey";
43+
#define kFIRCDUsingOptionsFromDefaultPlistKey @"FIRCDUsingOptionsFromDefaultPlistKey"
4644

4745
/** If present, is an NSString. */
48-
static NSString *const kFIRCDLibraryVersionIDKey = @"FIRCDLibraryVersionIDKey";
46+
#define kFIRCDLibraryVersionIDKey @"FIRCDLibraryVersionIDKey"
4947

5048
/** If present, is an NSString. */
51-
static NSString *const kFIRCDFirebaseUserAgentKey = @"FIRCDFirebaseUserAgentKey";
49+
#define kFIRCDFirebaseUserAgentKey @"FIRCDFirebaseUserAgentKey"
5250

5351
/** Defines the interface of a data object needed to log diagnostics data. */
5452
@protocol FIRCoreDiagnosticsData <NSObject>

scripts/if_changed.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ else
4848
Firebase-pod-lib-lint) # Combines Firebase-* and InAppMessaging*
4949
check_changes '^(Firebase/Auth|Firebase/Database|Firebase/DynamicLinks|'\
5050
'Firebase/Messaging|Firebase/Storage|GoogleUtilities|Interop|Example|'\
51-
'FirebaseAnalyticsIntop.podspec|FirebaseAuth.podspec|FirebaseAuthInterop.podspec|'\
51+
'FirebaseAnalyticsInterop.podspec|FirebaseAuth.podspec|FirebaseAuthInterop.podspec|'\
5252
'FirebaseCoreDiagnostics.podspec|FirebaseCoreDiagnosticsInterop.podspec|'\
5353
'FirebaseDatabase.podspec|FirebaseDynamicLinks.podspec|FirebaseMessaging.podspec|'\
5454
'FirebaseStorage.podspec|FirebaseStorage.podspec|Firebase/InAppMessagingDisplay|'\
@@ -71,7 +71,8 @@ else
7171
;;
7272

7373
Core-*)
74-
check_changes '^(Firebase/Core|Example/Core/Tests|GoogleUtilities|FirebaseCore.podspec)'
74+
check_changes '^(Firebase/Core|Example/Core/Tests|GoogleUtilities|FirebaseCore.podspec'\
75+
'FirebaseCoreDiagnostics.podspec|FirebaseCoreDiagnosticsInterop|FirebaseCoreDiagnosticsInterop.podspec)'
7576
;;
7677

7778
ABTesting-*)
@@ -166,7 +167,7 @@ fi
166167
# Always rebuild if Travis configuration and/or build scripts changed.
167168
check_changes '^.travis.yml'
168169
check_changes '^Gemfile.lock'
169-
check_changes '^scripts/(build|if_changed|install_prereqs|pod_lib_lint).(rb|sh)'
170+
check_changes '^scripts/(build|install_prereqs|pod_lib_lint).(rb|sh)'
170171

171172
if [[ "$run" == true ]]; then
172173
"$@"

0 commit comments

Comments
 (0)