8000 Merge branch 'main' into swift · compnerd/firebase-cpp-sdk@cf26dae · GitHub
[go: up one dir, main page]
Skip to content

Commit cf26dae

Browse files
jonsimantovjonsimantov
authored
Merge branch 'main' into swift
2 parents 09a1620 + ed6c14c commit cf26dae

File tree

188 files changed

+5495
-818
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+5495
-818
lines changed

‎.github/workflows/checks.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup python
2626
uses: actions/setup-python@v4
2727
with:
28-
python-version: 3.7
28+
python-version: 3.8
2929
- name: Install prerequisites
3030
run: python scripts/gha/install_prereqs_desktop.py
3131
- name: log clang format version
@@ -57,7 +57,7 @@ jobs:
5757
- name: Setup python
5858
uses: actions/setup-python@v4
5959
with:
60-
python-version: 3.7
60+
python-version: 3.8
6161
- name: Install prerequisites
6262
run: |
6363
python scripts/gha/install_prereqs_desktop.py
@@ -111,16 +111,19 @@ jobs:
111111
- name: Check whether release notes have been updated
112112
# Skip this if the PR has the skipReleaseNotes label or if it's a merge to other than main.
113113
if: ${{!contains(github.event.pull_request.labels.*.name, env.skipReleaseNotesLabel) && (github.event.pull_request.base.ref == 'main')}}
114+
env:
115+
HEAD_REF: ${{github.event.pull_request.head.ref}}
116+
BASE_REF: ${{github.event.pull_request.base.ref}}
114117
run: |
115118
set -e
116119
# Filename to check.
117120
README_FILE=release_build_files/readme.md
118121
# Determine the github merge base - same logic as integration_tests.yml
119122
# "git merge-base main branch_name" will give the common ancestor of both branches.
120-
MERGE_BASE=$(git merge-base origin/${{github.event.pull_request.head.ref}} origin/${{github.event.pull_request.base.ref}} || true)
123+
MERGE_BASE=$(git merge-base "origin/${HEAD_REF}" "origin/${BASE_REF}" || true)
121124
# If MERGE_BASE can't be determined, ignore this check, something odd is going on.
122125
if [[ -n "${MERGE_BASE}" ]]; then
123-
DIFF_RESULT=$(git diff --name-only "origin/${{github.event.pull_request.head.ref}}..${MERGE_BASE}" -- "${README_FILE}")
126+
DIFF_RESULT=$(git diff --name-only "origin/${HEAD_REF}..${MERGE_BASE}" -- "${README_FILE}")
124127
if [[ "${DIFF_RESULT}" != "${README_FILE}" ]]; then
125128
echo "::error ::Please update release notes (${README_FILE}) or add '${{env.skipReleaseNotesLabel}}' label."
126129
exit 1

‎.github/workflows/checks_secure.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
if: steps.check.outputs.has-permission != 1 || github.event.pull_request.head.repo.full_name != github.repository
3232
uses: actions/setup-python@v4
3333
with:
34-
python-version: 3.7
34+
python-version: 3.8
3535
- name: Install prerequisites
3636
if: steps.check.outputs.has-permission != 1 || github.event.pull_request.head.repo.full_name != github.repository
3737
run: pip install -r scripts/gha/python_requirements.txt

‎.github/workflows/cpp-packaging.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
- name: Setup python
9898
uses: actions/setup-python@v4
9999
with:
100-
python-version: 3.7
100+
python-version: 3.8
101101

102102
- name: Fetch and build binutils
103103
run: |
@@ -207,7 +207,7 @@ jobs:
207207
- name: Setup python
208208
uses: act 10000 ions/setup-python@v4
209209
with:
210-
python-version: 3.7
210+
python-version: 3.8
211211

212212
- name: install prerequisites
213213
run: sdk-src/build_scripts/ios/install_prereqs.sh
@@ -310,7 +310,7 @@ jobs:
310310
architecture: ["x64", "x86", "arm64"]
311311
msvc_runtime: ["static", "dynamic"]
312312
linux_abi: ["legacy", "c++11"]
313-
python_version: [3.7]
313+
python_version: [3.8]
314314
include:
315315
- os: windows-latest
316316
vcpkg_triplet_suffix: "windows-static"
@@ -518,7 +518,7 @@ jobs:
518518
- name: Setup python
519519
uses: actions/setup-python@v4
520520
with:
521-
python-version: 3.7
521+
python-version: 3.8
522522

