Maps iOS: Version sync

GitOrigin-RevId: cdda19baa913fa19d5134dea82e11d2fb5a4d147

Author: persidskiy

.gitignore

@@ -12,9 +12,9 @@ scripts/release/packager/artifacts
 scripts/release/packager/build
 scripts/xcparty/.swiftpm
 MapboxMaps.xcodeproj
-*.doccarchive
+*.doccarchive*
 Sources/MapboxMaps/Documentation.docc/*.html
 
 .vscode
-MapboxMaps.doccarchive.zip
-MapboxMaps.doccarchive
+Package.resolved
+Examples.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Examples.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -21,8 +21,8 @@ Pod::Spec.new do |m|
   m.source_files = 'Sources/MapboxMaps/**/*.{swift,h}'
   m.resource_bundles = { 'MapboxMapsResources' => ['Sources/MapboxMaps/**/*.{xcassets,strings}', 'Sources/MapboxMaps/MapboxMaps.json', 'Sources/MapboxMaps/PrivacyInfo.xcprivacy'] }
 
-  m.dependency 'MapboxCoreMaps', '11.11.0-SNAPSHOT-03-21--09-47.git-8a42e6a'
-  m.dependency 'MapboxCommon', '24.11.0-SNAPSHOT-03-21--09-47.git-8a42e6a'
+  m.dependency 'MapboxCoreMaps', '11.11.0-SNAPSHOT-03-28--04-29.git-acea700'
+  m.dependency 'MapboxCommon', '24.11.0-SNAPSHOT-03-28--04-29.git-acea700'
   m.dependency 'Turf', '4.0.0'
 
 end

LICENSE.md

@@ -4,9 +4,9 @@
 import PackageDescription
 import Foundation
 
-let coreMaps = MapsDependency.coreMaps(version: "11.11.0-SNAPSHOT-03-21--09-47.git-8a42e6a", checksum: "268a2d19cc674193537a29cfafa5e1cea9ccf30d54724650158d1afa73e3a30a")
-
-let common = MapsDependency.common(version: "24.11.0-SNAPSHOT-03-21--09-47.git-8a42e6a", checksum: "878a09721d48e5a55dfbde15420953e5f71721877e419c56ae59728943bdd107")
+let commonVersion: Version = "24.11.0-SNAPSHOT-03-28--04-29.git-acea700"
+let coreMapsVersion: Version = "11.11.0-SNAPSHOT-03-28--04-29.git-acea700"
+let turfVersion: Version = "4.0.0"
 
 let mapboxMapsPath: String? = nil
 
@@ -21,15 +21,17 @@ let package = Package(
             targets: ["MapboxMaps"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/mapbox/turf-swift.git", exact: "4.0.0"),
-    ] + coreMaps.packageDependencies + common.packageDependencies,
+        .package(url: "https://github.com/mapbox/turf-swift.git", exact: turfVersion),
+        .package(url: "https://github.com/mapbox/mapbox-common-ios.git", exact: commonVersion),
+        .package(url: "https://github.com/mapbox/mapbox-core-maps-ios.git", exact: coreMapsVersion)
+    ],
     targets: [
         .target(
             name: "MapboxMaps",
             dependencies: [
-                coreMaps.mapsTargetDependencies,
-                common.mapsTargetDependencies,
-                .product(name: "Turf", package: "turf-swift")
+                .product(name: "Turf", package: "turf-swift"),
+                .product(name: "MapboxCommon", package: "mapbox-common-ios"),
+                .product(name: "MapboxCoreMaps", package: "mapbox-core-maps-ios")
             ],
             path: mapboxMapsPath,
             exclude: [
@@ -64,73 +66,5 @@ let package = Package(
                 .process("Resources/MapInitOptionsTests.xib"),
             ]
         )
-    ] + coreMaps.packageTargets + common.packageTargets
+    ]
 )
-
-struct MapsDependency {
-    init(name: String, version: String, checksum: String? = nil, isSnapshot: Bool?, repositoryName: String, registryProjectName: String, registryFileName: String) {
-        self.name = name
-        self.version = version
-        self.checksum = checksum
-        self.isSnapshot = isSnapshot ?? version.contains("SNAPSHOT")
-
-        self.repositoryName = repositoryName
-        self.registryProjectName = registryProjectName
-        self.registryFileName = registryFileName
-    }
-
-    let name: String
-    let version: String
-    let checksum: String?
-    let isSnapshot: Bool
-
-    let repositoryName: String
-    let registryProjectName: String
-    let registryFileName: String
-
-    static func coreMaps(version: String, checksum: String? = nil, isSnapshot: Bool? = nil) -> MapsDependency {
-        return MapsDependency(name: "MapboxCoreMaps", version: version, checksum: checksum, isSnapshot: isSnapshot,
-                              repositoryName: "mapbox-core-maps-ios",
-                              registryProjectName: "mobile-maps-core",
-                              registryFileName: "MapboxCoreMaps.xcframework-dynamic.zip")
-    }
-
-    static func common(version: String, checksum: String? = nil, isSnapshot: Bool? = nil) -> MapsDependency {
-        return MapsDependency(name: "MapboxCommon", version: version, checksum: checksum, isSnapshot: isSnapshot,
-                              repositoryName: "mapbox-common-ios",
-                              registryProjectName: "mapbox-common",
-                              registryFileName: "MapboxCommon.zip")
-    }
-
-    var packageDependencies: [Package.Dependency] {
-        guard !isSnapshot else { return [] }
-
-        return [
-            .package(url: repositoryURL, exact: Version(stringLiteral: version))
-        ]
-    }
-
-    var packageTargets: [Target] {
-        guard isSnapshot else { return [] }
-
-        return [
-            .binaryTarget(name: name, url: registryURL, checksum: checksum ?? "")
-        ]
-    }
-
-    var mapsTargetDependencies: Target.Dependency {
-        if isSnapshot {
-            return .byName(name: name)
-        } else {
-            return .product(name: name, package: repositoryName)
-        }
-    }
-
-    var repositoryURL: String { return "https://github.com/mapbox/\(repositoryName).git" }
-
-    var registryReleaseFolder: String { isSnapshot ? "snapshots" : "releases" }
-
-    var registryURL: String {
-        return "https://api.mapbox.com/downloads/v2/\(registryProjectName)/\(registryReleaseFolder)/ios/packages/\(version)/\(registryFileName)"
-    }
-}

MapboxMaps.podspec

@@ -1,3 +1,3 @@
 {
-    "version": "11.11.0-SNAPSHOT-03-04--04-28.git-2ee907d"
+    "version": "11.11.0-SNAPSHOT-03-27--04-29.git-acea700"
 }

Package.resolved

@@ -1,5 +1,5 @@
 {
-    "MapboxCoreMaps": "11.11.0-SNAPSHOT-03-21--09-47.git-8a42e6a",
-    "MapboxCommon": "24.11.0-SNAPSHOT-03-21--09-47.git-8a42e6a",
+    "MapboxCoreMaps": "11.11.0-SNAPSHOT-03-28--04-29.git-acea700",
+    "MapboxCommon": "24.11.0-SNAPSHOT-03-28--04-29.git-acea700",
     "Turf": "4.0.0"
 }