fix(ad-hoc): vendored cmark version (#365)

* Fix script to properly embed revision into generated framework's plist.
* Integrate recent 0.5.0 version instead of relying on gfm branch directly.
* Include dSYM when generating framework.

Package.resolved

@@ -23,8 +23,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/swiftlang/swift-cmark",
       "state" : {
-        "branch" : "gfm",
-        "revision" : "fc07ab5da47975c5ef5f336acadfc02e8f706d30"
+        "revision" : "3ccff77b2dc5b96b77db3da0d68d28068593fa53",
+        "version" : "0.5.0"
       }
     }
   ],

Package.swift

@@ -16,7 +16,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/checkout/checkout-3ds-sdk-ios", exact: "3.2.4"),
-        .package(url: "https://github.com/swiftlang/swift-cmark", branch: "gfm")
+        .package(url: "https://github.com/swiftlang/swift-cmark", from: "0.5.0")
     ],
     targets: [
         .target(

Scripts/CMark/CreateXcframework.sh

@@ -21,11 +21,14 @@ WORK_DIR=$(mktemp -d)
 # Script expects revision as a first and only argument
 test $# -eq 1 || fail "Expected tag or branch reference."
 
+# Exports revision as environment variable
+export CURRENT_REVISION=$1
+
 # Go to temporary directory
 cd $WORK_DIR
 
 # Clone library
-git clone --depth 1 --branch $1 https://github.com/swiftlang/swift-cmark .
+git clone --depth 1 --branch $CURRENT_REVISION https://github.com/swiftlang/swift-cmark .
 
 # Ensure modulemap represents darwin-style framework
 MODULEMAP_PATH="src/include/module.modulemap"
@@ -61,12 +64,10 @@ OUTPUT_DIR="$SCRIPT_DIR/../../Vendor"
 # Generate XCFramework
 xcodebuild -create-xcframework \
     -framework ./cmark_gfm-iOS.xcarchive/Products/Library/Frameworks/cmark_gfm.framework \
+    -debug-symbols "$WORK_DIR/cmark_gfm-iOS.xcarchive/dSYMs/cmark_gfm.framework.dSYM" \
     -framework ./cmark_gfm-Sim.xcarchive/Products/Library/Frameworks/cmark_gfm.framework \
+    -debug-symbols "$WORK_DIR/cmark_gfm-Sim.xcarchive/dSYMs/cmark_gfm.framework.dSYM" \
     -output "$OUTPUT_DIR/cmark_gfm.xcframework"
 
 # Sign XCFramework
 /usr/bin/codesign "${CODESIGN_ARGS[@]}" "$OUTPUT_DIR/cmark_gfm.xcframework"
-
-# Write metadata
-CURRENT_REVISION=$(git rev-parse --short HEAD)
-echo $CURRENT_REVISION > "$OUTPUT_DIR/cmark_gfm.xcframework.version"

Scripts/CMark/project.yml

@@ -11,7 +11,7 @@ targets:
       SKIP_INSTALL: NO
       BUILD_LIBRARY_FOR_DISTRIBUTION: YES
       PRODUCT_BUNDLE_IDENTIFIER: com.swiftlang.cmark
-      MARKETING_VERSION: ${CURRENT_VERSION}
+      MARKETING_VERSION: ${CURRENT_REVISION}
       CURRENT_PROJECT_VERSION: 1
       MODULEMAP_FILE: src/include/module.modulemap
     sources:

Vendor/cmark_gfm.xcframework/Info.plist

@@ -7,33 +7,37 @@
 		<dict>
 			<key>BinaryPath</key>
 			<string>cmark_gfm.framework/cmark_gfm</string>
+			<key>DebugSymbolsPath</key>
+			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>cmark_gfm.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>cmark_gfm.framework/cmark_gfm</string>
+			<key>DebugSymbolsPath</key>
+			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>cmark_gfm.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>