From a45d48ca0bcb64bb56c0f6bcc39a5f26f7eb81eb Mon Sep 17 00:00:00 2001 From: Victor Sarda Date: Sat, 17 Apr 2021 22:35:28 +0100 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20Build=20script=20to=20preven?= =?UTF-8?q?t=20archive=20upload=20issues?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/firebase/firebase-ios-sdk/issues/6472 --- ViteMaDose.xcodeproj/project.pbxproj | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/ViteMaDose.xcodeproj/project.pbxproj b/ViteMaDose.xcodeproj/project.pbxproj index 6ad113d9..836e1800 100644 --- a/ViteMaDose.xcodeproj/project.pbxproj +++ b/ViteMaDose.xcodeproj/project.pbxproj @@ -475,7 +475,8 @@ 576738B9261E329C004A700D /* Frameworks */, 576738BA261E329C004A700D /* Resources */, 57613EF8262507C800AB6F2F /* Embed Frameworks */, - DA68646626276624005B2AC2 /* ShellScript */, + DA68646626276624005B2AC2 /* Crashlytics */, + 577A7F2B262B8AB600B1D03C /* Firebase SPM */, ); buildRules = ( ); @@ -616,7 +617,25 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - DA68646626276624005B2AC2 /* ShellScript */ = { + 577A7F2B262B8AB600B1D03C /* Firebase SPM */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Firebase SPM "; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# Fixes binary framework bug, see:\n# https://developer.apple.com/documentation/xcode-release-notes/xcode-12_4-release-notes#Swift-Packages\n# https://github.com/firebase/firebase-ios-sdk/issues/6472\n#\n\necho \"Removing static frameworks from ${TARGET_NAME}.app\"\nfind \"${BUILT_PRODUCTS_DIR}/${TARGET_NAME}.app/\" -name '*.framework' -print0 | while IFS= read -r -d '' fm; do\n name=$(basename \"${fm}\" .framework)\n target=\"${fm}/${name}\"\n echo \"Checking: ${fm}\"\n if file \"${target}\" | grep -q \"current ar archive\"; then\n rm -rf \"${fm}\"\n echo \"Removed static framework: ${fm}\"\n fi\ndone\n"; + }; + DA68646626276624005B2AC2 /* Crashlytics */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 12; @@ -626,13 +645,14 @@ ); inputPaths = ( ); + name = Crashlytics; outputFileListPaths = ( ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n\n${BUILD_DIR%Build/*}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run\n"; + shellScript = "${BUILD_DIR%Build/*}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run\n"; }; /* End PBXShellScriptBuildPhase section */ From 5682dfd524d8d798f45f3cc7ff22a3f0c643a4d0 Mon Sep 17 00:00:00 2001 From: Victor Sarda Date: Sun, 18 Apr 2021 01:56:40 +0100 Subject: [PATCH 2/3] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Added=20build=20depend?= =?UTF-8?q?encies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ViteMaDose.xcodeproj/project.pbxproj | 52 +++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/ViteMaDose.xcodeproj/project.pbxproj b/ViteMaDose.xcodeproj/project.pbxproj index 836e1800..c22ffb22 100644 --- a/ViteMaDose.xcodeproj/project.pbxproj +++ b/ViteMaDose.xcodeproj/project.pbxproj @@ -481,6 +481,11 @@ buildRules = ( ); dependencies = ( + 577A7F39262B900200B1D03C /* PBXTargetDependency */, + 577A7F3B262B900200B1D03C /* PBXTargetDependency */, + 577A7F33262B8FF200B1D03C /* PBXTargetDependency */, + 577A7F35262B8FF200B1D03C /* PBXTargetDependency */, + 577A7F37262B8FF200B1D03C /* PBXTargetDependency */, ); name = ViteMaDose; packageProductDependencies = ( @@ -633,7 +638,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Fixes binary framework bug, see:\n# https://developer.apple.com/documentation/xcode-release-notes/xcode-12_4-release-notes#Swift-Packages\n# https://github.com/firebase/firebase-ios-sdk/issues/6472\n#\n\necho \"Removing static frameworks from ${TARGET_NAME}.app\"\nfind \"${BUILT_PRODUCTS_DIR}/${TARGET_NAME}.app/\" -name '*.framework' -print0 | while IFS= read -r -d '' fm; do\n name=$(basename \"${fm}\" .framework)\n target=\"${fm}/${name}\"\n echo \"Checking: ${fm}\"\n if file \"${target}\" | grep -q \"current ar archive\"; then\n rm -rf \"${fm}\"\n echo \"Removed static framework: ${fm}\"\n fi\ndone\n"; + shellScript = "# Fixes binary framework bug, see:\n# https://developer.apple.com/documentation/xcode-release-notes/xcode-12_4-release-notes#Swift-Packages\n# https://github.com/firebase/firebase-ios-sdk/issues/6472\n#\n\n"; }; DA68646626276624005B2AC2 /* Crashlytics */ = { isa = PBXShellScriptBuildPhase; @@ -730,6 +735,26 @@ target = 576738BB261E329C004A700D /* ViteMaDose */; targetProxy = 576738DE261E32A3004A700D /* PBXContainerItemProxy */; }; + 577A7F33262B8FF200B1D03C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + productRef = 577A7F32262B8FF200B1D03C /* FirebaseAnalytics */; + }; + 577A7F35262B8FF200B1D03C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + productRef = 577A7F34262B8FF200B1D03C /* FirebaseCrashlytics */; + }; + 577A7F37262B8FF200B1D03C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + productRef = 577A7F36262B8FF200B1D03C /* FirebaseRemoteConfig */; + }; + 577A7F39262B900200B1D03C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + productRef = 577A7F38262B900200B1D03C /* SwiftDate */; + }; + 577A7F3B262B900200B1D03C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + productRef = 577A7F3A262B900200B1D03C /* PhoneNumberKit */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -1082,6 +1107,31 @@ package = 57613EFB2625085000AB6F2F /* XCRemoteSwiftPackageReference "SwiftDate" */; productName = SwiftDateStatic; }; + 577A7F32262B8FF200B1D03C /* FirebaseAnalytics */ = { + isa = XCSwiftPackageProductDependency; + package = 575CC216262ADA0D008D1869 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAnalytics; + }; + 577A7F34262B8FF200B1D03C /* FirebaseCrashlytics */ = { + isa = XCSwiftPackageProductDependency; + package = 575CC216262ADA0D008D1869 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseCrashlytics; + }; + 577A7F36262B8FF200B1D03C /* FirebaseRemoteConfig */ = { + isa = XCSwiftPackageProductDependency; + package = 575CC216262ADA0D008D1869 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseRemoteConfig; + }; + 577A7F38262B900200B1D03C /* SwiftDate */ = { + isa = XCSwiftPackageProductDependency; + package = 57613EFB2625085000AB6F2F /* XCRemoteSwiftPackageReference "SwiftDate" */; + productName = SwiftDate; + }; + 577A7F3A262B900200B1D03C /* PhoneNumberKit */ = { + isa = XCSwiftPackageProductDependency; + package = 575CC20F262AD8F6008D1869 /* XCRemoteSwiftPackageReference "PhoneNumberKit" */; + productName = PhoneNumberKit; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 576738B4261E329C004A700D /* Project object */; From 314b851e01890072a0f14120db2b218640a34b98 Mon Sep 17 00:00:00 2001 From: Victor Sarda Date: Sun, 18 Apr 2021 13:13:41 +0100 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=90=9B=20Added=20missing=20script?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ViteMaDose.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ViteMaDose.xcodeproj/project.pbxproj b/ViteMaDose.xcodeproj/project.pbxproj index c22ffb22..5a6b04b4 100644 --- a/ViteMaDose.xcodeproj/project.pbxproj +++ b/ViteMaDose.xcodeproj/project.pbxproj @@ -638,7 +638,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Fixes binary framework bug, see:\n# https://developer.apple.com/documentation/xcode-release-notes/xcode-12_4-release-notes#Swift-Packages\n# https://github.com/firebase/firebase-ios-sdk/issues/6472\n#\n\n"; + shellScript = "# Fixes binary framework bug, see:\n# https://developer.apple.com/documentation/xcode-release-notes/xcode-12_4-release-notes#Swift-Packages\n# https://github.com/firebase/firebase-ios-sdk/issues/6472\n#\n\necho \"Removing static frameworks from ${TARGET_NAME}.app\"\nfind \"${BUILT_PRODUCTS_DIR}/${TARGET_NAME}.app/\" -name '*.framework' -print0 | while IFS= read -r -d '' fm; do\n name=$(basename \"${fm}\" .framework)\n target=\"${fm}/${name}\"\n echo \"Checking: ${fm}\"\n if file \"${target}\" | grep -q \"current ar archive\"; then\n rm -rf \"${fm}\"\n echo \"Removed static framework: ${fm}\"\n fi\ndone\n"; }; DA68646626276624005B2AC2 /* Crashlytics */ = { isa = PBXShellScriptBuildPhase;