Procházet zdrojové kódy

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

Nick Cooke před 2 roky
rodič
revize
16ddaabbc1
24 změnil soubory, kde provedl 51 přidání a 51 odebrání
  1. 1 1
      .github/workflows/client_app.yml
  2. 0 45
      ClientApp/Podfile
  3. 0 0
      IntegrationTesting/ClientApp/ClientApp-CocoaPods-iOS13/ClientApp_CocoaPods_iOS13.entitlements
  4. 0 0
      IntegrationTesting/ClientApp/ClientApp-CocoaPods-iOS13/Preview Content/Preview Assets.xcassets/Contents.json
  5. 0 0
      IntegrationTesting/ClientApp/ClientApp-CocoaPods/ClientApp_CocoaPods.entitlements
  6. 0 0
      IntegrationTesting/ClientApp/ClientApp-CocoaPods/Preview Content/Preview Assets.xcassets/Contents.json
  7. 0 0
      IntegrationTesting/ClientApp/ClientApp-iOS13/ClientApp_iOS13.entitlements
  8. 0 0
      IntegrationTesting/ClientApp/ClientApp-iOS13/Preview Content/Preview Assets.xcassets/Contents.json
  9. 1 1
      IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj
  10. 0 0
      IntegrationTesting/ClientApp/ClientApp/ClientApp.entitlements
  11. 0 0
      IntegrationTesting/ClientApp/ClientApp/Preview Content/Preview Assets.xcassets/Contents.json
  12. 45 0
      IntegrationTesting/ClientApp/Podfile
  13. 0 0
      IntegrationTesting/ClientApp/Shared-iOS11+/objc-header-import-test.m
  14. 0 0
      IntegrationTesting/ClientApp/Shared-iOS11+/objc-module-import-test.m
  15. 0 0
      IntegrationTesting/ClientApp/Shared-iOS11+/objcxx-header-import-test.mm
  16. 0 0
      IntegrationTesting/ClientApp/Shared-iOS11+/swift-import-test.swift
  17. 0 0
      IntegrationTesting/ClientApp/Shared-iOS13+/swift-import-test.swift
  18. 0 0
      IntegrationTesting/ClientApp/Shared/AppDelegate.swift
  19. 0 0
      IntegrationTesting/ClientApp/Shared/Assets.xcassets/AccentColor.colorset/Contents.json
  20. 0 0
      IntegrationTesting/ClientApp/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json
  21. 0 0
      IntegrationTesting/ClientApp/Shared/Assets.xcassets/Contents.json
  22. 2 2
      scripts/build.sh
  23. 1 1
      scripts/check_imports.swift
  24. 1 1
      scripts/install_prereqs.sh

+ 1 - 1
.github/workflows/client_app.yml

@@ -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

+ 0 - 45
ClientApp/Podfile

@@ -1,45 +0,0 @@
-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

+ 0 - 0
ClientApp/ClientApp-CocoaPods-iOS13/ClientApp_CocoaPods_iOS13.entitlements → IntegrationTesting/ClientApp/ClientApp-CocoaPods-iOS13/ClientApp_CocoaPods_iOS13.entitlements


+ 0 - 0
ClientApp/ClientApp-CocoaPods-iOS13/Preview Content/Preview Assets.xcassets/Contents.json → IntegrationTesting/ClientApp/ClientApp-CocoaPods-iOS13/Preview Content/Preview Assets.xcassets/Contents.json


+ 0 - 0
ClientApp/ClientApp-CocoaPods/ClientApp_CocoaPods.entitlements → IntegrationTesting/ClientApp/ClientApp-CocoaPods/ClientApp_CocoaPods.entitlements


+ 0 - 0
ClientApp/ClientApp-CocoaPods/Preview Content/Preview Assets.xcassets/Contents.json → IntegrationTesting/ClientApp/ClientApp-CocoaPods/Preview Content/Preview Assets.xcassets/Contents.json


+ 0 - 0
ClientApp/ClientApp-iOS13/ClientApp_iOS13.entitlements → IntegrationTesting/ClientApp/ClientApp-iOS13/ClientApp_iOS13.entitlements


+ 0 - 0
ClientApp/ClientApp-iOS13/Preview Content/Preview Assets.xcassets/Contents.json → IntegrationTesting/ClientApp/ClientApp-iOS13/Preview Content/Preview Assets.xcassets/Contents.json


+ 1 - 1
ClientApp/ClientApp.xcodeproj/project.pbxproj → IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj

@@ -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>"; };

+ 0 - 0
ClientApp/ClientApp/ClientApp.entitlements → IntegrationTesting/ClientApp/ClientApp/ClientApp.entitlements


+ 0 - 0
ClientApp/ClientApp/Preview Content/Preview Assets.xcassets/Contents.json → IntegrationTesting/ClientApp/ClientApp/Preview Content/Preview Assets.xcassets/Contents.json


+ 45 - 0
IntegrationTesting/ClientApp/Podfile

@@ -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

+ 0 - 0
ClientApp/Shared-iOS11+/objc-header-import-test.m → IntegrationTesting/ClientApp/Shared-iOS11+/objc-header-import-test.m


+ 0 - 0
ClientApp/Shared-iOS11+/objc-module-import-test.m → IntegrationTesting/ClientApp/Shared-iOS11+/objc-module-import-test.m


+ 0 - 0
ClientApp/Shared-iOS11+/objcxx-header-import-test.mm → IntegrationTesting/ClientApp/Shared-iOS11+/objcxx-header-import-test.mm


+ 0 - 0
ClientApp/Shared-iOS11+/swift-import-test.swift → IntegrationTesting/ClientApp/Shared-iOS11+/swift-import-test.swift


+ 0 - 0
ClientApp/Shared-iOS13+/swift-import-test.swift → IntegrationTesting/ClientApp/Shared-iOS13+/swift-import-test.swift


+ 0 - 0
ClientApp/Shared/AppDelegate.swift → IntegrationTesting/ClientApp/Shared/AppDelegate.swift


+ 0 - 0
ClientApp/Shared/Assets.xcassets/AccentColor.colorset/Contents.json → IntegrationTesting/ClientApp/Shared/Assets.xcassets/AccentColor.colorset/Contents.json


+ 0 - 0
ClientApp/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json → IntegrationTesting/ClientApp/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json


+ 0 - 0
ClientApp/Shared/Assets.xcassets/Contents.json → IntegrationTesting/ClientApp/Shared/Assets.xcassets/Contents.json


+ 2 - 2
scripts/build.sh

@@ -666,7 +666,7 @@ 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
@@ -674,7 +674,7 @@ case "$product-$platform-$method" in
 
   ClientApp-CocoaPods*-iOS-xcodebuild)
     RunXcodebuild \
-      -workspace 'ClientApp/ClientApp.xcworkspace' \
+      -workspace 'IntegrationTesting/ClientApp/ClientApp.xcworkspace' \
       -scheme $product \
       "${xcb_flags[@]}" \
       build

+ 1 - 1
scripts/check_imports.swift

@@ -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
   ] +
 

+ 1 - 1
scripts/install_prereqs.sh

@@ -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)