Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Infra] Move ClientApp/ out of repo root #12218

Merged
merged 3 commits into from
Dec 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/client_app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- "*.podspec"
- "scripts/install_prereqs.sh"
- "scripts/build.sh"
- "ClientApp/**"
- "IntegrationTesting/ClientApp/**"
- "Gemfile*"
schedule:
# Run every day at 12am (PST) - cron uses UTC times
Expand Down
45 changes: 0 additions & 45 deletions ClientApp/Podfile

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
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>"; };
EA7DF54229EF20B9005664A7 /* swift-import-test.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "swift-import-test.swift"; sourceTree = "<group>"; };
EA7DF54929EF2A92005664A7 /* firebase-ios-sdk */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "firebase-ios-sdk"; path = ../; sourceTree = "<group>"; };
EA7DF54929EF2A92005664A7 /* firebase-ios-sdk */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "firebase-ios-sdk"; path = ../../; sourceTree = "<group>"; };
EAA0A98F2AD8494F00C28FCD /* ClientApp-CocoaPods-iOS13.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ClientApp-CocoaPods-iOS13.app"; sourceTree = BUILT_PRODUCTS_DIR; };
EAA0A9972AD8495000C28FCD /* ClientApp_CocoaPods_iOS13.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ClientApp_CocoaPods_iOS13.entitlements; sourceTree = "<group>"; };
EAA0A9992AD8495000C28FCD /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
Expand Down
45 changes: 45 additions & 0 deletions IntegrationTesting/ClientApp/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
source 'https://github.com/firebase/SpecsDev.git'
source 'https://github.com/firebase/SpecsStaging.git'
source 'https://cdn.cocoapods.org/'

target 'ClientApp-CocoaPods' do
platform :ios, '11.0'

use_frameworks!

pod 'FirebaseCore', :path => '../../'
pod 'FirebaseInstallations', :path => '../../'
pod 'FirebaseAnalytics' # Binary pods don't work with `:path`.
pod 'FirebaseAnalyticsOnDeviceConversion', :path => '../../'
pod 'FirebaseABTesting', :path => '../../'
pod 'FirebaseAppCheck', :path => '../../'
pod 'FirebaseRemoteConfig', :path => '../../'
pod 'FirebaseRemoteConfigSwift', :path => '../../'
pod 'FirebaseAppDistribution', :path => '../../'
pod 'FirebaseAuth', :path => '../../'
pod 'FirebaseCrashlytics', :path => '../../'
pod 'FirebaseDatabase', :path => '../../'
pod 'FirebaseDatabaseSwift', :path => '../../'
pod 'FirebaseDynamicLinks', :path => '../../'
pod 'FirebaseFirestore', :path => '../../'
pod 'FirebaseFirestoreSwift', :path => '../../'
pod 'FirebaseFunctions', :path => '../../'
pod 'FirebaseInAppMessaging', :path => '../../'
pod 'FirebaseMessaging', :path => '../../'
pod 'FirebasePerformance', :path => '../../'
pod 'FirebaseStorage', :path => '../../'
pod 'FirebaseMLModelDownloader', :path => '../../'
pod 'Firebase', :path => '../../'
end

target 'ClientApp-CocoaPods-iOS13' do
platform :ios, '13.0'

use_frameworks!

pod 'FirebaseAnalytics' # Binary pods don't work with `:path`.
pod 'FirebaseAnalyticsSwift', :path => '../../' # Requires iOS 13.0+
pod 'FirebaseInAppMessaging', :path => '../../'
pod 'FirebaseInAppMessagingSwift', :path => '../../' # Requires iOS 13.0+

end
4 changes: 2 additions & 2 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -666,15 +666,15 @@ case "$product-$platform-$method" in

ClientApp-iOS-xcodebuild | ClientApp-iOS13-iOS-xcodebuild)
RunXcodebuild \
-project 'ClientApp/ClientApp.xcodeproj' \
-project 'IntegrationTesting/ClientApp/ClientApp.xcodeproj' \
-scheme $product \
"${xcb_flags[@]}" \
build
;;

ClientApp-CocoaPods*-iOS-xcodebuild)
RunXcodebuild \
-workspace 'ClientApp/ClientApp.xcworkspace' \
-workspace 'IntegrationTesting/ClientApp/ClientApp.xcworkspace' \
-scheme $product \
"${xcb_flags[@]}" \
build
Expand Down
2 changes: 1 addition & 1 deletion scripts/check_imports.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ let skipDirPatterns = ["/Sample/", "/Pods/",
[
"CoreOnly/Sources", // Skip Firebase.h.
"SwiftPMTests", // The SwiftPM tests test module imports.
"ClientApp", // The ClientApp tests module imports.
"IntegrationTesting/ClientApp", // The ClientApp tests module imports.
"FirebaseSessions/Protogen/", // Generated nanopb code with imports
] +

Expand Down
2 changes: 1 addition & 1 deletion scripts/install_prereqs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ case "$project-$platform-$method" in

ClientApp-iOS-xcodebuild)
install_xcpretty
bundle exec pod install --project-directory=ClientApp/ --repo-update
bundle exec pod install --project-directory=IntegrationTesting/ClientApp/ --repo-update
;;

*-pod-lib-lint)
Expand Down