Skip to content

Commit 420dfc2

Browse files
authored
Comply with c99 standard (#1992)
* Trigger travis for Firestore podspec changes
1 parent 4c50de6 commit 420dfc2

10 files changed

+23
-8
lines changed

FirebaseAuth.podspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ supports email and password accounts, as well as several 3rd party authenticatio
5555
'Firebase/Auth/CHANGELOG.md'
5656
]
5757
s.pod_target_xcconfig = {
58+
'GCC_C_LANGUAGE_STANDARD' => 'c99',
5859
'GCC_PREPROCESSOR_DEFINITIONS' =>
5960
'FIRAuth_VERSION=' + s.version.to_s +
6061
' FIRAuth_MINOR_VERSION=' + s.version.to_s.split(".")[0] + "." + s.version.to_s.split(".")[1]

FirebaseCore.podspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
3232
]
3333
s.dependency 'GoogleUtilities/Logger', '~> 5.2'
3434
s.pod_target_xcconfig = {
35-
'OTHER_CFLAGS' => '-fno-autolink',
35+
'GCC_C_LANGUAGE_STANDARD' => 'c99',
3636
'GCC_PREPROCESSOR_DEFINITIONS' =>
37-
'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=5.10.0'
37+
'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=5.10.0',
38+
'OTHER_CFLAGS' => '-fno-autolink'
3839
}
3940
end

FirebaseDatabase.podspec

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
3434
s.dependency 'leveldb-library', '~> 1.18'
3535
s.dependency 'FirebaseCore', '~> 5.0'
3636
s.pod_target_xcconfig = {
37+
'GCC_C_LANGUAGE_STANDARD' => 'c99',
3738
'GCC_PREPROCESSOR_DEFINITIONS' =>
38-
'FIRDatabase_VERSION=' + s.version.to_s }
39+
'FIRDatabase_VERSION=' + s.version.to_s
40+
}
3941
end

FirebaseDynamicLinks.podspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ Firebase Dynamic Links are deep links that enhance user experience and increase
3535
s.ios.dependency 'FirebaseAnalyticsInterop', '~> 1.0'
3636

3737
s.pod_target_xcconfig = {
38-
'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"/Firebase',
38+
'GCC_C_LANGUAGE_STANDARD' => 'c99',
3939
'GCC_PREPROCESSOR_DEFINITIONS' => 'FIRDynamicLinks_VERSION=' + s.version.to_s +
40-
' FIRDynamicLinks3P GIN_SCION_LOGGING'
40+
' FIRDynamicLinks3P GIN_SCION_LOGGING',
41+
'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"/Firebase'
4142
}
4243
end

FirebaseFirestore.podspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
6060
s.frameworks = 'MobileCoreServices', 'SystemConfiguration'
6161
s.library = 'c++'
6262
s.pod_target_xcconfig = {
63+
'GCC_C_LANGUAGE_STANDARD' => 'c99',
6364
'GCC_PREPROCESSOR_DEFINITIONS' =>
6465
"FIRFirestore_VERSION=#{s.version} " +
6566
'GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1 ' +

FirebaseFunctions.podspec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,8 @@ iOS SDK for Cloud Functions for Firebase.
2626

2727
s.dependency 'FirebaseCore', '~> 5.0'
2828
s.dependency 'GTMSessionFetcher/Core', '~> 1.1'
29+
30+
s.pod_target_xcconfig = {
31+
'GCC_C_LANGUAGE_STANDARD' => 'c99'
32+
}
2933
end

FirebaseInAppMessagingDisplay.podspec

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ Firebase In-App Messaging SDK.
3333
base_dir + 'Resources/*.png']
3434
}
3535

36-
s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' =>
36+
s.pod_target_xcconfig = {
37+
'GCC_C_LANGUAGE_STANDARD' => 'c99',
38+
'GCC_PREPROCESSOR_DEFINITIONS' =>
3739
'$(inherited) ' +
3840
'FIRInAppMessagingDisplay_LIB_VERSION=' + String(s.version)
3941
}

FirebaseMessaging.podspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ device, and it is completely free.
3131
s.public_header_files = base_dir + 'Public/*.h'
3232
s.library = 'sqlite3'
3333
s.pod_target_xcconfig = {
34+
'GCC_C_LANGUAGE_STANDARD' => 'c99',
3435
'GCC_PREPROCESSOR_DEFINITIONS' =>
3536
'GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1 ' +
3637
'FIRMessaging_LIB_VERSION=' + String(s.version)

FirebaseStorage.podspec

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ Firebase Storage provides robust, secure file uploads and downloads from Firebas
3333
s.dependency 'FirebaseCore', '~> 5.1'
3434
s.dependency 'GTMSessionFetcher/Core', '~> 1.1'
3535
s.pod_target_xcconfig = {
36+
'GCC_C_LANGUAGE_STANDARD' => 'c99',
3637
'GCC_PREPROCESSOR_DEFINITIONS' =>
37-
'FIRStorage_VERSION=' + s.version.to_s }
38+
'FIRStorage_VERSION=' + s.version.to_s
39+
}
3840
end

scripts/if_changed.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ else
5959
;;
6060

6161
Firestore-xcodebuild|Firestore-pod-lib-lint)
62-
check_changes '^Firestore'
62+
check_changes '^(Firestore|FirebaseFirestore.podspec|FirebaseFirestoreSwift.podspec)'
6363
;;
6464

6565
Firestore-cmake)

0 commit comments

Comments
 (0)