523523
- name: Install prerequisites
524524
run: |
@@ -837,7 +837,7 @@ jobs:
837837
- name: Setup python
838838
uses: actions/setup-python@v4
839839
with:
840-
python-version: '3.7'
840+
python-version: '3.8'
841841
- name: Use expanded matrix
842842
if: github.event_name == 'schedule' || github.event.inputs.use_expanded_matrix == '1'
843843
run: |

‎.github/workflows/desktop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,10 +343,10 @@ jobs:
343343
if [[ "${{ job.status }}" != "success" ]]; then
344344
exit 1
345345
fi
346-
- name: Set up Node (16)
346+
- name: Set up Node (18)
347347
uses: actions/setup-node@v3
348348
with:
349-
node-version: 16.x
349+
node-version: 18.x
350350
- name: Setup Firestore Emulator
351351
uses: nick-invision/retry@v2
352352
with:

‎.github/workflows/integration_tests.yml

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ env:
4646
triggerLabelPrefix: "tests-requested: "
4747
triggerLabelFull: "tests-requested: full"
4848
triggerLabelQuick: "tests-requested: quick"
49-
pythonVersion: '3.7'
49+
pythonVersion: '3.8'
5050
xcodeVersion: '14.1'
5151
artifactRetentionDays: 2
5252
GITHUB_TOKEN: ${{ github.token }}
@@ -164,6 +164,9 @@ jobs:
164164
shell: bash
165165
command: pip install -r scripts/gha/python_requirements.txt
166166
- id: matrix_config
167+
env:
168+
HEAD_REF: ${{github.event.pull_request.head.ref}}
169+
BASE_REF: ${{github.event.pull_request.base.ref}}
167170
run: |
168171
if [[ "${{ steps.set_outputs.outputs.requested_tests }}" == "expanded" ]]; then
169172
TEST_MATRIX_PARAM=-e=1
@@ -174,12 +177,12 @@ jobs:
174177
elif [[ "${{ steps.set_outputs.outputs.requested_tests }}" == "auto" ]]; then
175178
# auto-diff only apply when running in a PR.
176179
# diff against the PR's base. "git merge-base main branch_name" will give the common ancestor of both branches.
177-
MERGE_BASE=$(git merge-base origin/${{github.event.pull_request.head.ref}} origin/${{github.event.pull_request.base.ref}} || true)
180+
MERGE_BASE=$(git merge-base "origin/${HEAD_REF}" "origin/${BASE_REF}" || true)
178181
# If origin/<branch> is no longer valid, then just run all tests.
179182
if [[ -n "${MERGE_BASE}" ]]; then
180-
echo "::warning ::Auto-diff origin/${{github.event.pull_request.head.ref}}..${MERGE_BASE}"
181-
git diff --name-only origin/${{github.event.pull_request.head.ref}}..${MERGE_BASE}
182-
TEST_MATRIX_PARAM="--auto_diff origin/${{github.event.pull_request.head.ref}}..${MERGE_BASE}"
183+
echo "::warning ::Auto-diff origin/${HEAD_REF}..${MERGE_BASE}"
184+
git diff --name-only "origin/${HEAD_REF}..${MERGE_BASE}"
185+
TEST_MATRIX_PARAM="--auto_diff origin/${HEAD_REF}..${MERGE_BASE}"
183186
fi
184187
fi
185188
@@ -188,12 +191,13 @@ jobs:
188191
if [[ "${{ github.event.schedule }}" == "0 9 * * *" ]]; then
189192
# at 1am PST/2am PDT. Running integration tests and generate test report for all testapps except firestore
190193
apis="analytics,app_check,auth,database,dynamic_links,functions,gma,installations,messaging,remote_config,storage"
194+
echo "::warning ::Running main nightly tests"
191195
elif [[ "${{ github.event.schedule }}" == "0 10 * * *" || "${{ github.event.schedule }}" == "0 11 * * *" ]]; then
192196
# at 2am PST/3am PDT and 3am PST/4am PDT. Running integration tests for firestore and generate test report.
193197
echo "::warning ::Running Firestore nightly tests"
194198
apis="firestore"
195199
else
196-
echo "::warning ::Running main nightly tests"
200+
echo "::warning ::Running pull request tests"
197201
apis=$( python scripts/gha/print_matrix_configuration.py -c -w integration_tests -k apis -o "${{github.event.inputs.apis}}" ${TEST_MATRIX_PARAM} )
198202
fi
199203
if [[ "${{ github.event.schedule }}" == "0 11 * * *" ]]; then
@@ -762,17 +766,22 @@ jobs:
762766
timeout_minutes: 15
763767
max_attempts: 3
764768
command: scripts/gha/install_test_workflow_prereqs.sh -p Desktop -t true -a '${{ matrix.arch }}' -s '${{ matrix.ssl_variant }}'
765-
- name: Set up Node (16)
769+
- name: Set up Node (18)
766770
uses: actions/setup-node@v3
767771
with:
768-
node-version: 16.x
772+
node-version: 18.x
769773
- name: Setup Firestore Emulator
770774
uses: nick-invision/retry@v2
771775
with:
772776
shell: bash
773777
timeout_minutes: 5
774778
max_attempts: 3
775-
command: npm install -g firebase-tools
779+
command: npm install firebase-tools
780+
- name: Add firebase-tools to PATH
781+
shell: bash
782+
run: |
783+
echo "$(npm root)" >> $GITHUB_PATH
784+
echo "$(npm root)/.bin" >> $GITHUB_PATH
776785
- name: Setup java
777786
uses: actions/setup-java@v3
778787
with:
@@ -1037,7 +1046,7 @@ jobs:
10371046
--ci
10381047
- id: ftl_test
10391048
if: steps.device-info.outputs.device_type == 'ftl'
1040-
uses: FirebaseExtended/github-actions/firebase-test-lab@v1.3
1049+
uses: FirebaseExtended/github-actions/firebase-test-lab@v1.4
10411050
timeout-minutes: 90
10421051
with:
10431052
credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }}
@@ -1150,10 +1159,10 @@ jobs:
11501159
run: |
11511160
echo "device_type=$( python scripts/gha/print_matrix_configuration.py -k ${{ matrix.ios_device }} -get_device_type)" >> $GITHUB_OUTPUT
11521161
echo "device=$( python scripts/gha/print_matrix_configuration.py -k ${{ matrix.ios_device }} -get_ftl_device_list)" >> $GITHUB_OUTPUT
1153-
- name: Set up Node (16)
1162+
- name: Set up Node (18)
11541163
uses: actions/setup-node@v3
11551164
with:
1156-
node-version: 16.x
1165+
node-version: 18.x
11571166
- name: Setup java for Firestore emulator
11581167
uses: actions/setup-java@v3
11591168
with:
@@ -1166,7 +1175,13 @@ jobs:
11661175
shell: bash
11671176
timeout_minutes: 5
11681177
max_attempts: 3
1169-
command: npm install -g firebase-tools
1178+
command: npm install firebase-tools
1179+
- name: Add firebase-tools to PATH
1180+
if: contains(needs.check_and_prepare.outputs.apis, 'firestore')
1181+
shell: bash
1182+
run: |
1183+
echo "$(npm root)" >> $GITHUB_PATH
1184+
echo "$(npm root)/.bin" >> $GITHUB_PATH
11701185
- name: Start Firestore Emulator
11711186
if: steps.device-info.outputs.device_type == 'virtual' && contains(needs.check_and_prepare.outputs.apis, 'firestore')
11721187
run: |
@@ -1182,7 +1197,7 @@ jobs:
11821197
--ci
11831198
- id: ftl_test
11841199
if: steps.device-info.outputs.device_type == 'ftl'
1185-
uses: FirebaseExtended/github-actions/firebase-test-lab@v1.3
1200+
uses: FirebaseExtended/github-actions/firebase-test-lab@v1.4
11861201
timeout-minutes: 90
11871202
with:
11881203
credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }}
@@ -1287,7 +1302,13 @@ jobs:
12871302
shell: bash
12881303
timeout_minutes: 5
12891304
max_attempts: 3
1290-
command: npm install -g firebase-tools
1305+
command: npm install firebase-tools
1306+
- name: Add firebase-tools to PATH
1307+
if: contains(needs.check_and_prepare.outputs.apis, 'firestore')
1308+
shell: bash
1309+
run: |
1310+
echo "$(npm root)" >> $GITHUB_PATH
1311+
echo "$(npm root)/.bin" >> $GITHUB_PATH
12911312
- name: Start Firestore Emulator
12921313
if: contains(needs.check_and_prepare.outputs.apis, 'firestore')
12931314
run: |

