[Infra] Enable client_app / client-app-cocoapods job (#11914)

firebase · Oct 12, 2023 · 1ca98ff · 1ca98ff
1 parent 43ced86
commit 1ca98ff
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 108 deletions.
diff --git a/.github/workflows/client_app.yml b/.github/workflows/client_app.yml
@@ -27,10 +27,8 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
+        #TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
         platform: [iOS]
-        # TODO(Xcode 14.3): Remove above line and uncomment below array when GHA
-        # supports Ventura/Xcode 14.3.
-        # platform: [iOS, tvOS, macOS, catalyst]
     steps:
       - uses: actions/checkout@v3
       - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -39,20 +37,19 @@ jobs:
       - name: Build Client App –– ${{ matrix.platform }}
         run: scripts/third_party/travis/retry.sh ./scripts/build.sh SwiftPMClientApp ${{ matrix.platform }} xcodebuild
 
-  # TODO(ncooke3): Re-enable when `rc-swift-merged` is ready to merge into `master`. See #11766.
-  # client-app-cocoapods:
-  #   # Don't run on private repo unless it is a PR.
-  #   if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
-  #   runs-on: macos-12
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
-  #       with:
-  #         cache_key: ${{ matrix.os }}
-  #     - uses: ruby/setup-ruby@v1
-  #     - name: Setup Bundler
-  #       run: scripts/setup_bundler.sh
-  #     - name: Prereqs
-  #       run: scripts/install_prereqs.sh ClientApp iOS xcodebuild
-  #     - name: Build
-  #       run: scripts/build.sh CocoaPodsClientApp iOS xcodebuild
+  client-app-cocoapods:
+    # Don't run on private repo unless it is a PR.
+    if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
+    runs-on: macos-12
+    steps:
+      - uses: actions/checkout@v3
+      - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
+        with:
+          cache_key: ${{ matrix.os }}
+      - uses: ruby/setup-ruby@v1
+      - name: Setup Bundler
+        run: scripts/setup_bundler.sh
+      - name: Prereqs
+        run: scripts/install_prereqs.sh ClientApp iOS xcodebuild
+      - name: Build
+        run: scripts/build.sh CocoaPodsClientApp iOS xcodebuild
diff --git a/ClientApp/ClientApp.xcodeproj/project.pbxproj b/ClientApp/ClientApp.xcodeproj/project.pbxproj
@@ -15,13 +15,11 @@
 		EA1269B829EDF98A00D79E66 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA1269B729EDF98A00D79E66 /* Assets.xcassets */; };
 		EA1269BC29EDF98A00D79E66 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA1269BB29EDF98A00D79E66 /* Preview Assets.xcassets */; };
 		EA501B1129F09594009C4DBC /* objcxx-header-import-test.mm in Sources */ = {isa = PBXBuildFile; fileRef = EA501B1029F09593009C4DBC /* objcxx-header-import-test.mm */; };
-		EA501B1329F0960B009C4DBC /* objcxx-module-import-test.mm in Sources */ = {isa = PBXBuildFile; fileRef = EA501B1229F0960B009C4DBC /* objcxx-module-import-test.mm */; };
 		EA5A62942A9914F300F5711A /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA5A62932A9914F300F5711A /* Preview Assets.xcassets */; };
 		EA5A62992A99498500F5711A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA1269B729EDF98A00D79E66 /* Assets.xcassets */; };
 		EA5A629A2A99498500F5711A /* swift-import-test.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA7DF54229EF20B9005664A7 /* swift-import-test.swift */; };
 		EA5A629B2A99498500F5711A /* objc-module-import-test.m in Sources */ = {isa = PBXBuildFile; fileRef = EA05C7DD29F08D4B00D1014F /* objc-module-import-test.m */; };
 		EA5A629C2A99498500F5711A /* ClientApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1269B329EDF98800D79E66 /* ClientApp.swift */; };
-		EA5A629D2A99498500F5711A /* objcxx-module-import-test.mm in Sources */ = {isa = PBXBuildFile; fileRef = EA501B1229F0960B009C4DBC /* objcxx-module-import-test.mm */; };
 		EA5A629E2A99498500F5711A /* objcxx-header-import-test.mm in Sources */ = {isa = PBXBuildFile; fileRef = EA501B1029F09593009C4DBC /* objcxx-header-import-test.mm */; };
 		EA5A629F2A99498500F5711A /* objc-header-import-test.m in Sources */ = {isa = PBXBuildFile; fileRef = EA05C7DF29F0911400D1014F /* objc-header-import-test.m */; };
 		EA5A62A02A99498500F5711A /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1269B529EDF98800D79E66 /* ContentView.swift */; };
