Skip to content

Commit a09083f

Browse files
ncooke3paulb777
ncooke3
authored and
paulb777
committed
[v9] Reorganize FirebaseCore* modules (#9482)
* [skip ci] [will revert] Add debug printing to `pod_lib_lint.rb` * Reorganize FirebaseCore libraries for SPM and CP * [skip ci] Revert "[skip ci] [will revert] Add debug printing to `pod_lib_lint.rb`" This reverts commit 2a837e3. * Review and fix CI * Remove `heartbeat_logging.yml` and add `core_internal.yml` * Remove trailing whitespace * Fix more whitespace 😞 * Fix `core_internal.yml` scheme name * Update `check_imports.swift` and TODO * Review * Add FirebaseCoreInternal pod to Firestore example's Podfile * [skip ci] Review - remove TODOs * [skip ci] Remove duplicate `XCTest` import
1 parent e002709 commit a09083f

File tree

266 files changed

+562
-379
lines changed

Some content is hidden

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

266 files changed

+562
-379
lines changed

‎.github/workflows/core.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
paths:
66
- 'FirebaseCore**'
77
- 'Interop/CoreDiagnostics/Public/*.h'
8-
- 'HeartbeatLogging**'
98
- '.github/workflows/core.yml'
109
- 'Gemfile*'
1110
schedule:

‎.github/workflows/core_extension.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: core_extension
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- 'FirebaseCoreExtension.podspec'
7+
- 'FirebaseCore/Extension/**'
8+
- '.github/workflows/core_extension.yml'
9+
- 'Gemfile*'
10+
schedule:
11+
# Run every day at 2am (PST) - cron uses UTC times
12+
- cron: '0 10 * * *'
13+
14+
jobs:
15+
# Since `FirebaseCoreExtension` only contains headers, linting is sufficient for testing.
16+
17+
pod-lib-lint:
18+
# Don't run on private repo unless it is a PR.
19+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
20+
runs-on: macos-11
21+
strategy:
22+
matrix:
23+
target: [ios, tvos, macos]
24+
env:
25+
POD_LIB_LINT_ONLY: 1
26+
steps:
27+
- uses: actions/checkout@v2
28+
- name: Setup Bundler
29+
run: scripts/setup_bundler.sh
30+
- name: Build and test
31+
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCoreExtension.podspec --platforms=${{ matrix.target }}
32+
33+
core-internal-cron-only:
34+
# Don't run on private repo.
35+
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
36+
runs-on: macos-11
37+
strategy:
38+
matrix:
39+
target: [ios, tvos, macos]
40+
flags: [
41+
'--use-static-frameworks'
42+
]
43+
needs: pod-lib-lint
44+
steps:
45+
- uses: actions/checkout@v2
46+
- name: Setup Bundler
47+
run: scripts/setup_bundler.sh
48+
- name: PodLibLint CoreInternal Cron
49+
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCoreExtension.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }}

