Skip to content

Commit

Permalink
Merge branch 'main' into ThibaudLopez-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
ThibaudLopez authored Jan 16, 2024
2 parents 0e7a16e + d9c39f3 commit d38b080
Show file tree
Hide file tree
Showing 109 changed files with 967 additions and 669 deletions.
20 changes: 10 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ workflows:
jobs:
pre-check:
macos:
xcode: 13.4.0
xcode: 14.1
steps:
- checkout
- ios-install-carthage-dependencies
- run: python3 scripts/cmp_deps_across_managers.py

release-pre-check:
macos:
xcode: 13.4.0
xcode: 14.1
steps:
- parse-release-version
- run:
Expand All @@ -90,7 +90,7 @@ jobs:

build:
macos:
xcode: 13.4.0 # Specify the Xcode version to use
xcode: 14.1 # Specify the Xcode version to use
environment:
FL_OUTPUT_DIR: ../output
steps:
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:

release-documentation:
macos:
xcode: 13.4.0
xcode: 14.1
steps:
- checkout
- parse-release-version
Expand All @@ -151,7 +151,7 @@ jobs:

documentation-pr:
macos:
xcode: 13.4.0
xcode: 14.1
steps:
- checkout
- parse-release-version
Expand All @@ -174,7 +174,7 @@ jobs:
build-for-release:
macos:
xcode: 13.4.0
xcode: 14.1
steps:
- checkout
- setup-authentication
Expand All @@ -193,7 +193,7 @@ jobs:

release-ios:
macos:
xcode: 13.4.0
xcode: 14.1
steps:
- checkout
- setup-authentication
Expand All @@ -218,7 +218,7 @@ jobs:

post-SDK_Registry-release:
macos:
xcode: 13.4.0
xcode: 14.1
steps:
- checkout
- parse-release-version
Expand All @@ -235,7 +235,7 @@ jobs:

spm-build:
macos:
xcode: 13.4.0
xcode: 14.3.1
steps:
- checkout
- setup-authentication
Expand Down Expand Up @@ -283,7 +283,7 @@ commands:
steps:
- run:
name: pre-start simulator
command: xcrun instruments -w "iPhone 11 Pro (14.0) [" || true
command: xcrun instruments -w "iPhone 13 Pro (15.0) [" || true

upgrade-carthage:
steps:
Expand Down
11 changes: 4 additions & 7 deletions .fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,10 @@ platform :ios do
sh("xcrun simctl erase all")

destinations = [
"-destination platform=iOS\\ Simulator,name=iPhone\\ 11\\ Pro\\ Max",
"-destination platform=iOS\\ Simulator,OS=11.4,name=iPhone\\ 8",
"-destination platform=iOS\\ Simulator,OS=12.4,name=iPhone\\ 8",
"-destination platform=iOS\\ Simulator,OS=11.4,name=iPhone\\ 8\\ Plus",
"-destination platform=iOS\\ Simulator,OS=12.4,name=iPhone\\ 8\\ Plus",
"-destination platform=iOS\\ Simulator,OS=11.4,name=iPhone\\ SE\\ \\(1st\\ generation\\)",
"-destination platform=iOS\\ Simulator,OS=12.4,name=iPhone\\ SE\\ \\(1st\\ generation\\)"
"-destination platform=iOS\\ Simulator,name=iPhone\\ 14\\ Pro\\ Max",
"-destination platform=iOS\\ Simulator,OS=15,name=iPhone\\ 13",
"-destination platform=iOS\\ Simulator,OS=15,name=iPhone\\ 13 Pro",
"-destination platform=iOS\\ Simulator,OS=15,name=iPhone\\ 13 mini",
]

destinations.each do |destination|
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# Created by https://www.gitignore.io/api/swift
# Edit at https://www.gitignore.io/?templates=swift

Expand Down
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.2
5.7
34 changes: 0 additions & 34 deletions .travis.yml

This file was deleted.

63 changes: 63 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,69 @@
Guide: https://keepachangelog.com/en/1.0.0/
-->

## Unreleased

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

## 2.0.0-alpha.1

### Breaking changes

