Skip to content

Commit 032be48

Browse files
schmidt-sebastianschmidt-sebastian
committed
Merge branch 'master' into mrschmidt/mutabledocuments
2 parents e8960f9 + 697902b commit 032be48

File tree

325 files changed

+18392
-6320
lines changed

Some content is hidden

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

325 files changed

+18392
-6320
lines changed

‎.github/workflows/app_check.yml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: app_check
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- 'FirebaseAppCheck**'
7+
- '.github/workflows/app_check.yml'
8+
schedule:
9+
# Run every day at 11pm (PST) - cron uses UTC times
10+
- cron: '0 7 * * *'
11+
12+
jobs:
13+
pod_lib_lint:
14+
runs-on: macOS-latest
15+
strategy:
16+
matrix:
17+
target: [ios, tvos, macos]
18+
steps:
19+
- uses: actions/checkout@v2
20+
- name: Setup Bundler
21+
run: scripts/setup_bundler.sh
22+
- name: FirebaseAppCheck
23+
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAppCheck.podspec --platforms=${{ matrix.target }}
24+
25+
diagnostics:
26+
# Don't run on private repo unless it is a PR.
27+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
28+
runs-on: macOS-latest
29+
strategy:
30+
matrix:
31+
diagnostic: [tsan, asan, ubsan]
32+
steps:
33+
- uses: actions/checkout@v2
34+
- name: Initialize xcodebuild
35+
run: xcodebuild -list
36+
- name: iOS Unit Tests
37+
run: scripts/third_party/travis/retry.sh ./scripts/build.sh AppCheckUnit iOS spm ${{ matrix.diagnostic }}
38+
- name: Upload raw logs if failed
39+
if: ${{ failure() }}
40+
uses: actions/upload-artifact@v2
41+
with:
42+
name: failure-xcodebuild-raw-logs
43+
path: xcodebuild.log
44+
45+
app_check-cron-only:
46+
runs-on: macos-latest
47+
if: github.event_name == 'schedule'
48+
strategy:
49+
matrix:
50+
flags: [
51+
'--use-modular-headers',
52+
'--use-libraries'
53+
]
54+
needs: pod_lib_lint
55+
steps:
56+
- uses: actions/checkout@v2
57+
- name: Setup Bundler
58+
run: scripts/setup_bundler.sh
59+
- name: PodLibLint FirebaseAppCheck Cron
60+
# TODO: Remove --allow-warnings when stabilized.
61+
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAppCheck.podspec --platforms=ios ${{ matrix.flags }}

‎.github/workflows/combine.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# Copyright 2020 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+
name: combine
16+
17+
on:
18+
pull_request:
19+
paths:
20+
# Combine sources
21+
- 'FirebaseCombineSwift/**'
22+
23+
# Podspec
24+
- 'FirebaseCombineSwift.podspec'
25+
26+
# This workflow
27+
- '.github/workflows/combine.yml'
28+
29+
# Rebuild on Ruby infrastructure changes.
30+
- 'Gemfile'
31+
32+
schedule:
33+
# Run every day at 11pm (PST) - cron uses UTC times
34+
- cron: '0 7 * * *'
35+
36+
jobs:
37+
xcodebuild:
38+
# Don't run on private repo unless it is a PR.
39+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
40+
runs-on: macos-latest
41+
42+
strategy:
43+
matrix:
44+
target: [iOS]
45+
46+
steps:
47+
- uses: actions/checkout@v2
48+
49+
- name: Setup build
50+
run: scripts/install_prereqs.sh CombineSwift ${{ matrix.target }} xcodebuild
51+
52+
- name: Build and test
53+
run: scripts/third_party/travis/retry.sh scripts/build.sh CombineSwift ${{ matrix.target }} xcodebuild

