diff --git a/.circleci/config.yml b/.circleci/config.yml index 0f2f18eba..283343584 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,9 @@ workflows: develop-build: jobs: - pre-check: - context: SDK Registry Token + context: + - SDK Registry Token + - CocoaPods trunk token filters: tags: only: /v.*/ @@ -36,24 +38,28 @@ workflows: ignore: /.*/ # only: /release\/[0-9]+\.[0-9]+\.[0-9]+.*/ - build-for-release: + context: SDK Registry Token requires: - release-pre-check filters: tags: only: /v.*/ - release-documentation: + context: SDK Registry Token requires: - release-pre-check filters: tags: only: /v.*/ - documentation-pr: + context: SDK Registry Token requires: - release-documentation filters: tags: only: /v.*/ - release-ios: + context: SDK Registry Token requires: - build-for-release - documentation-pr @@ -68,7 +74,9 @@ workflows: tags: only: /v.*/ - post-SDK_Registry-release: - context: CocoaPods trunk token + context: + - SDK Registry Token + - CocoaPods trunk token requires: - request-post-SDK_Registry-release filters: @@ -289,7 +297,7 @@ commands: steps: - run: name: pre-start simulator - command: xcrun instruments -w "iPhone 13 Pro (15.0) [" || true + command: xcrun instruments -w "iPhone 14 [" || true upgrade-carthage: steps: diff --git a/.fastlane/Fastfile b/.fastlane/Fastfile index 8924c7f01..a2ee7e04f 100644 --- a/.fastlane/Fastfile +++ b/.fastlane/Fastfile @@ -17,9 +17,9 @@ platform :ios do destinations = [ "-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", + "-destination platform=iOS\\ Simulator,OS=15,name=iPhone\\ 14", + "-destination platform=iOS\\ Simulator,OS=15,name=iPhone\\ 14 Pro", + "-destination platform=iOS\\ Simulator,OS=15,name=iPhone\\ 14 mini", ] destinations.each do |destination| diff --git a/.swift-version b/.swift-version index 760606e1f..f9ce5a96e 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -5.7 +5.10 diff --git a/CHANGELOG.md b/CHANGELOG.md index 237f1a686..3f6988a99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,10 +31,12 @@ Guide: https://keepachangelog.com/en/1.0.0/ - [Tests] Fix Offline tests and re-enable. - [Tests] Add `offlineResultsUpdated` delegate function to `SearchEngineDelegateStub`. - [Tests] Demonstrate providing a `Geometry(point: NSValue(mkCoordinate: CLLocationCoordinate2D))` with `TileRegionLoadOptions.build` function. -- [Core] Increment minimum MapboxCommon version from 24.0.0 to 24.2.0. +- [Core] Increment minimum MapboxCommon version from 24.0.0 to 24.4.0-beta.2 -**MapboxCoreSearch**: v2.0.0-alpha.16 -**MapboxCommon**: v24.2.0 +- [Core] Increment minimum MapboxCoreSearch version to provide PrivacyInfo.xcprivacy. + +**MapboxCoreSearch**: v2.0.0-beta.18 +**MapboxCommon**: v24.4.0-beta.2 ## 2.0.0-rc.3 diff --git a/Cartfile b/Cartfile index 57f52ab34..5f2f0685e 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -binary "https://api.mapbox.com/downloads/v2/carthage/search-core-sdk/MapboxCoreSearch.xcframework.json" == 2.0.0-alpha.16 -binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 24.2.0 +binary "https://api.mapbox.com/downloads/v2/carthage/search-core-sdk/MapboxCoreSearch.xcframework.json" == 2.0.0-beta.18 +binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 24.4.0-beta.2 \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index fc1d20d1c..684421c68 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "24.2.0" -binary "https://api.mapbox.com/downloads/v2/carthage/search-core-sdk/MapboxCoreSearch.xcframework.json" "2.0.0-alpha.16" +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.0-beta.18" diff --git a/Makefile b/Makefile index f48964d02..9b4c574f0 100644 --- a/Makefile +++ b/Makefile @@ -30,16 +30,16 @@ offline: aws s3 cp s3://vng-temp/HERE/luxembourg.tgz - | tar -xz -C Sources/Demo/offline/ ci-dev-test: dependencies - fastlane scan --scheme "Demo" --device "iPhone 13 Pro" --result_bundle "true" --testplan "CI-dev" --output_directory "output" + fastlane scan --scheme "Demo" --device "iPhone 14" --result_bundle "true" --testplan "CI-dev" --output_directory "output" ci-full-test: dependencies - fastlane scan --scheme "Demo" --device "iPhone 13 Pro" --result_bundle "true" --testplan "Demo" --output_directory "output" + fastlane scan --scheme "Demo" --device "iPhone 14" --result_bundle "true" --testplan "Demo" --output_directory "output" test: dependencies - xcodebuild -scheme MapboxSearchUI -destination platform\=iOS\ Simulator,name\=iPhone\ 13\ Pro clean test + xcodebuild -scheme MapboxSearchUI -destination platform\=iOS\ Simulator,name\=iPhone\ 14 clean test xctest: dependencies - xcodebuild -scheme MapboxSearch -destination platform\=iOS\ Simulator,name\=iPhone\ 13\ Pro clean test + xcodebuild -scheme MapboxSearch -destination platform\=iOS\ Simulator,name\=iPhone\ 14 clean test codecov: scripts/coverage/gather_coverage.sh "^MapboxSearch$$" coverage diff --git a/MapboxSearch.podspec b/MapboxSearch.podspec index 79eb77596..1535dc7cb 100644 --- a/MapboxSearch.podspec +++ b/MapboxSearch.podspec @@ -24,5 +24,5 @@ Some iOS platform specifics applies. s.vendored_frameworks = "**/#{s.name}.xcframework" - s.dependency "MapboxCommon", '~> 24.0' + s.dependency "MapboxCommon", '~> 24.4.0-beta.2' end diff --git a/MapboxSearch.xcodeproj/project.pbxproj b/MapboxSearch.xcodeproj/project.pbxproj index 1097ff58b..5985f23c9 100644 --- a/MapboxSearch.xcodeproj/project.pbxproj +++ b/MapboxSearch.xcodeproj/project.pbxproj @@ -3443,7 +3443,6 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 4; - DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -3478,7 +3477,6 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 4; - DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; diff --git a/MapboxSearch.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/MapboxSearch.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index c3e68929e..87636d51c 100644 --- a/MapboxSearch.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/MapboxSearch.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,4 +1,5 @@ { + "originHash" : "88c025a1b9b9dde5a8299bb33d0b299779bdb0b9da241347c975651554215963", "pins" : [ { "identity" : "cwlcatchexception", @@ -28,5 +29,5 @@ } } ], - "version" : 2 + "version" : 3 } diff --git a/Package.swift b/Package.swift index c376e6a42..7cdf0d79d 100644 --- a/Package.swift +++ b/Package.swift @@ -4,9 +4,9 @@ import PackageDescription import Foundation -let (coreSearchVersion, coreSearchVersionHash) = ("2.0.0-alpha.16", "315d5f6ed1446f5ca5d62cc6e4124ae01fa271ad9d675268e886c38149db8532") +let (coreSearchVersion, coreSearchVersionHash) = ("2.0.0-beta.18", "cecd72a8b4c05cbd3a52430ff45838547923de6b93c84252c90db7f39504afa8") -let commonMinVersion = Version("24.2.0") +let commonMinVersion = Version("24.4.0-beta.2") let commonMaxVersion = Version("25.0.0") let package = Package( diff --git a/Tests/MapboxSearchIntegrationTests/AddressAutofillIntegrationTests.swift b/Tests/MapboxSearchIntegrationTests/AddressAutofillIntegrationTests.swift index 7bb35d2d0..1b91b5d1c 100644 --- a/Tests/MapboxSearchIntegrationTests/AddressAutofillIntegrationTests.swift +++ b/Tests/MapboxSearchIntegrationTests/AddressAutofillIntegrationTests.swift @@ -47,7 +47,7 @@ final class AddressAutofillIntegrationTests: MockServerIntegrationTestCase