From 11e4ec51623b12ccdd22be0f6e5510a37ca5addb Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Wed, 27 Dec 2023 14:51:19 -0500 Subject: [PATCH 1/3] [Infra] Move CocoapodsIntegrationTest/ out of repo root --- .../CocoapodsIntegrationTest.xcodeproj/project.pbxproj | 0 .../xcshareddata/xcschemes/CocoapodsIntegrationTest.xcscheme | 0 .../CocoapodsIntegrationTest/AppDelegate.h | 0 .../CocoapodsIntegrationTest/AppDelegate.m | 0 .../Assets.xcassets/AppIcon.appiconset/Contents.json | 0 .../CocoapodsIntegrationTest/Assets.xcassets/Contents.json | 0 .../CocoapodsIntegrationTest/Base.lproj/LaunchScreen.storyboard | 0 .../CocoapodsIntegrationTest/Base.lproj/Main.storyboard | 0 .../CocoapodsIntegrationTest}/CocoapodsIntegrationTest/Info.plist | 0 .../CocoapodsIntegrationTest/ViewController.h | 0 .../CocoapodsIntegrationTest/ViewController.m | 0 .../CocoapodsIntegrationTest}/CocoapodsIntegrationTest/main.m | 0 .../TestEnvironments/Cocoapods_multiprojects_frameworks/Gemfile | 0 .../TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile | 0 .../CocoapodsIntegrationTest}/scripts/build_all_environments.sh | 0 .../CocoapodsIntegrationTest}/scripts/build_with_environment.sh | 0 16 files changed, 0 insertions(+), 0 deletions(-) rename {CocoapodsIntegrationTest => IntegrationTesting/CocoapodsIntegrationTest}/CocoapodsIntegrationTest.xcodeproj/project.pbxproj (100%) rename {CocoapodsIntegrationTest => IntegrationTesting/CocoapodsIntegrationTest}/CocoapodsIntegrationTest.xcodeproj/xcshareddata/xcschemes/CocoapodsIntegrationTest.xcscheme (100%) rename {CocoapodsIntegrationTest => IntegrationTesting/CocoapodsIntegrationTest}/CocoapodsIntegrationTest/AppDelegate.h (100%) rename {CocoapodsIntegrationTest => IntegrationTesting/CocoapodsIntegrationTest}/CocoapodsIntegrationTest/AppDelegate.m (100%) rename {CocoapodsIntegrationTest => IntegrationTesting/CocoapodsIntegrationTest}/CocoapodsIntegrationTest/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {CocoapodsIntegrationTest => IntegrationTesting/CocoapodsIntegrationTest}/CocoapodsIntegrationTest/Assets.xcassets/Contents.json (100%) rename {CocoapodsIntegrationTest => IntegrationTesting/CocoapodsIntegrationTest}/CocoapodsIntegrationTest/Base.lproj/LaunchScreen.storyboard (100%) rename {CocoapodsIntegrationTest => IntegrationTesting/CocoapodsIntegrationTest}/CocoapodsIntegrationTest/Base.lproj/Main.storyboard (100%) rename {CocoapodsIntegrationTest => IntegrationTesting/CocoapodsIntegrationTest}/CocoapodsIntegrationTest/Info.plist (100%) rename {CocoapodsIntegrationTest => IntegrationTesting/CocoapodsIntegrationTest}/CocoapodsIntegrationTest/ViewController.h (100%) rename {CocoapodsIntegrationTest => IntegrationTesting/CocoapodsIntegrationTest}/CocoapodsIntegrationTest/ViewController.m (100%) rename {CocoapodsIntegrationTest => IntegrationTesting/CocoapodsIntegrationTest}/CocoapodsIntegrationTest/main.m (100%) rename {CocoapodsIntegrationTest => IntegrationTesting/CocoapodsIntegrationTest}/TestEnvironments/Cocoapods_multiprojects_frameworks/Gemfile (100%) rename {CocoapodsIntegrationTest => IntegrationTesting/CocoapodsIntegrationTest}/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile (100%) rename {CocoapodsIntegrationTest => IntegrationTesting/CocoapodsIntegrationTest}/scripts/build_all_environments.sh (100%) rename {CocoapodsIntegrationTest => IntegrationTesting/CocoapodsIntegrationTest}/scripts/build_with_environment.sh (100%) diff --git a/CocoapodsIntegrationTest/CocoapodsIntegrationTest.xcodeproj/project.pbxproj b/IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest.xcodeproj/project.pbxproj similarity index 100% rename from CocoapodsIntegrationTest/CocoapodsIntegrationTest.xcodeproj/project.pbxproj rename to IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest.xcodeproj/project.pbxproj diff --git a/CocoapodsIntegrationTest/CocoapodsIntegrationTest.xcodeproj/xcshareddata/xcschemes/CocoapodsIntegrationTest.xcscheme b/IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest.xcodeproj/xcshareddata/xcschemes/CocoapodsIntegrationTest.xcscheme similarity index 100% rename from CocoapodsIntegrationTest/CocoapodsIntegrationTest.xcodeproj/xcshareddata/xcschemes/CocoapodsIntegrationTest.xcscheme rename to IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest.xcodeproj/xcshareddata/xcschemes/CocoapodsIntegrationTest.xcscheme diff --git a/CocoapodsIntegrationTest/CocoapodsIntegrationTest/AppDelegate.h b/IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/AppDelegate.h similarity index 100% rename from CocoapodsIntegrationTest/CocoapodsIntegrationTest/AppDelegate.h rename to IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/AppDelegate.h diff --git a/CocoapodsIntegrationTest/CocoapodsIntegrationTest/AppDelegate.m b/IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/AppDelegate.m similarity index 100% rename from CocoapodsIntegrationTest/CocoapodsIntegrationTest/AppDelegate.m rename to IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/AppDelegate.m diff --git a/CocoapodsIntegrationTest/CocoapodsIntegrationTest/Assets.xcassets/AppIcon.appiconset/Contents.json b/IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from CocoapodsIntegrationTest/CocoapodsIntegrationTest/Assets.xcassets/AppIcon.appiconset/Contents.json rename to IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/CocoapodsIntegrationTest/CocoapodsIntegrationTest/Assets.xcassets/Contents.json b/IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/Assets.xcassets/Contents.json similarity index 100% rename from CocoapodsIntegrationTest/CocoapodsIntegrationTest/Assets.xcassets/Contents.json rename to IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/Assets.xcassets/Contents.json diff --git a/CocoapodsIntegrationTest/CocoapodsIntegrationTest/Base.lproj/LaunchScreen.storyboard b/IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from CocoapodsIntegrationTest/CocoapodsIntegrationTest/Base.lproj/LaunchScreen.storyboard rename to IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/Base.lproj/LaunchScreen.storyboard diff --git a/CocoapodsIntegrationTest/CocoapodsIntegrationTest/Base.lproj/Main.storyboard b/IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/Base.lproj/Main.storyboard similarity index 100% rename from CocoapodsIntegrationTest/CocoapodsIntegrationTest/Base.lproj/Main.storyboard rename to IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/Base.lproj/Main.storyboard diff --git a/CocoapodsIntegrationTest/CocoapodsIntegrationTest/Info.plist b/IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/Info.plist similarity index 100% rename from CocoapodsIntegrationTest/CocoapodsIntegrationTest/Info.plist rename to IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/Info.plist diff --git a/CocoapodsIntegrationTest/CocoapodsIntegrationTest/ViewController.h b/IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/ViewController.h similarity index 100% rename from CocoapodsIntegrationTest/CocoapodsIntegrationTest/ViewController.h rename to IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/ViewController.h diff --git a/CocoapodsIntegrationTest/CocoapodsIntegrationTest/ViewController.m b/IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/ViewController.m similarity index 100% rename from CocoapodsIntegrationTest/CocoapodsIntegrationTest/ViewController.m rename to IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/ViewController.m diff --git a/CocoapodsIntegrationTest/CocoapodsIntegrationTest/main.m b/IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/main.m similarity index 100% rename from CocoapodsIntegrationTest/CocoapodsIntegrationTest/main.m rename to IntegrationTesting/CocoapodsIntegrationTest/CocoapodsIntegrationTest/main.m diff --git a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Gemfile b/IntegrationTesting/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Gemfile similarity index 100% rename from CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Gemfile rename to IntegrationTesting/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Gemfile diff --git a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile b/IntegrationTesting/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile similarity index 100% rename from CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile rename to IntegrationTesting/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile diff --git a/CocoapodsIntegrationTest/scripts/build_all_environments.sh b/IntegrationTesting/CocoapodsIntegrationTest/scripts/build_all_environments.sh similarity index 100% rename from CocoapodsIntegrationTest/scripts/build_all_environments.sh rename to IntegrationTesting/CocoapodsIntegrationTest/scripts/build_all_environments.sh diff --git a/CocoapodsIntegrationTest/scripts/build_with_environment.sh b/IntegrationTesting/CocoapodsIntegrationTest/scripts/build_with_environment.sh similarity index 100% rename from CocoapodsIntegrationTest/scripts/build_with_environment.sh rename to IntegrationTesting/CocoapodsIntegrationTest/scripts/build_with_environment.sh From f4dbc7e78d1c63059c2bfa2f2f6984d0ca0cb49a Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Wed, 27 Dec 2023 14:55:49 -0500 Subject: [PATCH 2/3] Update relative path references --- .../Podfile | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/IntegrationTesting/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile b/IntegrationTesting/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile index 3307b3c53c7..03bfe2e2d04 100644 --- a/IntegrationTesting/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile +++ b/IntegrationTesting/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile @@ -8,25 +8,25 @@ platform :ios, '11.0' target 'CocoapodsIntegrationTest' do # Comment the next line if you don't want to use dynamic frameworks use_frameworks! - pod 'FirebaseABTesting', :path => '../' - pod 'FirebaseAppDistribution', :path => '../' - pod 'FirebaseAppCheckInterop', :path => '../' - pod 'FirebaseCore', :path => '../' - pod 'FirebaseCoreExtension', :path => '../' - pod 'FirebaseCoreInternal', :path => '../' - pod 'FirebaseCrashlytics', :path => '../' - pod 'FirebaseAuth', :path => '../' - pod 'FirebaseAuthInterop', :path => '../' - pod 'FirebaseDatabase', :path => '../' - pod 'FirebaseDynamicLinks', :path => '../' - pod 'FirebaseFirestore', :path => '../' - pod 'FirebaseFunctions', :path => '../' - pod 'FirebaseInAppMessaging', :path => '../' - pod 'FirebaseInstallations', :path => '../' - pod 'FirebaseMessaging', :path => '../' - pod 'FirebaseMessagingInterop', :path => '../' - pod 'FirebasePerformance', :path => '../' - pod 'FirebaseStorage', :path => '../' + pod 'FirebaseABTesting', :path => '../../' + pod 'FirebaseAppDistribution', :path => '../../' + pod 'FirebaseAppCheckInterop', :path => '../../' + pod 'FirebaseCore', :path => '../../' + pod 'FirebaseCoreExtension', :path => '../../' + pod 'FirebaseCoreInternal', :path => '../../' + pod 'FirebaseCrashlytics', :path => '../../' + pod 'FirebaseAuth', :path => '../../' + pod 'FirebaseAuthInterop', :path => '../../' + pod 'FirebaseDatabase', :path => '../../' + pod 'FirebaseDynamicLinks', :path => '../../' + pod 'FirebaseFirestore', :path => '../../' + pod 'FirebaseFunctions', :path => '../../' + pod 'FirebaseInAppMessaging', :path => '../../' + pod 'FirebaseInstallations', :path => '../../' + pod 'FirebaseMessaging', :path => '../../' + pod 'FirebaseMessagingInterop', :path => '../../' + pod 'FirebasePerformance', :path => '../../' + pod 'FirebaseStorage', :path => '../../' end # Using the new speed-enhancing features available with CocoaPods 1.7+ From 980f699105c11332f79bc1756a5929eb168717d2 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Wed, 27 Dec 2023 16:07:04 -0500 Subject: [PATCH 3/3] Update path references to reflect new location --- .github/workflows/cocoapods-integration.yml | 8 ++++---- scripts/check_imports.swift | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cocoapods-integration.yml b/.github/workflows/cocoapods-integration.yml index 24848968a79..c182ff0701d 100644 --- a/.github/workflows/cocoapods-integration.yml +++ b/.github/workflows/cocoapods-integration.yml @@ -3,7 +3,7 @@ name: cocoapods-integration on: pull_request: paths: - - 'CocoapodsIntegrationTest/**' + - 'IntegrationTesting/CocoapodsIntegrationTest/**' - '.github/workflows/cocoapods-integration.yml' - 'Gemfile*' schedule: @@ -29,6 +29,6 @@ jobs: run: brew install coreutils - name: Build and test run: | - scripts/third_party/travis/retry.sh ./CocoapodsIntegrationTest/scripts/build_with_environment.sh \ - --gemfile=./CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Gemfile \ - --podfile=./CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile + scripts/third_party/travis/retry.sh ./IntegrationTesting/CocoapodsIntegrationTest/scripts/build_with_environment.sh \ + --gemfile=./IntegrationTesting/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Gemfile \ + --podfile=./IntegrationTesting/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile diff --git a/scripts/check_imports.swift b/scripts/check_imports.swift index 5db866dd3d9..04e84aea876 100755 --- a/scripts/check_imports.swift +++ b/scripts/check_imports.swift @@ -28,7 +28,8 @@ let skipDirPatterns = ["/Sample/", "/Pods/", "FirebaseDynamicLinks/Tests/Integration", "FirebaseInAppMessaging/Tests/Integration/", "SymbolCollisionTest/", "/gen/", - "CocoapodsIntegrationTest/", "FirebasePerformance/Tests/TestApp/", + "IntegrationTesting/CocoapodsIntegrationTest/", + "FirebasePerformance/Tests/TestApp/", "cmake-build-debug/", "build/", "ObjCIntegration/", "FirebasePerformance/Tests/FIRPerfE2E/"] + [