‎.github/workflows/core_internal.yml

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: core_internal
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- 'FirebaseCoreInternal.podspec'
7+
- 'FirebaseCore/Internal/**'
8+
- '.github/workflows/core_internal.yml'
9+
- 'Gemfile*'
10+
schedule:
11+
# Run every day at 2am (PST) - cron uses UTC times
12+
- cron: '0 10 * * *'
13+
14+
jobs:
15+
pod-lib-lint:
16+
# Don't run on private repo unless it is a PR.
17+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
18+
runs-on: macos-11
19+
strategy:
20+
matrix:
21+
target: [ios, tvos, macos]
22+
env:
23+
POD_LIB_LINT_ONLY: 1
24+
steps:
25+
- uses: actions/checkout@v2
26+
- name: Setup Bundler
27+
run: scripts/setup_bundler.sh
28+
- name: Build and test
29+
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCoreInternal.podspec --platforms=${{ matrix.target }}
30+
31+
spm:
32+
# Don't run on private repo unless it is a PR.
33+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
34+
runs-on: macos-11
35+
strategy:
36+
matrix:
37+
target: [iOS, tvOS, macOS, catalyst, watchOS]
38+
steps:
39+
- uses: actions/checkout@v2
40+
- name: Initialize xcodebuild
41+
run: scripts/setup_spm_tests.sh
42+
- name: FirebaseCoreInternalTests
43+
run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseCoreInternalTests ${{ matrix.target }} spm
44+
45+
catalyst:
46+
# Don't run on private repo unless it is a PR.
47+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
48+
runs-on: macos-11
49+
env:
50+
POD_LIB_LINT_ONLY: 1
51+
steps:
52+
- uses: actions/checkout@v2
53+
- uses: mikehardy/buildcache-action@50738c6c77de7f34e66b870e4f8ede333b69d077
54+
with:
55+
cache_key: ${{ matrix.os }}
56+
- name: Setup Bundler
57+
run: scripts/setup_bundler.sh
58+
- name: Setup Catalyst project and run unit tests
59+
run: scripts/test_catalyst.sh FirebaseCoreInternal test FirebaseCoreInternal-Unit-Unit
60+
- name: Setup Catalyst project and run integration tests
61+
run: scripts/test_catalyst.sh FirebaseCoreInternal test FirebaseCoreInternal-Unit-Integration
62+
63+
core-internal-cron-only:
64+
# Don't run on private repo.
65+
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
66+
runs-on: macos-11
67+
strategy:
68+
matrix:
69+
target: [ios, tvos, macos]
70+
flags: [
71+
'--use-static-frameworks'
72+
]
73+
needs: pod-lib-lint
74+
steps:
75+
- uses: actions/checkout@v2
76+
- name: Setup Bundler
77+
run: scripts/setup_bundler.sh
78+
- name: PodLibLint CoreInternal Cron
79+
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCoreInternal.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }}

‎.github/workflows/heartbeat_logging.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎CoreOnly/Tests/FirebasePodTest/Podfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ target 'FirebasePodTest' do
3737
pod 'FirebaseMessagingInterop', :path => '../../../'
3838
pod 'FirebaseCoreDiagnostics', :path => '../../../'
3939
pod 'FirebaseCoreInternal', :path => '../../../'
40+
pod 'FirebaseCoreExtension', :path => '../../../'
4041

4142
pod 'FirebaseAnalytics' # Analytics is not open source
4243
end

‎Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#import "FBLPromises.h"
2121
#endif
2222

23-
#import "FirebaseCore/Internal/FirebaseCoreInternal.h"
23+
#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
2424

2525
#import "Crashlytics/Crashlytics/FIRCLSUserDefaults/FIRCLSUserDefaults.h"
2626

‎Crashlytics/Crashlytics/FIRCrashlytics.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
#import "Crashlytics/Crashlytics/Controllers/FIRCLSReportManager.h"
4747
#import "Crashlytics/Crashlytics/Controllers/FIRCLSReportUploader.h"
4848

49-
#import "FirebaseCore/Internal/FirebaseCoreInternal.h"
49+
#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
5050
#import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h"
5151
#import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
5252

‎Crashlytics/Crashlytics/Helpers/FIRCLSLogger.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h"
1616

17-
#import "FirebaseCore/Internal/FirebaseCoreInternal.h"
17+
#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
1818

1919
FIRLoggerService kFIRLoggerCrashlytics = @"[Firebase/Crashlytics]";
2020

‎Crashlytics/Shared/FIRCLSConstants.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
#import "Crashlytics/Shared/FIRCLSConstants.h"
16-
#import "FirebaseCore/Internal/FirebaseCoreInternal.h"
16+
#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
1717

1818
#define STR_HELPER(x) #x
1919
#define STR(x) STR_HELPER(x)

‎Crashlytics/UnitTests/FIRCLSConstantsTest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#import <XCTest/XCTest.h>
1616

1717
#import "Crashlytics/Shared/FIRCLSConstants.h"
18-
#import "FirebaseCore/Internal/FirebaseCoreInternal.h"
18+
#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
1919

2020
#define STR_HELPER(x) #x
2121
#define STR(x) STR_HELPER(x)

0 commit comments

Comments
 (0)