‎.github/workflows/prerelease.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
cd scripts/create_spec_repo/
4242
swift build
4343
pod repo add --silent "${local_repo}" https://"$botaccess"@github.com/Firebase/SpecsTesting.git
44-
BOT_TOKEN="${botaccess}" .build/debug/spec-repo-builder --sdk-repo "${local_sdk_repo_dir}" --local-spec-repo-name "${local_repo}" --sdk-repo-name SpecsTesting --github-account Firebase --pod-sources 'https://${BOT_TOKEN}@github.com/Firebase/SpecsTesting' --pod-sources "https://github.com/firebase/SpecsDev.git" --pod-sources "https://github.com/firebase/SpecsStaging.git" --pod-sources "https://cdn.cocoapods.org/"
44+
BOT_TOKEN="${botaccess}" .build/debug/spec-repo-builder --sdk-repo "${local_sdk_repo_dir}" --local-spec-repo-name "${local_repo}" --sdk-repo-name SpecsTesting --github-account Firebase --pod-sources 'https://${BOT_TOKEN}@github.com/Firebase/SpecsTesting' "https://github.com/firebase/SpecsDev.git" "https://github.com/firebase/SpecsStaging.git" "https://cdn.cocoapods.org/" --exclude-pods "FirebaseSegmentation" "FirebaseFirestoreTestingSupport" "FirebaseAuthTestingSupport" "FirebaseCombineSwift" "FirebaseFunctionsTestingSupport"
4545
- name: Clean Artifacts
4646
if: ${{ always() }}
4747
run: |

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
cd scripts/create_spec_repo/
4242
swift build
4343
pod repo add --silent "${local_repo}" https://"$botaccess"@github.com/FirebasePrivate/SpecsTesting.git
44-
BOT_TOKEN="${botaccess}" .build/debug/spec-repo-builder --sdk-repo "${local_sdk_repo_dir}" --local-spec-repo-name "${local_repo}" --pod-sources 'https://${BOT_TOKEN}@github.com/FirebasePrivate/SpecsTesting' --pod-sources "https://github.com/firebase/SpecsStaging.git" --pod-sources "https://cdn.cocoapods.org/"
44+
BOT_TOKEN="${botaccess}" .build/debug/spec-repo-builder --sdk-repo "${local_sdk_repo_dir}" --local-spec-repo-name "${local_repo}" --pod-sources 'https://${BOT_TOKEN}@github.com/FirebasePrivate/SpecsTesting' "https://github.com/firebase/SpecsStaging.git" "https://cdn.cocoapods.org/" --exclude-pods "FirebaseSegmentation" "FirebaseFirestoreTestingSupport" "FirebaseAuthTestingSupport" "FirebaseCombineSwift" "FirebaseFunctionsTestingSupport"
4545
- name: Clean Artifacts
4646
if: ${{ always() }}
4747
run: |

‎.github/workflows/test_coverage.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ jobs:
280280
steps:
281281
- uses: actions/checkout@v2
282282
- name: Access to Metrics Service
283-
if: ${{ env.METRICS_SERVICE_SECRET }}
283+
if: ${{ env.METRICS_SERVICE_SECRET }} && (github.event.action != 'closed' || github.event.pull_request.merged)
284284
run: |
285285
# Install gcloud sdk
286286
curl https://sdk.cloud.google.com > install.sh
@@ -297,7 +297,7 @@ jobs:
297297
with:
298298
path: /Users/runner/test
299299
- name: Compare Diff and Post a Report
300-
if: github.event.pull_request.merged != true && env.METRICS_SERVICE_SECRET
300+
if: github.event.pull_request.merged != true && github.event.action != 'closed' && env.METRICS_SERVICE_SECRET
301301
env:
302302
base_commit: ${{ needs.check.outputs.base_commit }}
303303
run: |
@@ -308,7 +308,7 @@ jobs:
308308
swift run CoverageReportGenerator --presubmit "firebase/firebase-ios-sdk" --commit "${GITHUB_SHA}" --token $(gcloud auth print-identity-token) --xcresult-dir "/Users/runner/test/codecoverage" --log-link "https://github.com/firebase/firebase-ios-sdk/actions/runs/${GITHUB_RUN_ID}" --pull-request-num ${{github.event.pull_request.number}} --base-commit "$base_commit"
309309
fi
310310
- name: Update New Coverage Data
311-
if: github.event.pull_request.merged == true && env.METRICS_SERVICE_SECRET
311+
if: github.event.pull_request.merged && env.METRICS_SERVICE_SECRET
312312
run: |
313313
if [ -d "${{steps.download.outputs.download-path}}" ]; then
314314
cd scripts/code_coverage_report/generate_code_coverage_report

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,3 +144,7 @@ CocoaPodsIntegrationTest/Podfile
144144
# In-app messaging integration tests
145145
FirebaseInAppMessaging/Tests/Integration/FunctionalTestApp/GoogleService-Info.plist
146146
FirebaseInAppMessaging/Tests/Integration/FunctionalTestApp/App/InAppMessaging-Example-iOS/AppDelegate.m
147+
148+
# FIRAppCheckTestApp
149+
FirebaseAppCheck/Apps/FIRAppCheckTestApp/FIRAppCheckTestApp/GoogleService-Info.plist
150+
FirebaseAppCheck/Apps/AppCheckCustomProvideApp/AppCheckCustomProvideApp/GoogleService-Info.plist

