Update versions to v4.0.0-rc.1 (#254)

* Update versions for Turf.xcframework * Fix xcframework script --------- Co-authored-by: MapboxCI <[email protected]> Co-authored-by: Aleksei Sapitskii <[email protected]>
mapbox · Nov 13, 2024 · 3ffd291 · 3ffd291
1 parent 576021a
commit 3ffd291
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -84,9 +84,9 @@ jobs:
       - setup_environment
       - run:
           name: "Build and create xcframework"
-          command: ./scripts/xcframework.sh .
+          command: ./scripts/xcframework.sh build
       - persist_to_workspace:
-          root: .
+          root: build
           paths:
             - xcframework_checksum.txt
             - Turf.xcframework.zip

diff --git a/Package.swift b/Package.swift
@@ -10,7 +10,7 @@ let targets: [Target] = [
     .binaryTarget(
         name: "Turf",
         url: "https://github.com/mapbox/turf-swift/releases/download/v4.0.0-rc.1/Turf.xcframework.zip",
-        checksum: "06d8499f9f4067b0931fbfb1f48161ab49c59f9bdef691be33644656b475fd77"
+        checksum: "a846a91335e8ae4f6df29c9c72a621b642071de1b800c239d573b732622121e6"
     )
 ]
 #else

diff --git a/Sources/Turf/Info.plist b/Sources/Turf/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>4.0.0</string>
 	<key>CFBundleVersion</key>
-	<string>35</string>
+	<string>36</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

diff --git a/Tests/TurfTests/Info.plist b/Tests/TurfTests/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>4.0.0</string>
 	<key>CFBundleVersion</key>
-	<string>35</string>
+	<string>36</string>
 </dict>
 </plist>
diff --git a/Turf.xcodeproj/project.pbxproj b/Turf.xcodeproj/project.pbxproj
@@ -495,7 +495,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 35;
+				CURRENT_PROJECT_VERSION = 36;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -567,7 +567,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 35;
+				CURRENT_PROJECT_VERSION = 36;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
@@ -604,7 +604,7 @@
 				DEAD_CODE_STRIPPING = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 35;
+				DYLIB_CURRENT_VERSION = 36;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Sources/Turf/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -627,7 +627,7 @@
 				DEAD_CODE_STRIPPING = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 35;
+				DYLIB_CURRENT_VERSION = 36;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Sources/Turf/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

diff --git a/scripts/xcframework.sh b/scripts/xcframework.sh
@@ -29,13 +29,16 @@ done
 xcodebuild -create-xcframework "${commands[@]}" -output "$BUILD_DIRECTORY/Turf.xcframework"
 codesign --timestamp -v --sign "Apple Distribution: Mapbox, Inc." "$BUILD_DIRECTORY/Turf.xcframework"
 
-ZIP_OUTPUT_PATH="$BUILD_DIRECTORY/Turf.xcframework.zip"
+cp "LICENSE.md" "$BUILD_DIRECTORY/LICENSE.md"
+cd "$BUILD_DIRECTORY"
+
+ZIP_OUTPUT_PATH="Turf.xcframework.zip"
 rm -rf "$ZIP_OUTPUT_PATH"
 
 zip --symlinks -r "$ZIP_OUTPUT_PATH" \
-    "$BUILD_DIRECTORY/Turf.xcframework" \
+    Turf.xcframework \
     LICENSE.md
 
 CHECKSUM=$(swift package compute-checksum "$ZIP_OUTPUT_PATH")
-echo "$CHECKSUM" > "$BUILD_DIRECTORY/xcframework_checksum.txt"
+echo "$CHECKSUM" > "xcframework_checksum.txt"
 echo "Checksum: $CHECKSUM"