From 6488f251f12043dc53e6f0f6711e3b1757b8ced3 Mon Sep 17 00:00:00 2001
From: Jack Alto <jack.alto@mapbox.com>
Date: Fri, 26 Apr 2024 13:47:32 -0400
Subject: [PATCH 01/13] Update local project to MapboxCoreSearch beta.17
(carthage)
---
CHANGELOG.md | 4 +++-
Cartfile | 2 +-
Cartfile.resolved | 2 +-
.../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 3 ++-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 237f1a686..2158485e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,9 @@ Guide: https://keepachangelog.com/en/1.0.0/
- [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.
-**MapboxCoreSearch**: v2.0.0-alpha.16
+- [Core] Increment minimum MapboxCoreSearch version to provide PrivacyInfo.xcprivacy.
+
+**MapboxCoreSearch**: v2.0.0-beta.17
**MapboxCommon**: v24.2.0
## 2.0.0-rc.3
diff --git a/Cartfile b/Cartfile
index 57f52ab34..db1b1fbad 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/search-core-sdk/MapboxCoreSearch.xcframework.json" == 2.0.0-beta.17
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 24.2.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
index fc1d20d1c..c2836ae36 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/search-core-sdk/MapboxCoreSearch.xcframework.json" "2.0.0-beta.17"
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
}
From 8a453b5ab651dac1cb1354b3c7ece820604cec75 Mon Sep 17 00:00:00 2001
From: Jack Alto <jack.alto@mapbox.com>
Date: Fri, 26 Apr 2024 13:48:25 -0400
Subject: [PATCH 02/13] Update iOS package to use MapboxCoreSearch beta.17
(Package.swift)
- Update Swift tools version
---
.swift-version | 2 +-
Package.swift | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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/Package.swift b/Package.swift
index c376e6a42..f691d1c26 100644
--- a/Package.swift
+++ b/Package.swift
@@ -4,7 +4,7 @@
import PackageDescription
import Foundation
-let (coreSearchVersion, coreSearchVersionHash) = ("2.0.0-alpha.16", "315d5f6ed1446f5ca5d62cc6e4124ae01fa271ad9d675268e886c38149db8532")
+let (coreSearchVersion, coreSearchVersionHash) = ("2.0.0-beta.17", "239f728f2fca89cc6103aedd3cd242ba6633eb4f07b6d5e1a3ee48cf690b209c")
let commonMinVersion = Version("24.2.0")
let commonMaxVersion = Version("25.0.0")
From ed277dc0dff2c0e61cabf4bbb66d56376061920e Mon Sep 17 00:00:00 2001
From: Jack Alto <jack.alto@mapbox.com>
Date: Fri, 26 Apr 2024 15:56:19 -0400
Subject: [PATCH 03/13] Remove unused muter.conf.json file
---
muter.conf.json | 17 -----------------
1 file changed, 17 deletions(-)
delete mode 100644 muter.conf.json
diff --git a/muter.conf.json b/muter.conf.json
deleted file mode 100644
index 521372798..000000000
--- a/muter.conf.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "arguments" : [
- "-scheme",
- "MapboxSearch",
- "-destination",
- "platform=iOS Simulator,name=iPhone 8",
- "test",
- "SWIFT_TREAT_WARNINGS_AS_ERRORS=NO"
- ],
- "exclude" : [
- "Sources/MapboxSearchUI"
- ],
- "excludeCalls" : [
-
- ],
- "executable" : "\/usr\/bin\/xcodebuild"
-}
From 13c3ed36b90b6ea341a33dc34436a8cc3d3b0936 Mon Sep 17 00:00:00 2001
From: Jack Alto <jack.alto@mapbox.com>
Date: Fri, 26 Apr 2024 15:59:04 -0400
Subject: [PATCH 04/13] Remove DEFINES_MODULE build setting
- DEFINES_MODULE was set, but no umbrella header could be found to generate the module map
---
MapboxSearch.xcodeproj/project.pbxproj | 2 --
1 file changed, 2 deletions(-)
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;
From 7bc158c7e0703254d87ec5659b4673a0376c365f Mon Sep 17 00:00:00 2001
From: Jack Alto <jack.alto@mapbox.com>
Date: Fri, 26 Apr 2024 16:01:29 -0400
Subject: [PATCH 05/13] Update CI test devices
---
.circleci/config.yml | 2 +-
.fastlane/Fastfile | 6 +++---
Makefile | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0f2f18eba..e48f2457f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -289,7 +289,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/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
From 2a5ba6693b64594a155fd85a88a9c333eb6b8ec9 Mon Sep 17 00:00:00 2001
From: Jack Alto <jack.alto@mapbox.com>
Date: Fri, 26 Apr 2024 16:30:28 -0400
Subject: [PATCH 06/13] Increase test timeout
---
.../AddressAutofillIntegrationTests.swift | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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<Autof
}
expectation.fulfill()
}
- wait(for: [expectation], timeout: 5)
+ wait(for: [expectation], timeout: 10)
let expectedAddress = Address(
houseNumber: "701",
@@ -83,7 +83,7 @@ final class AddressAutofillIntegrationTests: MockServerIntegrationTestCase<Autof
selectionExpectation.fulfill()
}
- wait(for: [selectionExpectation], timeout: 5)
+ wait(for: [selectionExpectation], timeout: 10)
}
func testSelectSuggestionFromCoordinate() throws {
@@ -105,7 +105,7 @@ final class AddressAutofillIntegrationTests: MockServerIntegrationTestCase<Autof
expectation.fulfill()
}
- wait(for: [expectation], timeout: 5)
+ wait(for: [expectation], timeout: 10)
let expectedAddress = Address(
houseNumber: "701",
@@ -140,7 +140,7 @@ final class AddressAutofillIntegrationTests: MockServerIntegrationTestCase<Autof
selectionExpectation.fulfill()
}
- wait(for: [selectionExpectation], timeout: 5)
+ wait(for: [selectionExpectation], timeout: 10)
}
}
From e6e8c74dd4134d0805f3652d5d161f18468e0e67 Mon Sep 17 00:00:00 2001
From: Jack Alto <jack.alto@mapbox.com>
Date: Tue, 30 Apr 2024 16:43:59 -0400
Subject: [PATCH 07/13] Update MapboxCoreSearch to 2.0.0-beta.18
---
Cartfile | 2 +-
Cartfile.resolved | 2 +-
Package.swift | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Cartfile b/Cartfile
index db1b1fbad..63ecef7fa 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-beta.17
+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.2.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
index c2836ae36..dff97e1e9 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-beta.17"
+binary "https://api.mapbox.com/downloads/v2/carthage/search-core-sdk/MapboxCoreSearch.xcframework.json" "2.0.0-beta.18"
diff --git a/Package.swift b/Package.swift
index f691d1c26..3a3cd0e4a 100644
--- a/Package.swift
+++ b/Package.swift
@@ -4,7 +4,7 @@
import PackageDescription
import Foundation
-let (coreSearchVersion, coreSearchVersionHash) = ("2.0.0-beta.17", "239f728f2fca89cc6103aedd3cd242ba6633eb4f07b6d5e1a3ee48cf690b209c")
+let (coreSearchVersion, coreSearchVersionHash) = ("2.0.0-beta.18", "cecd72a8b4c05cbd3a52430ff45838547923de6b93c84252c90db7f39504afa8")
let commonMinVersion = Version("24.2.0")
let commonMaxVersion = Version("25.0.0")
From 38b243222d28d86eb75b4fa0a65cd0b7904aca5a Mon Sep 17 00:00:00 2001
From: Jack Alto <jack.alto@mapbox.com>
Date: Tue, 30 Apr 2024 17:10:09 -0400
Subject: [PATCH 08/13] Update MapboxCommon for MapboxCoreSearch compatibility
---
Cartfile | 2 +-
Cartfile.resolved | 2 +-
Package.swift | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Cartfile b/Cartfile
index 63ecef7fa..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-beta.18
-binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 24.2.0
+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 dff97e1e9..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/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/Package.swift b/Package.swift
index 3a3cd0e4a..7cdf0d79d 100644
--- a/Package.swift
+++ b/Package.swift
@@ -6,7 +6,7 @@ import Foundation
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(
From d9515aebf1780a42c553d4a1eaea317b1f0b1f54 Mon Sep 17 00:00:00 2001
From: Jack Alto <jack.alto@mapbox.com>
Date: Tue, 30 Apr 2024 17:11:05 -0400
Subject: [PATCH 09/13] Update changelog
---
CHANGELOG.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2158485e0..3f6988a99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,12 +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
- [Core] Increment minimum MapboxCoreSearch version to provide PrivacyInfo.xcprivacy.
-**MapboxCoreSearch**: v2.0.0-beta.17
-**MapboxCommon**: v24.2.0
+**MapboxCoreSearch**: v2.0.0-beta.18
+**MapboxCommon**: v24.4.0-beta.2
## 2.0.0-rc.3
From 53f0f5fddbde74096624a6e8a6cebb4cef2b3c4d Mon Sep 17 00:00:00 2001
From: Jack Alto <jack.alto@mapbox.com>
Date: Thu, 2 May 2024 11:38:36 -0500
Subject: [PATCH 10/13] Update CI config
---
.circleci/config.yml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index e48f2457f..063ac40d9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ workflows:
develop-build:
jobs:
- pre-check:
- context: SDK Registry Token
+ context: SDK Registry Token, CocoaPods trunk token
filters:
tags:
only: /v.*/
@@ -36,24 +36,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 +72,7 @@ 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:
From 62d3c0104a50b0c93cf819aca93172befdfd7692 Mon Sep 17 00:00:00 2001
From: Jack Alto <jack.alto@mapbox.com>
Date: Thu, 2 May 2024 11:40:54 -0500
Subject: [PATCH 11/13] Update CI config
---
.circleci/config.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 063ac40d9..d97897504 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,8 @@ workflows:
develop-build:
jobs:
- pre-check:
- context: SDK Registry Token, CocoaPods trunk token
+ context: SDK Registry Token
+ context: CocoaPods trunk token
filters:
tags:
only: /v.*/
@@ -72,7 +73,8 @@ workflows:
tags:
only: /v.*/
- post-SDK_Registry-release:
- context: SDK Registry Token, CocoaPods trunk token
+ context: SDK Registry Token
+ context: CocoaPods trunk token
requires:
- request-post-SDK_Registry-release
filters:
From e1b56f70df79c20922d92af8b948e6a72beff634 Mon Sep 17 00:00:00 2001
From: Jack Alto <jack.alto@mapbox.com>
Date: Thu, 2 May 2024 11:41:06 -0500
Subject: [PATCH 12/13] Raise minimum MapboxCommon in podspec
---
MapboxSearch.podspec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
From 7830949f3beb1fab966f8a9e1fa92ae022ae6e73 Mon Sep 17 00:00:00 2001
From: Jack Alto <jack.alto@mapbox.com>
Date: Thu, 2 May 2024 11:42:31 -0500
Subject: [PATCH 13/13] Update CI config
---
.circleci/config.yml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index d97897504..283343584 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,8 +10,9 @@ workflows:
develop-build:
jobs:
- pre-check:
- context: SDK Registry Token
- context: CocoaPods trunk token
+ context:
+ - SDK Registry Token
+ - CocoaPods trunk token
filters:
tags:
only: /v.*/
@@ -73,8 +74,9 @@ workflows:
tags:
only: /v.*/
- post-SDK_Registry-release:
- context: SDK Registry Token
- context: CocoaPods trunk token
+ context:
+ - SDK Registry Token
+ - CocoaPods trunk token
requires:
- request-post-SDK_Registry-release
filters: