Release v24.9.0-alpha.00

mapbox · Nov 5, 2024 · ae0174b · ae0174b
1 parent d498895
commit ae0174b
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .build
 .swiftpm
 Package.resolved
+Tests/Integration/Carthage/Carthage/Build
diff --git a/Package.swift b/Package.swift
@@ -4,23 +4,29 @@
 import PackageDescription
 import Foundation
 
-let version = "24.8.0"
-let checksum = "a05cce4ae1574b5ec6e39c1e328102e2a44bd5309cd5ed061b4ad0258dcd80e0"
+let commonVersion = "24.8.0"
+let commonChecksum = "a05cce4ae1574b5ec6e39c1e328102e2a44bd5309cd5ed061b4ad0258dcd80e0"
+
+let turfVersion = "4.0.0-beta.1"
 
 let package = Package(
     name: "MapboxCommon",
     platforms: [.iOS(.v12), .macOS(.v10_15), .custom("visionos", versionString: "1.0")],
     products: [
-        .library(
-            name: "MapboxCommon",
-            targets: ["MapboxCommon"]
-        )
+        .library(name: "MapboxCommon", targets: ["MapboxCommonWrapper"]),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/mapbox/turf-swift.git", exact: turfVersion)
     ],
     targets: [
+        .target(name: "MapboxCommonWrapper", dependencies: [
+            .product(name: "Turf", package: "turf-swift"),
+            .target(name: "MapboxCommon")
+        ]),
         .binaryTarget(
             name: "MapboxCommon",
-            url: "https://api.mapbox.com/downloads/v2/mapbox-common/releases/ios/packages/\(version)/MapboxCommon.zip",
-            checksum: checksum
+            url: "https://api.mapbox.com/downloads/v2/mapbox-common/releases/ios/packages/\(commonVersion)/MapboxCommon.zip",
+            checksum: commonChecksum
         ),
         .testTarget(
             name: "MapboxCommonTests",

diff --git a/Sources/MapboxCommonWrapper/Shim.swift b/Sources/MapboxCommonWrapper/Shim.swift
diff --git a/Tests/Integration/Carthage/Cartfile b/Tests/Integration/Carthage/Cartfile
@@ -1 +1,2 @@
 binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 24.8.0
+binary "Cartfile.Turf.json" == 4.0.0-beta.1
diff --git a/Tests/Integration/Carthage/Cartfile.Turf.json b/Tests/Integration/Carthage/Cartfile.Turf.json
@@ -0,0 +1 @@
+{ "4.0.0-beta.1": "https://github.com/mapbox/turf-swift/releases/download/v4.0.0-beta.1/Turf.xcframework.zip" }
diff --git a/Tests/Integration/Carthage/project.yml b/Tests/Integration/Carthage/project.yml
@@ -6,9 +6,12 @@ targets:
     type: application
     platform: iOS
     deploymentTarget: "13.2"
-    sources: [Sources]
+    sources: 
+      - path: Sources
+        excludes: [Info.plist]
     dependencies:
       - framework: Carthage/Build/MapboxCommon.xcframework
+      - framework: Carthage/Build/Turf.xcframework
       - sdk: libc++.tbd
     settings:
         DEVELOPMENT_TEAM: "GJZR2MEM28"

diff --git a/Tests/Integration/CocoaPods/Podfile b/Tests/Integration/CocoaPods/Podfile
@@ -1,5 +1,5 @@
 platform :ios, '12.0'
 
 target 'PodInstall' do
-  pod 'MapboxCommon', '24.8.0'
+  pod 'MapboxCommon', '24.9.0-alpha.00'
 end