Merge pull request #222 from mapbox/sapial/CORESDK-3099/0

Support for maccatalyst in Turf
mapbox · Oct 16, 2024 · 0ab7b51 · 0ab7b51
2 parents a4aeee2 + 7a142fb
commit 0ab7b51
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Turf.xcodeproj/project.pbxproj b/Turf.xcodeproj/project.pbxproj
@@ -612,8 +612,10 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.turf;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator";
+				SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator maccatalyst macosx watchos watchsimulator xros xrsimulator";
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				TARGETED_DEVICE_FAMILY = 2;
 			};
 			name = Debug;
 		};
@@ -633,7 +635,9 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.turf;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator";
+				SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator maccatalyst macosx watchos watchsimulator xros xrsimulator";
+				SUPPORTS_MACCATALYST = YES;
+				TARGETED_DEVICE_FAMILY = 2;
 			};
 			name = Release;
 		};

diff --git a/scripts/xcframework.sh b/scripts/xcframework.sh
@@ -5,7 +5,7 @@ set -eou pipefail
 TEMPORARY_DIRECTORY=$(mktemp -d)
 echo "Temporary directory: $TEMPORARY_DIRECTORY"
 
-platforms=("iOS" "iOS Simulator" "macOS" "tvOS" "tvOS Simulator" "watchOS" "watchOS Simulator" "visionOS" "visionOS Simulator")
+platforms=("iOS" "iOS Simulator" "macOS" "macOS,variant=Mac Catalyst" "tvOS" "tvOS Simulator" "watchOS" "watchOS Simulator" "visionOS" "visionOS Simulator")
 
 # build Turf for each platform
 
@@ -17,7 +17,8 @@ do
     -archivePath "$TEMPORARY_DIRECTORY/archives/Turf-$platform.xcarchive" \
     -destination "generic/platform=$platform" \
     SKIP_INSTALL=NO \
-    BUILD_LIBRARY_FOR_DISTRIBUTION=YES
+    BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
+    SUPPORTS_MACCATALYST=YES
 
   commands+=("-archive" "$TEMPORARY_DIRECTORY/archives/Turf-$platform.xcarchive")
   commands+=("-framework" "Turf.framework")