‎.github/workflows/ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
- name: Setup python
6363
uses: actions/setup-python@v4
6464
with:
65-
python-version: 3.7
65+
python-version: 3.8
6666
architecture: "x64"
6767

6868
- name: Install prerequisites

‎.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup python
2626
uses: actions/setup-python@v4
2727
with:
28-
python-version: 3.7
28+
python-version: 3.8
2929
- name: Install prerequisites
3030
run: |
3131
cd firebase

‎.github/workflows/retry-test-failures.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Setup python
2424
uses: actions/setup-python@v4
2525
with:
26-
python-version: 3.7
26+
python-version: 3.8
2727

2828
- uses: actions/checkout@v3
2929
with:

‎.github/workflows/update-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Setup python
3838
uses: actions/setup-python@v4
3939
with:
40-
python-version: 3.7
40+
python-version: 3.8
4141

4242
- name: Check out base branch
4343
uses: actions/checkout@v3

‎.github/workflows/update-feature-branches.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
- name: Setup python
7575
uses: actions/setup-python@v4
7676
with:
77-
python-version: 3.7
77+
python-version: 3.8
7878

7979
- uses: actions/checkout@v3
8080
with:

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ __pycache__/
1313
.gradle
1414
**/build/
1515
**/.externalNativeBuild/
16+
**/.cxx/
1617