- [Address Autofill] Suggestions no longer perform a `retrieve` call.
- [Address Autofill] `AddressAutofill.Suggestion` field `coordinate: CLLocationCoordinate2D?` is now an optional.
- [Address Autofill] `AddressAutofill.Suggestion.init` now requires an `AddressAutofill.Suggestion.Underlying` enum parameter.
- [Address Autofill] Added new AddressAutofill.Suggestion.Underlying enum parameter with cases for suggestion and result inputs.
- [Place Autocomplete] Suggestions no longer perform a `retrieve` call.
- [Place Autocomplete] `PlaceAutocomplete.Suggestion` field `coordinate: CLLocationCoordinate2D?` is now an optional.
- [Place Autocomplete] `Result.coordinate` is now an optional.
- [Core] Updated to Xcode 14.1 minimum version
- [Core] Updated deployment target to iOS 12
- [Core] Remove bitcode support
- [Core] Updated API usage:
- Removed parameter-based Access Token. Be sure to provide your token in Info.plist.
- Renamed `CoreSuggestAction.isMultiRetrivable` to `multiRetrievable`.
- Renamed `CoreSearchResult.center` to `.centerLocation`.
- Renamed `CoreSearchOptions.isIgnoreUR` to `ignoreUR`.
- Renamed `TileRegionLoadOptions` initializer parameter `start` to `startLocation`.
- Replace some `CLLocation` fields with `Coordinate2D` wrapper containing a value of `CLLocationCoordinate2D`. This changes the call-site from `.coordinate` to `.value`.
- Added `SdkInformation.defaultInfo` default value for various Core initializer parameters.
- Added `SearchAddressRegion` containing `name`, `regionCode`, and `regionCodeFull` fields.
- Added `SearchAddressCountry` containing `name`, `countryCode`, and `regionCodeFull` fields.
- Added fields `searchAddressRegion` and `searchAddressCountry` to `Address` alongside existing `country` and `region`.
- Remove access token parameter from `SearchTileStore`.

**MapboxCommon**: v24.0.0
**MapboxCoreSearch**: v2.0.0

## 1.0.0-rc.8 - 2023-10-09

### Fixed
- [Core]: removed unnecessary log statement that didn't respect the `LoggerLevel` setting.

## 1.0.0-rc.7 - 2023-07-13

### Added
- [PlaceAutocomplete]: added `formattedAddress` function to perform default address formatting.
- [PlaceAutocomplete]: added `countryISO1` and `countryISO2` properties in the resul's address.

### Fixed
- [Core]: Fixed street name capitalization for names with numbers.

### Breaking changes
- [PlaceAutocomplete]: replaced `Address` type of the `Result` to the `AddressComponents`.

## 1.0.0-rc.6 - 2023-06-29

### Fixed
- [Core]: removed assertion for unsupported search result types.

## 1.0.0-rc.5 - 2023-06-26

### Fixed
- [Place Autocomplete]: request all possible `PlaceType` values in case if types were not specified in a search query options.
- [Place Autocomplete]: fixed an issue when reverevse geocoding suggestion returns error on `select` request.
- [Address Autofill]: fixed reverse geocoding query, removed unsupported types from query.

## 1.0.0-rc.4 - 2023-05-19