@@ -64,7 +62,6 @@
 		EA1269B929EDF98A00D79E66 /* ClientApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ClientApp.entitlements; sourceTree = "<group>"; };
 		EA1269BB29EDF98A00D79E66 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
 		EA501B1029F09593009C4DBC /* objcxx-header-import-test.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "objcxx-header-import-test.mm"; sourceTree = "<group>"; };
-		EA501B1229F0960B009C4DBC /* objcxx-module-import-test.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "objcxx-module-import-test.mm"; sourceTree = "<group>"; };
 		EA5A62892A9914F000F5711A /* ClientApp-CocoaPods.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ClientApp-CocoaPods.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		EA5A62912A9914F300F5711A /* ClientApp_CocoaPods.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ClientApp_CocoaPods.entitlements; sourceTree = "<group>"; };
 		EA5A62932A9914F300F5711A /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
@@ -195,7 +192,6 @@
 				EA05C7DD29F08D4B00D1014F /* objc-module-import-test.m */,
 				EA05C7DF29F0911400D1014F /* objc-header-import-test.m */,
 				EA501B1029F09593009C4DBC /* objcxx-header-import-test.mm */,
-				EA501B1229F0960B009C4DBC /* objcxx-module-import-test.mm */,
 				EA1269B529EDF98800D79E66 /* ContentView.swift */,
 				EA1269B729EDF98A00D79E66 /* Assets.xcassets */,
 			);
@@ -335,7 +331,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				EA1269B629EDF98800D79E66 /* ContentView.swift in Sources */,
-				EA501B1329F0960B009C4DBC /* objcxx-module-import-test.mm in Sources */,
 				EA05C7DE29F08D4B00D1014F /* objc-module-import-test.m in Sources */,
 				EA7DF54329EF20B9005664A7 /* swift-import-test.swift in Sources */,
 				EA05C7E029F0911400D1014F /* objc-header-import-test.m in Sources */,
@@ -351,7 +346,6 @@
 				EA5A629B2A99498500F5711A /* objc-module-import-test.m in Sources */,
 				EA5A629A2A99498500F5711A /* swift-import-test.swift in Sources */,
 				EA5A62A02A99498500F5711A /* ContentView.swift in Sources */,
-				EA5A629D2A99498500F5711A /* objcxx-module-import-test.mm in Sources */,
 				EA5A629E2A99498500F5711A /* objcxx-header-import-test.mm in Sources */,
 				EA5A629C2A99498500F5711A /* ClientApp.swift in Sources */,
 				EA5A629F2A99498500F5711A /* objc-header-import-test.m in Sources */,
@@ -502,7 +496,6 @@
 				MARKETING_VERSION = 1.0;
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
-					"-fcxx-modules",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.ClientApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -547,7 +540,6 @@
 				MARKETING_VERSION = 1.0;
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
-					"-fcxx-modules",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.ClientApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/ClientApp/Shared/objcxx-header-import-test.mm b/ClientApp/Shared/objcxx-header-import-test.mm
@@ -17,42 +17,41 @@
 
 // ‼️ Changes should also be reflected in `objc-header-import-test.m`.
 
