Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Feb 27, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b83bdd
Fix nasty Xcode 12 SPM bug by using this fix (Firebase SPM package wa…
Sajjon Feb 27, 2021
ba8c9e5
Merge branch 'main' into ui_fixes
Sajjon Feb 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Sources/Application/Zhip-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions Zhip.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -2492,6 +2493,7 @@
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";
};
Expand Down
20 changes: 19 additions & 1 deletion Zhip.xcodeproj/xcshareddata/xcschemes/Zhip.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down