Skip to content

Commit

Permalink
Align dependencies on fixed versions, prepare 2.0.3 release (#237)
Browse files Browse the repository at this point in the history
### Description

- Prepare MapboxSearch and MapboxSearchUI v2.0.3 release
- [Core] Change MapboxCommon dependency to use exact versions in SPM and CocoaPods
- [Core] Align MapboxCommon dependency with exact version 24.3.1
- [Core] Update to MapboxCoreSearch v2.0.2 to align dependencies

### Checklist
- [x] Update `CHANGELOG`
  • Loading branch information
aokj4ck authored May 13, 2024
1 parent 944d230 commit b60f818
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 21 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ Guide: https://keepachangelog.com/en/1.0.0/

<!-- Add changes for active work here -->

## 2.0.3

- [Core] Change MapboxCommon dependency to use exact versions in SPM and CocoaPods
- [Core] Align MapboxCommon dependency with exact version 24.3.1
- [Core] Update to MapboxCoreSearch v2.0.2 to align dependencies

**MapboxCommon**: v24.3.1
**MapboxCoreSearch**: v2.0.2

## 2.0.2

- [Core] Update to MapboxCoreSearch v2.0.1 for corrected compatibility with Xcode 15.3
Expand Down
4 changes: 2 additions & 2 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
binary "https://api.mapbox.com/downloads/v2/carthage/search-core-sdk/MapboxCoreSearch.xcframework.json" == 2.0.1
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 24.4.0-beta.2
binary "https://api.mapbox.com/downloads/v2/carthage/search-core-sdk/MapboxCoreSearch.xcframework.json" == 2.0.2
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 24.3.1
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "24.4.0-beta.2"
binary "https://api.mapbox.com/downloads/v2/carthage/search-core-sdk/MapboxCoreSearch.xcframework.json" "2.0.1"
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "24.3.1"
binary "https://api.mapbox.com/downloads/v2/carthage/search-core-sdk/MapboxCoreSearch.xcframework.json" "2.0.2"
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
source "https://rubygems.org"

gem "cocoapods"
gem "fastlane"
gem "jazzy", "~> 0.14.4"

Expand Down
3 changes: 2 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,10 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods
fastlane
fastlane-plugin-versioning
jazzy
jazzy (~> 0.14.4)

BUNDLED WITH
2.5.9
4 changes: 2 additions & 2 deletions MapboxSearch.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'MapboxSearch'
s.version = '2.0.2'
s.version = '2.0.3'
s.summary = 'Search SDK for Mapbox Search API'

# This description is used to generate tags and improve search results.
Expand All @@ -24,5 +24,5 @@ Some iOS platform specifics applies.

s.vendored_frameworks = "**/#{s.name}.xcframework"

s.dependency "MapboxCommon", '~> 24.4.0-beta.2'
s.dependency "MapboxCommon", '24.3.1'
end
4 changes: 2 additions & 2 deletions MapboxSearchUI.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'MapboxSearchUI'
s.version = '2.0.2'
s.version = '2.0.3'
s.summary = 'Search UI for Mapbox Search API'

# This description is used to generate tags and improve search results.
Expand All @@ -23,5 +23,5 @@ Card style custom UI with full search functionality powered by Mapbox Search API

s.vendored_frameworks = "**/#{s.name}.xcframework"

s.dependency 'MapboxSearch', "2.0.2"
s.dependency 'MapboxSearch', "2.0.3"
end
9 changes: 4 additions & 5 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
// swift-tools-version:5.3
// swift-tools-version:5.7
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
import Foundation

let (coreSearchVersion, coreSearchVersionHash) = ("2.0.1", "d8f5b2af3a42aa0957799b7b9a3874050fc5e0d2402dbe5a6a9105f3765432b1")
let (coreSearchVersion, coreSearchVersionHash) = ("2.0.2", "56538985a977f935b211a0cd16065c5d49afd739fa12315b55edf1aeb3985a5b")

let commonMinVersion = Version("24.4.0-beta.2")
let commonMaxVersion = Version("25.0.0")
let mapboxCommonSDKVersion = Version("24.3.1")

let package = Package(
name: "MapboxSearch",
Expand All @@ -25,7 +24,7 @@ let package = Package(
dependencies: [
// Dependencies declare other packages that this package depends on.
// .package(url: /* package url */, from: "1.0.0"),
.package(name: "MapboxCommon", url: "https://github.com/mapbox/mapbox-common-ios.git", commonMinVersion..<commonMaxVersion),
.package(name: "MapboxCommon", url: "https://github.com/mapbox/mapbox-common-ios.git", .exact(mapboxCommonSDKVersion)),
.package(url: "https://github.com/mattgallagher/CwlPreconditionTesting.git", from: "2.0.0")
],
targets: [
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ Once you've installed the prerequisites, no additional steps are needed: Open th
You can find the following documentation pages helpful:
- [Search SDK for iOS guide](https://docs.mapbox.com/ios/search/guides/)
- [MapboxSearch reference](https://docs.mapbox.com/ios/search/api/core/2.0.2/)
- [MapboxSearchUI reference](https://docs.mapbox.com/ios/search/api/ui/2.0.2/)
- [MapboxSearch reference](https://docs.mapbox.com/ios/search/api/core/2.0.3/)
- [MapboxSearchUI reference](https://docs.mapbox.com/ios/search/api/ui/2.0.3/)
## Project structure overview
Expand All @@ -108,13 +108,13 @@ MapboxSearchDemoApplication provides a Demo app wih MapboxSearchUI.framework pre
##### MapboxSearch
To integrate latest preview version of `MapboxSearch` into your Xcode project using CocoaPods, specify it in your `Podfile`:
```
pod 'MapboxSearch', ">= 2.0.2", "< 3.0"
pod 'MapboxSearch', ">= 2.0.3", "< 3.0"
```
##### MapboxSearchUI
To integrate latest preview version of `MapboxSearchUI` into your Xcode project using CocoaPods, specify it in your `Podfile`:
```
pod 'MapboxSearchUI', ">= 2.0.2", "< 3.0"
pod 'MapboxSearchUI', ">= 2.0.3", "< 3.0"
```
### Swift Package Manager
Expand Down
4 changes: 2 additions & 2 deletions Search Documentation.docc/Installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ To add the Mapbox Search SDK dependency with CocoaPods, you will need to configu
```ruby
use_frameworks!
target "TargetNameForYourApp" do
pod 'MapboxSearchUI', ">= 2.0.2", "< 3.0"
pod 'MapboxSearchUI', ">= 2.0.3", "< 3.0"
end
```

Expand All @@ -68,7 +68,7 @@ To add the Mapbox Search SDK dependency with CocoaPods, you will need to configu
```ruby
use_frameworks!
target "TargetNameForYourApp" do
pod 'MapboxSearch', ">= 2.0.2", "< 3.0"
pod 'MapboxSearch', ">= 2.0.3", "< 3.0"
end
```

Expand Down
2 changes: 1 addition & 1 deletion Sources/MapboxSearch/PublicAPI/MapboxSearchVersion.swift
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/// Mapbox Search SDK version variable
public let mapboxSearchSDKVersion = "2.0.2"
public let mapboxSearchSDKVersion = "2.0.3"

0 comments on commit b60f818

Please sign in to comment.