Skip to content

Commit b1c17f7

Browse files
committed
change cmake and cocoapods for re2
1 parent 178998d commit b1c17f7

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

FirebaseFirestoreInternal.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
128128
'"${PODS_TARGET_SRCROOT}/Firestore/Source/Public" ' +
129129
'"${PODS_ROOT}/nanopb" ' +
130130
'"${PODS_TARGET_SRCROOT}/Firestore/Protos/nanopb" ' +
131-
'"$(PODS_ROOT)/gRPC-C++/third_party/re2"'
131+
'"${PODS_TARGET_SRCROOT}/Firestore/third_party/re2" '
132132
}
133133

134134
s.compiler_flags = '$(inherited) -Wreorder -Werror=reorder -Wno-comma'

cmake/external/re2.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ if(TARGET RE2)
1818
return()
1919
endif()
2020

21-
# Based on https://github.com/grpc/grpc/blob/v1.44.0/bazel/grpc_deps.bzl
22-
set(commit 8e08f47b11b413302749c0d8b17a1c94777495d5)
21+
# Based on https://github.com/grpc/grpc/blob/v1.69.x/bazel/grpc_deps.bzl
22+
set(version 2022-04-01)
2323

2424
ExternalProject_Add(
2525
re2
2626

2727
DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
28-
DOWNLOAD_NAME re2-${commit}.tar.gz
29-
URL https://github.com/google/re2/archive/${commit}.tar.gz
30-
URL_HASH SHA256=319a58a58d8af295db97dfeecc4e250179c5966beaa2d842a82f0a013b6a239b
28+
DOWNLOAD_NAME re2-${version}.tar.gz
29+
URL https://github.com/google/re2/archive/${version}.tar.gz
30+
URL_HASH SHA256=1ae8ccfdb1066a731bba6ee0881baad5efd2cd661acd9569b689f2586e1a50e9
3131

3232
PREFIX ${PROJECT_BINARY_DIR}
3333
SOURCE_DIR ${PROJECT_BINARY_DIR}/src/re2

0 commit comments

Comments
 (0)