File tree Expand file tree Collapse file tree 10 files changed +60
-11
lines changed Expand file tree Collapse file tree 10 files changed +60
-11
lines changed Original file line number Diff line number Diff line change @@ -126,7 +126,8 @@ jobs:
126
126
sanitizers :
127
127
# Don't run on private repo unless it is a PR.
128
128
if : (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
129
- runs-on : macos-11
129
+ # TODO(b/231154868): GRPC 1.44 cause link issues on Mac, moving it to Ubuntu for now and add Mac when it is resolved.
130
+ runs-on : ubuntu-latest
130
131
needs : check
131
132
132
133
strategy :
Original file line number Diff line number Diff line change @@ -174,6 +174,13 @@ else()
174
174
set (ZLIB_ROOT_DIR ${FIREBASE_EXTERNAL_SOURCE_DIR} /zlib )
175
175
endif ()
176
176
177
+ find_package (re2 QUIET )
178
+ if (RE2_FOUND )
179
+ set (gRPC_RE2_PROVIDER package CACHE STRING "Use external re2" )
180
+ else ()
181
+ set (RE2_ROOT_DIR ${FIREBASE_EXTERNAL_SOURCE_DIR} /re2 )
182
+ endif ()
183
+
177
184
set (gRPC_BUILD_TESTS OFF CACHE BOOL "Disable gRPC tests" )
178
185
set (gRPC_BUILD_CODEGEN OFF CACHE BOOL "Disable gRPC codegen" )
179
186
set (gRPC_BUILD_CSHARP_EXT OFF CACHE BOOL "Disable gRPC C# extensions" )
Original file line number Diff line number Diff line change @@ -39,4 +39,5 @@ include(leveldb)
39
39
include (libfuzzer )
40
40
include (nanopb )
41
41
include (protobuf )
42
+ include (re2 )
42
43
include (zlib )
Original file line number Diff line number Diff line change 14
14
15
15
include (ExternalProject )
16
16
17
- set (version 20200225 )
17
+ set (version 20211102.0 )
18
18
19
19
ExternalProject_Add (
20
20
abseil-cpp
21
21
22
22
DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
23
23
DOWNLOAD_NAME abseil-cpp-${version}.tar.gz
24
24
URL https://github.com/abseil/abseil-cpp/archive/${version}.tar.gz
25
- URL_HASH SHA256=728a813291bdec2aa46eab8356ace9f75ac2ed9dfe2df5ab603c4e6c09f1c353
25
+ URL_HASH SHA256=dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4
26
26
27
27
PREFIX ${PROJECT_BINARY_DIR}
28
28
Original file line number Diff line number Diff line change @@ -18,17 +18,16 @@ if(TARGET boringssl)
18
18
return ()
19
19
endif ()
20
20
21
- # Based on https://github.com/grpc/grpc/blob/v1.27.0/bazel/grpc_deps.bzl
22
- # master-with-bazel@{2019-10-18}
23
- set (commit 83da28a68f32023fd3b95a8ae94991a07b1f6c62 )
21
+ # Based on https://github.com/grpc/grpc/blob/v1.44.0/bazel/grpc_deps.bzl
22
+ set (commit b9232f9e27e5668bc0414879dcdedb2a59ea75f2 )
24
23
25
24
ExternalProject_Add (
26
25
boringssl
27
26
28
27
DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
29
28
DOWNLOAD_NAME boringssl-${commit}.tar.gz
30
29
URL https://github.com/google/boringssl/archive/${commit}.tar.gz
31
- URL_HASH SHA256=781fa39693ec2984c71213cd633e9f6589eaaed75e3a9ac413237edec96fd3b9
30
+ URL_HASH SHA256=534fa658bd845fd974b50b10f444d392dfd0d93768c4a51b61263fd37d851c40
32
31
33
32
PREFIX ${PROJECT_BINARY_DIR}
34
33
SOURCE_DIR ${PROJECT_BINARY_DIR} /src/boringssl
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ if(TARGET c-ares)
18
18
return ()
19
19
endif ()
20
20
21
- # Based on https://github.com/grpc/grpc/blob/v1.27 .0/bazel/grpc_deps.bzl
21
+ # Based on https://github.com/grpc/grpc/blob/v1.44 .0/bazel/grpc_deps.bzl
22
22
# v1.15.0, master@{2018-10-23}
23
23
set (commit e982924acee7f7313b4baa4ee5ec000c5e373c30 )
24
24
Original file line number Diff line number Diff line change @@ -18,6 +18,7 @@ include(grpc)
18
18
include (leveldb )
19
19
include (nanopb )
20
20
include (protobuf )
21
+ include (re2 )
21
22
include (libfuzzer )
22
23
23
24
if (TARGET Firestore )
@@ -32,6 +33,7 @@ ExternalProject_Add(
32
33
leveldb
33
34
nanopb
34
35
protobuf
36
+ re2
35
37
libfuzzer
36
38
37
39
# Lay the binary directory out as if this were a subproject. This makes it
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ endif()
20
20
21
21
# Note: googletest lives at head and encourages to just point to a head commit.
22
22
# https://github.com/google/googletest/blob/bf66935e07/README.md?plain=1#L5-L10
23
- set (version bf66935e07825318ae519675d73d0f3e313b3ec6 )
23
+ set (version main )
24
24
25
25
ExternalProject_Add (
26
26
googletest
Original file line number Diff line number Diff line change @@ -18,15 +18,15 @@ if(TARGET grpc)
18
18
return ()
19
19
endif ()
20
20
21
- set (version 1.28 .0 )
21
+ set (version 1.44 .0 )
22
22
23
23
ExternalProject_Add (
24
24
grpc
25
25
26
26
DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
27
27
DOWNLOAD_NAME grpc-${version}.tar.gz
28
28
URL https://github.com/grpc/grpc/archive/v${version}.tar.gz
29
- URL_HASH SHA256=d6277f77e0bb922d3f6f56c0f93292bb4cfabfc3c92b31ee5ccea0e100303612
29
+ URL_HASH SHA256=8c05641b9f91cbc92f51cc4a5b3a226788d7a63f20af4ca7aaca50d92cc94a0d
30
30
31
31
PREFIX ${PROJECT_BINARY_DIR}
32
32
SOURCE_DIR ${PROJECT_BINARY_DIR} /src/grpc
Original file line number Diff line number Diff line change
1
+ # Copyright 2022 Google LLC
2
+ #
3
+ # Licensed under the Apache License, Version 2.0 (the "License");
4
+ # you may not use this file except in compliance with the License.
5
+ # You may obtain a copy of the License at
6
+ #
7
+ # http://www.apache.org/licenses/LICENSE-2.0
8
+ #
9
+ # Unless required by applicable law or agreed to in writing, software
10
+ # distributed under the License is distributed on an "AS IS" BASIS,
11
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ # See the License for the specific language governing permissions and
13
+ # limitations under the License.
14
+
15
+ include (ExternalProject )
16
+
17
+ if (TARGET RE2 )
18
+ return ()
19
+ endif ()
20
+
21
+ # Based on https://github.com/grpc/grpc/blob/v1.44.0/bazel/grpc_deps.bzl
22
+ set (commit 8e08f47b11b413302749c0d8b17a1c94777495d5 )
23
+
24
+ ExternalProject_Add (
25
+ re2
26
+
27
+ 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
31
+
32
+ PREFIX ${PROJECT_BINARY_DIR}
33
+ SOURCE_DIR ${PROJECT_BINARY_DIR} /src/re2
34
+
35
+ CONFIGURE_COMMAND ""
36
+ BUILD_COMMAND ""
37
+ INSTALL_COMMAND ""
38
+ TEST_COMMAND ""
39
+ )
You can’t perform that action at this time.
0 commit comments