-// TODO(Xcode 14.3): Re-enable contest when GHA supports Xcode 14.3.
-// #import <Firebase.h>
-// #import <FirebaseABTesting/FirebaseABTesting.h>
-// #import <FirebaseAnalytics/FirebaseAnalytics.h>
-// #import <FirebaseAppCheck/FirebaseAppCheck.h>
-// #import "Firebase.h"
-// #import "FirebaseABTesting/FirebaseABTesting.h"
-// #import "FirebaseAnalytics/FirebaseAnalytics.h"
-// #import "FirebaseAppCheck/FirebaseAppCheck.h"
-// #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
-// #import <FirebaseAppDistribution/FirebaseAppDistribution.h>
-// #import "FirebaseAppDistribution/FirebaseAppDistribution.h"
-// #endif
-// #import <FirebaseAuth/FirebaseAuth.h>
-// #import <FirebaseCore/FirebaseCore.h>
-// #import <FirebaseCrashlytics/FirebaseCrashlytics.h>
-// #import <FirebaseDatabase/FirebaseDatabase.h>
-// #import "FirebaseAuth/FirebaseAuth.h"
-// #import "FirebaseCore/FirebaseCore.h"
-// #import "FirebaseCrashlytics/FirebaseCrashlytics.h"
-// #import "FirebaseDatabase/FirebaseDatabase.h"
-// #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
-// #import <FirebaseDynamicLinks/FirebaseDynamicLinks.h>
-// #import "FirebaseDynamicLinks/FirebaseDynamicLinks.h"
-// #endif
-// #import <FirebaseFirestore/FirebaseFirestore.h>
-// #import "FirebaseFirestore/FirebaseFirestore.h"
-// #import <FirebaseInstallations/FirebaseInstallations.h>
-// #import <FirebaseMessaging/FirebaseMessaging.h>
-// #import "FirebaseInstallations/FirebaseInstallations.h"
-// #import "FirebaseMessaging/FirebaseMessaging.h"
-// #if (TARGET_OS_IOS && !TARGET_OS_MACCATALYST) || TARGET_OS_TV
-// #import <FirebasePerformance/FirebasePerformance.h>
-// #import "FirebasePerformance/FirebasePerformance.h"
-// #import <FirebaseInAppMessaging/FirebaseInAppMessaging.h>
-// #import "FirebaseInAppMessaging/FirebaseInAppMessaging.h"
-// #endif
-// #import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>
-// #import "FirebaseRemoteConfig/FirebaseRemoteConfig.h"
+#import <Firebase.h>
+#import <FirebaseABTesting/FirebaseABTesting.h>
+#import <FirebaseAnalytics/FirebaseAnalytics.h>
+#import <FirebaseAppCheck/FirebaseAppCheck.h>
+#import "Firebase.h"
+#import "FirebaseABTesting/FirebaseABTesting.h"
+#import "FirebaseAnalytics/FirebaseAnalytics.h"
+#import "FirebaseAppCheck/FirebaseAppCheck.h"
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
+#import <FirebaseAppDistribution/FirebaseAppDistribution.h>
+#import "FirebaseAppDistribution/FirebaseAppDistribution.h"
+#endif
+#import <FirebaseAuth/FirebaseAuth.h>
+#import <FirebaseCore/FirebaseCore.h>
+#import <FirebaseCrashlytics/FirebaseCrashlytics.h>
+#import <FirebaseDatabase/FirebaseDatabase.h>
+#import "FirebaseAuth/FirebaseAuth.h"
+#import "FirebaseCore/FirebaseCore.h"
+#import "FirebaseCrashlytics/FirebaseCrashlytics.h"
+#import "FirebaseDatabase/FirebaseDatabase.h"
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
+#import <FirebaseDynamicLinks/FirebaseDynamicLinks.h>
+#import "FirebaseDynamicLinks/FirebaseDynamicLinks.h"
+#endif
+#import <FirebaseFirestore/FirebaseFirestore.h>
+#import <FirebaseInstallations/FirebaseInstallations.h>
+#import <FirebaseMessaging/FirebaseMessaging.h>
+#import "FirebaseFirestore/FirebaseFirestore.h"
+#import "FirebaseInstallations/FirebaseInstallations.h"
+#import "FirebaseMessaging/FirebaseMessaging.h"
+#if (TARGET_OS_IOS && !TARGET_OS_MACCATALYST) || TARGET_OS_TV
+#import <FirebaseInAppMessaging/FirebaseInAppMessaging.h>
+#import <FirebasePerformance/FirebasePerformance.h>
+#import "FirebaseInAppMessaging/FirebaseInAppMessaging.h"
+#import "FirebasePerformance/FirebasePerformance.h"
+#endif
+#import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>
+#import "FirebaseRemoteConfig/FirebaseRemoteConfig.h"
diff --git a/ClientApp/Shared/objcxx-module-import-test.mm b/ClientApp/Shared/objcxx-module-import-test.mm
diff --git a/FirebaseRemoteConfigSwift.podspec b/FirebaseRemoteConfigSwift.podspec
@@ -38,6 +38,7 @@ app update.
     'FirebaseRemoteConfigSwift/Sources/**/*.swift',
   ]
 
+  s.dependency 'FirebaseCore', '~> 10.0'
   s.dependency 'FirebaseRemoteConfig', '~> 10.0'
   s.dependency 'FirebaseSharedSwift', '~> 10.0'