Fix nasty Xcode 12 SPM bug by using this fix (Firebase SPM package wa…

…s culprit): firebase/firebase-ios-sdk#6472 (comment)
OpenZesame · Feb 27, 2021 · 2b83bdd · 2b83bdd
1 parent c892c48
commit 2b83bdd
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/Sources/Application/Zhip-Info.plist b/Sources/Application/Zhip-Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>1.0.3</string>
 	<key>CFBundleVersion</key>
-	<string>15</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/Zhip.xcodeproj/project.pbxproj b/Zhip.xcodeproj/project.pbxproj
@@ -2481,6 +2481,7 @@
 			baseConfigurationReference = 4858D7B42194F92800030237 /* Zhip-Debug.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = Zhip.entitlements;
+				CURRENT_PROJECT_VERSION = 1003;
 				DEVELOPMENT_TEAM = S33QJG3B86;
 				PROVISIONING_PROFILE_SPECIFIER = "Zhip iOS Dev Cert";
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
@@ -2492,6 +2493,9 @@
 			baseConfigurationReference = 4858D7B52194F92800030237 /* Zhip-Release.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = Zhip.entitlements;
+				CURRENT_PROJECT_VERSION = 1003;
+				DEVELOPMENT_TEAM = S33QJG3B86;
+				PROVISIONING_PROFILE_SPECIFIER = "Zhip iOS AppStore Release";
 			};
 			name = Release;
 		};

diff --git a/Zhip.xcodeproj/xcshareddata/xcschemes/Zhip.xcscheme b/Zhip.xcodeproj/xcshareddata/xcschemes/Zhip.xcscheme
@@ -1,10 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1240"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PostActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Script"
+               scriptText = "rm -rf &quot;${TARGET_BUILD_DIR}/${TARGET_NAME}.app/Frameworks/FirebaseAnalytics.framework&quot;&#10;rm -rf &quot;${TARGET_BUILD_DIR}/${TARGET_NAME}.app/Frameworks/GoogleAppMeasurement.framework&quot;&#10;rm -rf &quot;${TARGET_BUILD_DIR}/${TARGET_NAME}.app/Frameworks/FIRAnalyticsConnector.framework&quot;&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "484B063520BA0C2D00C4E50A"
+                     BuildableName = "Zhip.app"
+                     BlueprintName = "Zhip"
+                     ReferencedContainer = "container:Zhip.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PostActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"