diff --git a/analytics/integration_test/Podfile b/analytics/integration_test/Podfile index 83b48e29d0..4d3462df00 100644 --- a/analytics/integration_test/Podfile +++ b/analytics/integration_test/Podfile @@ -4,18 +4,35 @@ platform :ios, '13.0' use_frameworks! :linkage => :static target 'integration_test' do - platform :ios, '13.0' - pod 'Firebase/Analytics', '11.4.2' +# platform :ios, '13.0' +# pod 'Firebase/Analytics', '11.4.2' end target 'integration_test_tvos' do - platform :tvos, '13.0' - pod 'Firebase/Analytics', '11.4.2' +# platform :tvos, '13.0' +# pod 'Firebase/Analytics', '11.4.2' end post_install do |installer| # If this is running from inside the SDK directory, run the setup script. system("if [[ -r ../../setup_integration_tests.py ]]; then python3 ../../setup_integration_tests.py .; fi") system("python3 ./download_googletest.py") + + swift_package = installer.pods_project.new Xcodeproj::Project::Object::XCRemoteSwiftPackageReference + swift_package.repositoryURL = "https://github.com/firebase/firebase-ios-sdk" + swift_package.requirement = { + "kind" => "upToNextMajorVersion", + "minimumVersion" => "11.5.0" + } + + swift_package_product = installer.pods_project.new Xcodeproj::Project::Object::XCSwiftPackageProductDependency + swift_package_product.package = swift_package + swift_package_product.product_name = "FirebaseAnalytics" + + installer.pods_project.root_object.package_references << swift_package + installer.pods_project.native_targets.each do |target| + target.package_product_dependencies << swift_package_product + end + end diff --git a/scripts/gha/build_testapps.py b/scripts/gha/build_testapps.py index 867202f71e..2663262d1a 100644 --- a/scripts/gha/build_testapps.py +++ b/scripts/gha/build_testapps.py @@ -636,6 +636,8 @@ def _build_apple( logging.info("No entitlements found at %s.", entitlements_path) _run(xcode_patcher_args) + _run(["xcodebuild", "-resolvePackageDependencies", "-project", "integration_test.xcodeproj"]) + xcode_path = os.path.join(project_dir, "integration_test.xcworkspace") if _APPLE_SDK_SIMULATOR in apple_sdk: _run(