1718
### IDE generated files
1819
.vscode/

‎Android/firebase_dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def firebaseDependenciesMap = [
2727
'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'],
2828
'firestore' : ['com.google.firebase:firebase-firestore'],
2929
'functions' : ['com.google.firebase:firebase-functions'],
30-
'gma' : ['com.google.android.gms:play-services-ads:22.3.0',
30+
'gma' : ['com.google.android.gms:play-services-ads:22.6.0',
3131
'com.google.android.ump:user-messaging-platform:2.1.0'],
3232
'installations' : ['com.google.firebase:firebase-installations'],
3333
'invites' : ['com.google.firebase:firebase-invites'],
@@ -159,7 +159,7 @@ project.afterEvaluate {
159159

160160
// Add the bill-of-materials
161161
project.dependencies {
162-
implementation platform('com.google.firebase:firebase-bom:32.3.1')
162+
implementation platform('com.google.firebase:firebase-bom:32.7.0')
163163
}
164164
for (String lib : firebaseCpp.dependencies.libSet) {
165165
// Generate and include the proguard file

‎CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ endif()
158158

159159
if(DESKTOP AND NOT MSVC AND NOT APPLE)
160160
# Linux-specific option.
161+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-maybe-uninitialized")
162+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-maybe-uninitialized")
161163
if (FIREBASE_LINUX_USE_CXX11_ABI)
162164
add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
163165
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1")

‎analytics/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ buildscript {
1818
mavenCentral()
1919
}
2020
dependencies {
21-
classpath 'com.android.tools.build:gradle:3.3.3'
21+
classpath 'com.android.tools.build:gradle:4.2.1'
2222
}
2323
}
2424
allprojects {
@@ -31,8 +31,9 @@ allprojects {
3131
apply plugin: 'com.android.library'
3232

3333
android {
34-
compileSdkVersion 28
35-
buildToolsVersion '28.0.3'
34+
compileSdkVersion 33
35+
ndkPath System.getenv('ANDROID_NDK_HOME')
36+
buildToolsVersion '30.0.2'
3637

3738
sourceSets {
3839
main {

‎analytics/integration_test/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<uses-permission android:name="android.permission.INTERNET" />
2323
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
2424
<uses-permission android:name="android.permission.WAKE_LOCK" />
25-
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
2625
<application android:label="@string/app_name">
2726
<activity android:name="android.app.NativeActivity"
2827
android:screenOrientation="portrait"

‎analytics/integration_test/Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ use_frameworks! :linkage => :static
55

66
target 'integration_test' do
77
platform :ios, '11.0'
8-
pod 'Firebase/Analytics', '10.16.0'
8+
pod 'Firebase/Analytics', '10.19.0'
99
end
1010

1111
target 'integration_test_tvos' do
1212
platform :tvos, '12.0'
13-
pod 'Firebase/Analytics', '10.16.0'
13+
pod 'Firebase/Analytics', '10.19.0'
1414
end
1515

1616
post_install do |installer|

‎analytics/integration_test/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ buildscript {
2020
mavenCentral()
2121
}
2222
dependencies {
23-
classpath 'com.android.tools.build:gradle:3.3.3'
23+
classpath 'com.android.tools.build:gradle:4.2.1'
2424
classpath 'com.google.gms:google-services:4.0.1'
2525
}
2626
}
@@ -40,8 +40,9 @@ android {
4040
sourceCompatibility 1.8
4141
targetCompatibility 1.8
4242
}
43-
compileSdkVersion 28
44-
buildToolsVersion '28.0.3'
43+
compileSdkVersion 33
44+
ndkPath System.getenv('ANDROID_NDK_HOME')
45+
buildToolsVersion '30.0.2'
4546

4647
sourceSets {
4748
main {

‎analytics/integration_test/gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
android.useAndroidX = true
2+
org.gradle.jvmargs=-Xmx2560m

‎analytics/integration_test/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
6+
distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip

0 commit comments

Comments
 (0)
0