Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SSDK-582] Update SearchCore for PrivacyInfo.xcprivacy #220

Merged
merged 14 commits into from
May 2, 2024
Merged

[SSDK-582] Update SearchCore for PrivacyInfo.xcprivacy #220

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6488f25
Update local project to MapboxCoreSearch beta.17 (carthage)
aokj4ck Apr 26, 2024
8a453b5
Update iOS package to use MapboxCoreSearch beta.17 (Package.swift)
aokj4ck Apr 26, 2024
7cf9aa3
Merge branch 'main' into xcprivacy-searchcore_beta17
aokj4ck Apr 26, 2024
ed277dc
Remove unused muter.conf.json file
aokj4ck Apr 26, 2024
13c3ed3
Remove DEFINES_MODULE build setting
aokj4ck Apr 26, 2024
7bc158c
Update CI test devices
aokj4ck Apr 26, 2024
2a5ba66
Increase test timeout
aokj4ck Apr 26, 2024
e6e8c74
Update MapboxCoreSearch to 2.0.0-beta.18
aokj4ck Apr 30, 2024
38b2432
Update MapboxCommon for MapboxCoreSearch compatibility
aokj4ck Apr 30, 2024
d9515ae
Update changelog
aokj4ck Apr 30, 2024
53f0f5f
Update CI config
aokj4ck May 2, 2024
62d3c01
Update CI config
aokj4ck May 2, 2024
e1b56f7
Raise minimum MapboxCommon in podspec
aokj4ck May 2, 2024
7830949
Update CI config
aokj4ck May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .fastlane/Fastfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down
2 changes: 1 addition & 1 deletion .swift-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.7
5.10
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
View file
Open in desktop
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.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
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Open in desktop
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.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"
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions MapboxSearch.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion MapboxSearch.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"originHash" : "88c025a1b9b9dde5a8299bb33d0b299779bdb0b9da241347c975651554215963",
"pins" : [
{
"identity" : "cwlcatchexception",
Expand Down Expand Up @@ -28,5 +29,5 @@
}
}
],
"version" : 2
"version" : 3
}
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
8 changes: 4 additions & 4 deletions Tests/MapboxSearchIntegrationTests/AddressAutofillIntegrationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -83,7 +83,7 @@ final class AddressAutofillIntegrationTests: MockServerIntegrationTestCase<Autof
selectionExpectation.fulfill()
}

wait(for: [selectionExpectation], timeout: 5)
wait(for: [selectionExpectation], timeout: 10)
}

func testSelectSuggestionFromCoordinate() throws {
Expand All @@ -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",
Expand Down Expand Up @@ -140,7 +140,7 @@ final class AddressAutofillIntegrationTests: MockServerIntegrationTestCase<Autof
selectionExpectation.fulfill()
}

wait(for: [selectionExpectation], timeout: 5)
wait(for: [selectionExpectation], timeout: 10)
}
}

Expand Down
17 changes: 0 additions & 17 deletions muter.conf.json
View file
Open in desktop

This file was deleted.