‎.swiftpm/xcode/xcshareddata/xcschemes/AppCheckUnit.xcscheme

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1230"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
</BuildAction>
9+
<TestAction
10+
buildConfiguration = "Debug"
11+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
12+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13+
shouldUseLaunchSchemeArgsEnv = "YES">
14+
<Testables>
15+
<TestableReference
16+
skipped = "NO">
17+
<BuildableReference
18+
BuildableIdentifier = "primary"
19+
BlueprintIdentifier = "AppCheckUnit"
20+
BuildableName = "AppCheckUnit"
21+
BlueprintName = "AppCheckUnit"
22+
ReferencedContainer = "container:">
23+
</BuildableReference>
24+
</TestableReference>
25+
</Testables>
26+
</TestAction>
27+
<LaunchAction
28+
buildConfiguration = "Debug"
29+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
30+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
31+
launchStyle = "0"
32+
useCustomWorkingDirectory = "NO"
33+
ignoresPersistentStateOnLaunch = "NO"
34+
debugDocumentVersioning = "YES"
35+
debugServiceExtension = "internal"
36+
allowLocationSimulation = "YES">
37+
</LaunchAction>
38+
<ProfileAction
39+
buildConfiguration = "Release"
40+
shouldUseLaunchSchemeArgsEnv = "YES"
41+
savedToolIdentifier = ""
42+
useCustomWorkingDirectory = "NO"
43+
debugDocumentVersioning = "YES">
44+
</ProfileAction>
45+
<AnalyzeAction
46+
buildConfiguration = "Debug">
47+
</AnalyzeAction>
48+
<ArchiveAction
49+
buildConfiguration = "Release"
50+
revealArchiveInOrganizer = "YES">
51+
</ArchiveAction>
52+
</Scheme>

‎.swiftpm/xcode/xcshareddata/xcschemes/AppCheckUnitSwift.xcscheme

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1230"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
</BuildAction>
9+
<TestAction
10+
buildConfiguration = "Debug"
11+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
12+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13+
shouldUseLaunchSchemeArgsEnv = "YES">
14+
<Testables>
15+
<TestableReference
16+
skipped = "NO">
17+
<BuildableReference
18+
BuildableIdentifier = "primary"
19+
BlueprintIdentifier = "AppCheckUnitSwift"
20+
BuildableName = "AppCheckUnitSwift"
21+
BlueprintName = "AppCheckUnitSwift"
22+
ReferencedContainer = "container:">
23+
</BuildableReference>
24+
</TestableReference>
25+
</Testables>
26+
</TestAction>
27+
<LaunchAction
28+
buildConfiguration = "Debug"
29+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
30+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
31+
launchStyle = "0"
32+
useCustomWorkingDirectory = "NO"
33+
ignoresPersistentStateOnLaunch = "NO"
34+
debugDocumentVersioning = "YES"
35+
debugServiceExtension = "internal"
36+
allowLocationSimulation = "YES">
37+
</LaunchAction>
38+
<ProfileAction
39+
buildConfiguration = "Release"
40+
shouldUseLaunchSchemeArgsEnv = "YES"
41+
savedToolIdentifier = ""
42+
useCustomWorkingDirectory = "NO"
43+
debugDocumentVersioning = "YES">
44+
</ProfileAction>
45+
<AnalyzeAction
46+
buildConfiguration = "Debug">
47+
</AnalyzeAction>
48+
<ArchiveAction
49+
buildConfiguration = "Release"
50+
revealArchiveInOrganizer = "YES">
51+
</ArchiveAction>
52+
</Scheme>