### Added
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" == 0.68.0
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.3.1
binary "https://api.mapbox.com/downloads/v2/carthage/search-core-sdk/MapboxCoreSearch.xcframework.json" == 2.0.0-alpha.4
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 24.0.0
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" "23.3.1"
binary "https://api.mapbox.com/downloads/v2/carthage/search-core-sdk/MapboxCoreSearch.xcframework.json" "0.68.0"
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "24.0.0"
binary "https://api.mapbox.com/downloads/v2/carthage/search-core-sdk/MapboxCoreSearch.xcframework.json" "2.0.0-alpha.4"
34 changes: 16 additions & 18 deletions Examples/SearchExamples.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
04F0A1612B4F276D0097D316 /* MapboxMaps in Frameworks */ = {isa = PBXBuildFile; productRef = 04F0A1602B4F276D0097D316 /* MapboxMaps */; };
FE00067F26FDCB9E00846819 /* Examples.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE00067E26FDCB9E00846819 /* Examples.swift */; };
FE0720BE26FC86C70065A273 /* MapboxSearch in Frameworks */ = {isa = PBXBuildFile; productRef = FE0720BD26FC86C70065A273 /* MapboxSearch */; };
FE0720C026FC86C70065A273 /* MapboxSearchUI in Frameworks */ = {isa = PBXBuildFile; productRef = FE0720BF26FC86C70065A273 /* MapboxSearchUI */; };
Expand All @@ -21,7 +22,6 @@
FE8295832701E46D001005B4 /* MapboxBoundingBoxController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE780E3124C9B3D000C62400 /* MapboxBoundingBoxController.swift */; };
FE849B5626FC9E63001CBC27 /* ExamplesTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE849B5526FC9E63001CBC27 /* ExamplesTableViewController.swift */; };
FE849B5A26FCBCEC001CBC27 /* MapsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE849B5926FCBCEC001CBC27 /* MapsViewController.swift */; };
FE93032526F8D87A00644DF6 /* MapboxMaps in Frameworks */ = {isa = PBXBuildFile; productRef = FE93032426F8D87A00644DF6 /* MapboxMaps */; };
FE9DFDAA26F8D9A60021375F /* MapboxSearch in Frameworks */ = {isa = PBXBuildFile; productRef = FE9DFDA926F8D9A60021375F /* MapboxSearch */; };
FE9DFDAC26F8DA0F0021375F /* MapboxSearchUI in Frameworks */ = {isa = PBXBuildFile; productRef = FE9DFDAB26F8DA0F0021375F /* MapboxSearchUI */; };
FEF1D1BA26FDF642004AE229 /* TextViewLoggerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FEF1D1B926FDF642004AE229 /* TextViewLoggerViewController.swift */; };
Expand Down Expand Up @@ -52,7 +52,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
FE93032526F8D87A00644DF6 /* MapboxMaps in Frameworks */,
04F0A1612B4F276D0097D316 /* MapboxMaps in Frameworks */,
FE0720C026FC86C70065A273 /* MapboxSearchUI in Frameworks */,
FE0720BE26FC86C70065A273 /* MapboxSearch in Frameworks */,
FE9DFDAC26F8DA0F0021375F /* MapboxSearchUI in Frameworks */,
Expand Down Expand Up @@ -144,12 +144,12 @@
);
name = SearchExamples;
packageProductDependencies = (
FE93032426F8D87A00644DF6 /* MapboxMaps */,
FE9DFDA926F8D9A60021375F /* MapboxSearch */,
FE9DFDAB26F8DA0F0021375F /* MapboxSearchUI */,
FE0720BD26FC86C70065A273 /* MapboxSearch */,
FE0720BF26FC86C70065A273 /* MapboxSearchUI */,
FEF1D1BC26FDFB1F004AE229 /* Atlantis */,
04F0A1602B4F276D0097D316 /* MapboxMaps */,
);
productName = SearchExamples;
productReference = FE114AA424C10B88001B2CE8 /* SearchExamples.app */;
Expand Down Expand Up @@ -180,9 +180,9 @@
);
mainGroup = FE114A9B24C10B88001B2CE8;
packageReferences = (
FE93032326F8D87A00644DF6 /* XCRemoteSwiftPackageReference "mapbox-maps-ios" */,
FE0720BC26FC86C70065A273 /* XCRemoteSwiftPackageReference "search-ios" */,
FEF1D1BB26FDFB1F004AE229 /* XCRemoteSwiftPackageReference "atlantis" */,
04F0A15F2B4F276D0097D316 /* XCRemoteSwiftPackageReference "mapbox-maps-ios" */,
);
productRefGroup = FE114AA524C10B88001B2CE8 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -382,7 +382,6 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = GJZR2MEM28;
INFOPLIST_FILE = SearchExamples/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -402,7 +401,6 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = GJZR2MEM28;
INFOPLIST_FILE = SearchExamples/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -439,33 +437,38 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
FE0720BC26FC86C70065A273 /* XCRemoteSwiftPackageReference "search-ios" */ = {
04F0A15F2B4F276D0097D316 /* XCRemoteSwiftPackageReference "mapbox-maps-ios" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/mapbox/search-ios";
repositoryURL = "https://github.com/mapbox/mapbox-maps-ios.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = "1.0.0-beta";
minimumVersion = 10.0.0;
};
};
FE93032326F8D87A00644DF6 /* XCRemoteSwiftPackageReference "mapbox-maps-ios" */ = {
FE0720BC26FC86C70065A273 /* XCRemoteSwiftPackageReference "search-ios" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "git@github.com:mapbox/mapbox-maps-ios.git";
repositoryURL = "https://github.com/mapbox/search-ios";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = "10.0.0-rc";
minimumVersion = "1.0.0-rc.8";
};
};
FEF1D1BB26FDFB1F004AE229 /* XCRemoteSwiftPackageReference "atlantis" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/ProxymanApp/atlantis";
requirement = {
kind = upToNextMinorVersion;
minimumVersion = 1.11.2;
minimumVersion = 1.23.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
04F0A1602B4F276D0097D316 /* MapboxMaps */ = {
isa = XCSwiftPackageProductDependency;
package = 04F0A15F2B4F276D0097D316 /* XCRemoteSwiftPackageReference "mapbox-maps-ios" */;
productName = MapboxMaps;
};
FE0720BD26FC86C70065A273 /* MapboxSearch */ = {
isa = XCSwiftPackageProductDependency;
package = FE0720BC26FC86C70065A273 /* XCRemoteSwiftPackageReference "search-ios" */;
Expand All @@ -476,11 +479,6 @@
package = FE0720BC26FC86C70065A273 /* XCRemoteSwiftPackageReference "search-ios" */;
productName = MapboxSearchUI;
};
FE93032426F8D87A00644DF6 /* MapboxMaps */ = {
isa = XCSwiftPackageProductDependency;
package = FE93032326F8D87A00644DF6 /* XCRemoteSwiftPackageReference "mapbox-maps-ios" */;
productName = MapboxMaps;
};
FE9DFDA926F8D9A60021375F /* MapboxSearch */ = {
isa = XCSwiftPackageProductDependency;
productName = MapboxSearch;
Expand Down
Loading

0 comments on commit d38b080

Please sign in to comment.