Skip to content

Commit a4d2614

Browse files
authored
Remove prerelease abseil code (#558)
* Add abseil bits to the iOS build * Migrate from prerelease to published abseil bits in ordered_code * Remove prerelease abseil code
1 parent 43774fe commit a4d2614

File tree

7 files changed

+16
-1983
lines changed

7 files changed

+16
-1983
lines changed

FirebaseFirestore.podspec

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
3333
'Firestore/Port/**/*',
3434
'Firestore/Protos/objc/**/*.[hm]',
3535
'Firestore/core/src/**/*.{h,cc}',
36-
'Firestore/third_party/Immutable/*.[mh]'
36+
'Firestore/third_party/Immutable/*.[mh]',
37+
'Firestore/third_party/abseil-cpp/absl/*.{h,cc}'
3738
]
3839
s.requires_arc = [
3940
'Firestore/Source/**/*',
@@ -54,9 +55,10 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
5455
s.frameworks = 'MobileCoreServices'
5556
s.library = 'c++'
5657
s.pod_target_xcconfig = {
57-
'GCC_PREPROCESSOR_DEFINITIONS' =>
58-
'GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1 ',
59-
'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
60-
'OTHER_CFLAGS' => '-DFIRFirestore_VERSION=' + s.version.to_s
58+
'GCC_PREPROCESSOR_DEFINITIONS' => 'GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1 ',
59+
'HEADER_SEARCH_PATHS' =>
60+
'"${PODS_TARGET_SRCROOT}" ' +
61+
'"${PODS_TARGET_SRCROOT}/Firestore/third_party/abseil-cpp"',
62+
'OTHER_CFLAGS' => '-DFIRFirestore_VERSION=' + s.version.to_s
6163
}
6264
end

0 commit comments

Comments
 (0)