‎.swiftpm/xcode/xcshareddata/xcschemes/Firebase-Package.xcscheme

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -826,9 +826,9 @@
826826
buildForAnalyzing = "YES">
827827
<BuildableReference
828828
BuildableIdentifier = "primary"
829-
BlueprintIdentifier = "Firebase_FirebaseInAppMessaging"
830-
BuildableName = "Firebase_FirebaseInAppMessaging"
831-
BlueprintName = "Firebase_FirebaseInAppMessaging"
829+
BlueprintIdentifier = "FirebaseAppCheck"
830+
BuildableName = "FirebaseAppCheck"
831+
BlueprintName = "FirebaseAppCheck"
832832
ReferencedContainer = "container:">
833833
</BuildableReference>
834834
</BuildActionEntry>
@@ -840,9 +840,9 @@
840840
buildForAnalyzing = "YES">
841841
<BuildableReference
842842
BuildableIdentifier = "primary"
843-
BlueprintIdentifier = "Firebase_FirebaseInAppMessaging_iOS"
844-
BuildableName = "Firebase_FirebaseInAppMessaging_iOS"
845-
BlueprintName = "Firebase_FirebaseInAppMessaging_iOS"
843+
BlueprintIdentifier = "Firebase_AppCheckUnit"
844+
BuildableName = "Firebase_AppCheckUnit"
845+
BlueprintName = "Firebase_AppCheckUnit"
846846
ReferencedContainer = "container:">
847847
</BuildableReference>
848848
</BuildActionEntry>
@@ -1058,6 +1058,26 @@
10581058
ReferencedContainer = "container:">
10591059
</BuildableReference>
10601060
</TestableReference>
1061+
<TestableReference
1062+
skipped = "NO">
1063+
<BuildableReference
1064+
BuildableIdentifier = "primary"
1065+
BlueprintIdentifier = "AppCheckUnit"
1066+
BuildableName = "AppCheckUnit"
1067+
BlueprintName = "AppCheckUnit"
1068+
ReferencedContainer = "container:">
1069+
</BuildableReference>
1070+
</TestableReference>
1071+
<TestableReference
1072+
skipped = "NO">
1073+
<BuildableReference
1074+
BuildableIdentifier = "primary"
1075+
BlueprintIdentifier = "AppCheckUnitSwift"
1076+
BuildableName = "AppCheckUnitSwift"
1077+
BlueprintName = "AppCheckUnitSwift"
1078+
ReferencedContainer = "container:">
1079+
</BuildableReference>
1080+
</TestableReference>
10611081
</Testables>
10621082
</TestAction>
10631083
<LaunchAction

‎.swiftpm/xcode/xcshareddata/xcschemes/FirestoreTestingSupportTests.xcscheme

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1240"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
</BuildAction>
9+
<TestAction
10+
buildConfiguration = "Debug"
11+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
12+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13+
shouldUseLaunchSchemeArgsEnv = "YES">
14+
<Testables>
15+
<TestableReference
16+
skipped = "NO">
17+
<BuildableReference
18+
BuildableIdentifier = "primary"
19+
BlueprintIdentifier = "FirestoreTestingSupportTests"
20+
BuildableName = "FirestoreTestingSupportTests"
21+
BlueprintName = "FirestoreTestingSupportTests"
22+
ReferencedContainer = "container:">
23+
</BuildableReference>
24+
</TestableReference>
25+
</Testables>
26+
</TestAction>
27+
<LaunchAction
28+
buildConfiguration = "Debug"
29+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
30+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
31+
launchStyle = "0"
32+
useCustomWorkingDirectory = "NO"
33+
ignoresPersistentStateOnLaunch = "NO"
34+
debugDocumentVersioning = "YES"
35+
debugServiceExtension = "internal"
36+
allowLocationSimulation = "YES">
37+
</LaunchAction>
38+
<ProfileAction
39+
buildConfiguration = "Release"
40+
shouldUseLaunchSchemeArgsEnv = "YES"
41+
savedToolIdentifier = ""
42+
useCustomWorkingDirectory = "NO"
43+
debugDocumentVersioning = "YES">
44+
</ProfileAction>
45+
<AnalyzeAction
46+
buildConfiguration = "Debug">
47+
</AnalyzeAction>
48+
<ArchiveAction
49+
buildConfiguration = "Release"
50+
revealArchiveInOrganizer = "YES">
51+
</ArchiveAction>
52+
</Scheme>

0 commit comments

Comments
 (0)