Skip to content

Commit 1ca98ff

Browse files
ncooke3ncooke3
authored
[Infra] Enable client_app / client-app-cocoapods job (#11914)
1 parent 43ced86 commit 1ca98ff

File tree

5 files changed

+56
-108
lines changed

5 files changed

+56
-108
lines changed

‎.github/workflows/client_app.yml

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ jobs:
2727
runs-on: macos-12
2828
strategy:
2929
matrix:
30+
#TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
3031
platform: [iOS]
31-
# TODO(Xcode 14.3): Remove above line and uncomment below array when GHA
32-
# supports Ventura/Xcode 14.3.
33-
# platform: [iOS, tvOS, macOS, catalyst]
3432
steps:
3533
- uses: actions/checkout@v3
3634
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -39,20 +37,19 @@ jobs:
3937
- name: Build Client App –– ${{ matrix.platform }}
4038
run: scripts/third_party/travis/retry.sh ./scripts/build.sh SwiftPMClientApp ${{ matrix.platform }} xcodebuild
4139

42-
# TODO(ncooke3): Re-enable when `rc-swift-merged` is ready to merge into `master`. See #11766.
43-
# client-app-cocoapods:
44-
# # Don't run on private repo unless it is a PR.
45-
# if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
46-
# runs-on: macos-12
47-
# steps:
48-
# - uses: actions/checkout@v3
49-
# - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
50-
# with:
51-
# cache_key: ${{ matrix.os }}
52-
# - uses: ruby/setup-ruby@v1
53-
# - name: Setup Bundler
54-
# run: scripts/setup_bundler.sh
55-
# - name: Prereqs
56-
# run: scripts/install_prereqs.sh ClientApp iOS xcodebuild
57-
# - name: Build
58-
# run: scripts/build.sh CocoaPodsClientApp iOS xcodebuild
40+
client-app-cocoapods:
41+
# Don't run on private repo unless it is a PR.
42+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
43+
runs-on: macos-12
44+
steps:
45+
- uses: actions/checkout@v3
46+
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
47+
with:
48+
cache_key: ${{ matrix.os }}
49+
- uses: ruby/setup-ruby@v1
50+
- name: Setup Bundler
51+
run: scripts/setup_bundler.sh
52+
- name: Prereqs
53+
run: scripts/install_prereqs.sh ClientApp iOS xcodebuild
54+
- name: Build
55+
run: scripts/build.sh CocoaPodsClientApp iOS xcodebuild

‎ClientApp/ClientApp.xcodeproj/project.pbxproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@
1515
EA1269B829EDF98A00D79E66 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA1269B729EDF98A00D79E66 /* Assets.xcassets */; };
1616
EA1269BC29EDF98A00D79E66 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA1269BB29EDF98A00D79E66 /* Preview Assets.xcassets */; };
1717
EA501B1129F09594009C4DBC /* objcxx-header-import-test.mm in Sources */ = {isa = PBXBuildFile; fileRef = EA501B1029F09593009C4DBC /* objcxx-header-import-test.mm */; };
18-
EA501B1329F0960B009C4DBC /* objcxx-module-import-test.mm in Sources */ = {isa = PBXBuildFile; fileRef = EA501B1229F0960B009C4DBC /* objcxx-module-import-test.mm */; };
1918
EA5A62942A9914F300F5711A /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA5A62932A9914F300F5711A /* Preview Assets.xcassets */; };
2019
EA5A62992A99498500F5711A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA1269B729EDF98A00D79E66 /* Assets.xcassets */; };
2120
EA5A629A2A99498500F5711A /* swift-import-test.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA7DF54229EF20B9005664A7 /* swift-import-test.swift */; };
2221
EA5A629B2A99498500F5711A /* objc-module-import-test.m in Sources */ = {isa = PBXBuildFile; fileRef = EA05C7DD29F08D4B00D1014F /* objc-module-import-test.m */; };
2322
EA5A629C2A99498500F5711A /* ClientApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1269B329EDF98800D79E66 /* ClientApp.swift */; };
24-
EA5A629D2A99498500F5711A /* objcxx-module-import-test.mm in Sources */ = {isa = PBXBuildFile; fileRef = EA501B1229F0960B009C4DBC /* objcxx-module-import-test.mm */; };
2523
EA5A629E2A99498500F5711A /* objcxx-header-import-test.mm in Sources */ = {isa = PBXBuildFile; fileRef = EA501B1029F09593009C4DBC /* objcxx-header-import-test.mm */; };
2624
EA5A629F2A99498500F5711A /* objc-header-import-test.m in Sources */ = {isa = PBXBuildFile; fileRef = EA05C7DF29F0911400D1014F /* objc-header-import-test.m */; };
2725
EA5A62A02A99498500F5711A /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1269B529EDF98800D79E66 /* ContentView.swift */; };
@@ -64,7 +62,6 @@
6462
EA1269B929EDF98A00D79E66 /* ClientApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ClientApp.entitlements; sourceTree = "<group>"; };
6563
EA1269BB29EDF98A00D79E66 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
6664
EA501B1029F09593009C4DBC /* objcxx-header-import-test.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "objcxx-header-import-test.mm"; sourceTree = "<group>"; };
67-
EA501B1229F0960B009C4DBC /* objcxx-module-import-test.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "objcxx-module-import-test.mm"; sourceTree = "<group>"; };
6865
EA5A62892A9914F000F5711A /* ClientApp-CocoaPods.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ClientApp-CocoaPods.app"; sourceTree = BUILT_PRODUCTS_DIR; };
6966
EA5A62912A9914F300F5711A /* ClientApp_CocoaPods.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ClientApp_CocoaPods.entitlements; sourceTree = "<group>"; };
7067
EA5A62932A9914F300F5711A /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
@@ -195,7 +192,6 @@
195192
EA05C7DD29F08D4B00D1014F /* objc-module-import-test.m */,
196193
EA05C7DF29F0911400D1014F /* objc-header-import-test.m */,
197194
EA501B1029F09593009C4DBC /* objcxx-header-import-test.mm */,
198-
EA501B1229F0960B009C4DBC /* objcxx-module-import-test.mm */,
199195
EA1269B529EDF98800D79E66 /* ContentView.swift */,
200196
EA1269B729EDF98A00D79E66 /* Assets.xcassets */,
201197
);
@@ -335,7 +331,6 @@
335331
buildActionMask = 2147483647;
336332
files = (
337333
EA1269B629EDF98800D79E66 /* ContentView.swift in Sources */,
338-
EA501B1329F0960B009C4DBC /* objcxx-module-import-test.mm in Sources */,
339334
EA05C7DE29F08D4B00D1014F /* objc-module-import-test.m in Sources */,
340335
EA7DF54329EF20B9005664A7 /* swift-import-test.swift in Sources */,
341336
EA05C7E029F0911400D1014F /* objc-header-import-test.m in Sources */,
@@ -351,7 +346,6 @@
351346
EA5A629B2A99498500F5711A /* objc-module-import-test.m in Sources */,
352347
EA5A629A2A99498500F5711A /* swift-import-test.swift in Sources */,
353348
EA5A62A02A99498500F5711A /* ContentView.swift in Sources */,
354-
EA5A629D2A99498500F5711A /* objcxx-module-import-test.mm in Sources */,
355349
EA5A629E2A99498500F5711A /* objcxx-header-import-test.mm in Sources */,
356350
EA5A629C2A99498500F5711A /* ClientApp.swift in Sources */,
357351
EA5A629F2A99498500F5711A /* objc-header-import-test.m in Sources */,
@@ -502,7 +496,6 @@
502496
MARKETING_VERSION = 1.0;
503497
OTHER_CPLUSPLUSFLAGS = (
504498
"$(OTHER_CFLAGS)",
505-
"-fcxx-modules",
506499
);
507500
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.ClientApp;
508501
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -547,7 +540,6 @@
547540
MARKETING_VERSION = 1.0;
548541
OTHER_CPLUSPLUSFLAGS = (
549542
"$(OTHER_CFLAGS)",
550-
"-fcxx-modules",
551543
);
552544
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.ClientApp;
553545
PRODUCT_NAME = "$(TARGET_NAME)";

‎ClientApp/Shared/objcxx-header-import-test.mm

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -17,42 +17,41 @@
1717

1818
// ‼️ Changes should also be reflected in `objc-header-import-test.m`.
1919

20-
// TODO(Xcode 14.3): Re-enable contest when GHA supports Xcode 14.3.
21-
// #import <Firebase.h>
22-
// #import <FirebaseABTesting/FirebaseABTesting.h>
23-
// #import <FirebaseAnalytics/FirebaseAnalytics.h>
24-
// #import <FirebaseAppCheck/FirebaseAppCheck.h>
25-
// #import "Firebase.h"
26-
// #import "FirebaseABTesting/FirebaseABTesting.h"
27-
// #import "FirebaseAnalytics/FirebaseAnalytics.h"
28-
// #import "FirebaseAppCheck/FirebaseAppCheck.h"
29-
// #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
30-
// #import <FirebaseAppDistribution/FirebaseAppDistribution.h>
31-
// #import "FirebaseAppDistribution/FirebaseAppDistribution.h"
32-
// #endif
33-
// #import <FirebaseAuth/FirebaseAuth.h>
34-
// #import <FirebaseCore/FirebaseCore.h>
35-
// #import <FirebaseCrashlytics/FirebaseCrashlytics.h>
36-
// #import <FirebaseDatabase/FirebaseDatabase.h>
37-
// #import "FirebaseAuth/FirebaseAuth.h"
38-
// #import "FirebaseCore/FirebaseCore.h"
39-
// #import "FirebaseCrashlytics/FirebaseCrashlytics.h"
40-
// #import "FirebaseDatabase/FirebaseDatabase.h"
41-
// #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
42-
// #import <FirebaseDynamicLinks/FirebaseDynamicLinks.h>
43-
// #import "FirebaseDynamicLinks/FirebaseDynamicLinks.h"
44-
// #endif
45-
// #import <FirebaseFirestore/FirebaseFirestore.h>
46-
// #import "FirebaseFirestore/FirebaseFirestore.h"
47-
// #import <FirebaseInstallations/FirebaseInstallations.h>
48-
// #import <FirebaseMessaging/FirebaseMessaging.h>
49-
// #import "FirebaseInstallations/FirebaseInstallations.h"
50-
// #import "FirebaseMessaging/FirebaseMessaging.h"
51-
// #if (TARGET_OS_IOS && !TARGET_OS_MACCATALYST) || TARGET_OS_TV
52-
// #import <FirebasePerformance/FirebasePerformance.h>
53-
// #import "FirebasePerformance/FirebasePerformance.h"
54-
// #import <FirebaseInAppMessaging/FirebaseInAppMessaging.h>
55-
// #import "FirebaseInAppMessaging/FirebaseInAppMessaging.h"
56-
// #endif
57-
// #import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>
58-
// #import "FirebaseRemoteConfig/FirebaseRemoteConfig.h"
20+
#import <Firebase.h>
21+
#import <FirebaseABTesting/FirebaseABTesting.h>
22+
#import <FirebaseAnalytics/FirebaseAnalytics.h>
23+
#import <FirebaseAppCheck/FirebaseAppCheck.h>
24+
#import "Firebase.h"
25+
#import "FirebaseABTesting/FirebaseABTesting.h"
26+
#import "FirebaseAnalytics/FirebaseAnalytics.h"
27+
#import "FirebaseAppCheck/FirebaseAppCheck.h"
28+
#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
29+
#import <FirebaseAppDistribution/FirebaseAppDistribution.h>
30+
#import "FirebaseAppDistribution/FirebaseAppDistribution.h"
31+
#endif
32+
#import <FirebaseAuth/FirebaseAuth.h>
33+
#import <FirebaseCore/FirebaseCore.h>
34+
#import <FirebaseCrashlytics/FirebaseCrashlytics.h>
35+
#import <FirebaseDatabase/FirebaseDatabase.h>
36+
#import "FirebaseAuth/FirebaseAuth.h"
37+
#import "FirebaseCore/FirebaseCore.h"
38+
#import "FirebaseCrashlytics/FirebaseCrashlytics.h"
39+
#import "FirebaseDatabase/FirebaseDatabase.h"
40+
#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
41+
#import <FirebaseDynamicLinks/FirebaseDynamicLinks.h>
42+
#import "FirebaseDynamicLinks/FirebaseDynamicLinks.h"
43+
#endif
44+
#import <FirebaseFirestore/FirebaseFirestore.h>
45+
#import <FirebaseInstallations/FirebaseInstallations.h>
46+
#import <FirebaseMessaging/FirebaseMessaging.h>
47+
#import "FirebaseFirestore/FirebaseFirestore.h"
48+
#import "FirebaseInstallations/FirebaseInstallations.h"
49+
#import "FirebaseMessaging/FirebaseMessaging.h"
50+
#if (TARGET_OS_IOS && !TARGET_OS_MACCATALYST) || TARGET_OS_TV
51+
#import <FirebaseInAppMessaging/FirebaseInAppMessaging.h>
52+
#import <FirebasePerformance/FirebasePerformance.h>
53+
#import "FirebaseInAppMessaging/FirebaseInAppMessaging.h"
54+
#import "FirebasePerformance/FirebasePerformance.h"
55+
#endif
56+
#import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>
57+
#import "FirebaseRemoteConfig/FirebaseRemoteConfig.h"

‎ClientApp/Shared/objcxx-module-import-test.mm

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

‎FirebaseRemoteConfigSwift.podspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ app update.
3838
'FirebaseRemoteConfigSwift/Sources/**/*.swift',
3939
]
4040

41+
s.dependency 'FirebaseCore', '~> 10.0'
4142
s.dependency 'FirebaseRemoteConfig', '~> 10.0'
4243
s.dependency 'FirebaseSharedSwift', '~> 10.0'
4344

0 commit comments

Comments
 (0)