Skip to content

Commit 48ae356

Browse files
ps2ps2
committed
Carthage fixes for building with Xcode12
1 parent 7907ffd commit 48ae356

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

‎Loop.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2417,7 +2417,7 @@
24172417
);
24182418
runOnlyForDeploymentPostprocessing = 0;
24192419
shellPath = /bin/sh;
2420-
shellScript = "if [ -f $PROJECT_DIR/.gitmodules ]; then\n echo \"Skipping checkout due to presence of .gitmodules file\"\n if [ $ACTION = \"install\" ]; then\n echo \"You're installing: Make sure to keep all submodules up-to-date and run carthage build after changes.\"\n fi\nelse\n echo \"Bootstrapping carthage dependencies\"\n unset LLVM_TARGET_TRIPLE_SUFFIX\n /usr/local/bin/carthage bootstrap --project-directory \"$SRCROOT\" --cache-builds\nfi\n";
2420+
shellScript = "\n\nif [ -f $PROJECT_DIR/.gitmodules ]; then\n echo \"Skipping checkout due to presence of .gitmodules file\"\n if [ $ACTION = \"install\" ]; then\n echo \"You're installing: Make sure to keep all submodules up-to-date and run carthage build after changes.\"\n fi\nelse\n echo \"Bootstrapping carthage dependencies\"\n\n xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX)\n trap 'rm -f \"$xcconfig\"' INT TERM HUP EXIT\n\n# For Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise\n# the build will fail on lipo due to duplicate architectures.\n# Xcode 12 Beta 3:\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A8169g = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\n# Xcode 12 beta 4\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A8179i = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\n# Xcode 12 beta 5\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A8189h = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\n# Xcode 12 beta 6\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A8189n = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\n# Xcode 12 GM\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A7208 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\n# Xcode 12 GM 2\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A7209 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig\necho 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_$(XCODE_PRODUCT_BUILD_VERSION))' >> $xcconfig\necho 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig\necho 'ONLY_ACTIVE_ARCH=NO' >> $xcconfig\necho 'VALID_ARCHS = $(inherited) x86_64' >> $xcconfig\nexport XCODE_XCCONFIG_FILE=\"$xcconfig\"\necho $XCODE_XCCONFIG_FILE\n cat $XCODE_XCCONFIG_FILE\n unset LLVM_TARGET_TRIPLE_SUFFIX\n /usr/local/bin/carthage bootstrap --project-directory \"$SRCROOT\" --cache-builds\nfi\n";
24212421
};
24222422
432CF88220D8BCD90066B889 /* Homebrew & Carthage Setup */ = {
24232423
isa = PBXShellScriptBuildPhase;

‎Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090
launchAutomaticallySubstyle = "32">
9191
<RemoteRunnable
9292
runnableDebuggingMode = "2"
93-
BundleIdentifier = "com.apple.carousel"
94-
RemotePath = "/Naterade">
93+
BundleIdentifier = "com.apple.Carousel"
94+
RemotePath = "/$(MAIN_APP_DISPLAY_NAME)">
9595
<BuildableReference
9696
BuildableIdentifier = "primary"
9797
BlueprintIdentifier = "43A943711B926B7B0051FA24"
@@ -110,8 +110,8 @@
110110
launchAutomaticallySubstyle = "32">
111111
<RemoteRunnable
112112
runnableDebuggingMode = "2"
113-
BundleIdentifier = "com.apple.carousel"
114-
RemotePath = "/Naterade">
113+
BundleIdentifier = "com.apple.Carousel"
114+
RemotePath = "/$(MAIN_APP_DISPLAY_NAME)">
115115
<BuildableReference
116116
BuildableIdentifier = "primary"
117117
BlueprintIdentifier = "43A943711B926B7B0051FA24"

‎Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@
9191
notificationPayloadFile = "WatchApp Extension/PushNotificationPayload.apns">
9292
<RemoteRunnable
9393
runnableDebuggingMode = "2"
94-
BundleIdentifier = "com.apple.carousel"
95-
RemotePath = "/Naterade">
94+
BundleIdentifier = "com.apple.Carousel"
95+
RemotePath = "/$(MAIN_APP_DISPLAY_NAME)">
9696
<BuildableReference
9797
BuildableIdentifier = "primary"
9898
BlueprintIdentifier = "43A943711B926B7B0051FA24"
@@ -112,8 +112,8 @@
112112
notificationPayloadFile = "WatchApp Extension/PushNotificationPayload.apns">
113113
<RemoteRunnable
114114
runnableDebuggingMode = "2"
115-
BundleIdentifier = "com.apple.carousel"
116-
RemotePath = "/Naterade">
115+
BundleIdentifier = "com.apple.Carousel"
116+
RemotePath = "/$(MAIN_APP_DISPLAY_NAME)">
117117
<BuildableReference
118118
BuildableIdentifier = "primary"
119119
BlueprintIdentifier = "43A943711B926B7B0051FA24"

‎Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090
notificationPayloadFile = "WatchApp Extension/PushNotificationPayload.apns">
9191
<RemoteRunnable
9292
runnableDebuggingMode = "2"
93-
BundleIdentifier = "com.apple.carousel"
94-
RemotePath = "/Naterade">
93+
BundleIdentifier = "com.apple.Carousel"
94+
RemotePath = "/$(MAIN_APP_DISPLAY_NAME)">
9595
<BuildableReference
9696
BuildableIdentifier = "primary"
9797
BlueprintIdentifier = "43A943711B926B7B0051FA24"
@@ -110,8 +110,8 @@
110110
notificationPayloadFile = "WatchApp Extension/PushNotificationPayload.apns">
111111
<RemoteRunnable
112112
runnableDebuggingMode = "2"
113-
BundleIdentifier = "com.apple.carousel"
114-
RemotePath = "/Naterade">
113+
BundleIdentifier = "com.apple.Carousel"
114+
RemotePath = "/$(MAIN_APP_DISPLAY_NAME)">
115115
<BuildableReference
116116
BuildableIdentifier = "primary"
117117
BlueprintIdentifier = "43A943711B926B7B0051FA24"

0 commit comments

Comments
 (0)