Skip to content

Commit

Permalink
Merge branch 'main' of github.com:mapbox/mapbox-search-ios into remov…
Browse files Browse the repository at this point in the history
…e-userdefaults-from-tests

Conflicts:
	CHANGELOG.md
  • Loading branch information
aokj4ck committed Feb 8, 2024
2 parents e2cfea4 + 29ae165 commit a3f2433
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Guide: https://keepachangelog.com/en/1.0.0/
- [UI Tests] Update and correct tests for iOS 17 using all mocked data.
- [Search] Rename `SearchEngine.reverseGeocoding` function to `SearchEngine.reverse`.
- [Core] Stop reading "MapboxAPIBaseURL" from UserDefaults in `ServiceProvider.createEngine`. (Providing a value in Info.plist is still supported).
- [Core] Remove Swifter library dependency from MapboxSearch target (only used in Test targets)
- [Core] Change AbstractSearchEngine.init `supportSBS: Bool = false` parameter to `apiType: ApiType = .SBS`. This changes the default API engine for discover/category and other API requests to SBS. Add ApiType enum to represent non-Autofill and non-PlaceAutocomplete SearchEngine API types.

## 2.0.0-rc.1
Expand Down
10 changes: 1 addition & 9 deletions MapboxSearch.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,9 @@
148DE66C285757AA0085684D /* AddressAutofill+Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 148DE66B285757AA0085684D /* AddressAutofill+Result.swift */; };
148DE671285777180085684D /* NSLocking+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 148DE670285777180085684D /* NSLocking+Extensions.swift */; };
148DE68B285A18900085684D /* AddressAutofill+AddressComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 148DE68A285A18900085684D /* AddressAutofill+AddressComponent.swift */; };
149948E7290A8ACE00E7E619 /* Swifter in Frameworks */ = {isa = PBXBuildFile; productRef = 149948E6290A8ACE00E7E619 /* Swifter */; };
149948ED290A8DCA00E7E619 /* Swifter in Frameworks */ = {isa = PBXBuildFile; productRef = 149948EC290A8DCA00E7E619 /* Swifter */; };
149948EF290A8DD500E7E619 /* Swifter in Frameworks */ = {isa = PBXBuildFile; productRef = 149948EE290A8DD500E7E619 /* Swifter */; };
149948F1290A8DF900E7E619 /* Swifter in Frameworks */ = {isa = PBXBuildFile; productRef = 149948F0290A8DF900E7E619 /* Swifter */; };
149948F1290A8DF900E7E619 /* Swifter in Frameworks */ = {isa = PBXBuildFile; productRef = 149948F0290A8DF900E7E619 /* Swifter */; settings = {ATTRIBUTES = (Required, ); }; };
14A0B83D2A5FF20B00D281F1 /* PlaceAutocomplet.Result+Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14A0B83B2A5FF1B300D281F1 /* PlaceAutocomplet.Result+Tests.swift */; };
14B92D5E298BFD19006003C1 /* DiscoverViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14B92D5D298BFD19006003C1 /* DiscoverViewController.swift */; };
14F71865299FD4BD00D5BC2E /* PlaceAutocomplete+PlaceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14F71864299FD4BD00D5BC2E /* PlaceAutocomplete+PlaceType.swift */; };
Expand Down Expand Up @@ -852,7 +851,6 @@
E648C0B626428D2B0044315F /* MapboxCoreSearch.xcframework in Frameworks */,
E648C0BA26428D3D0044315F /* MapboxCommon.xcframework in Frameworks */,
E648C0C9264297A10044315F /* libc++.1.tbd in Frameworks */,
149948E7290A8ACE00E7E619 /* Swifter in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1836,7 +1834,6 @@
);
name = MapboxSearch;
packageProductDependencies = (
149948E6290A8ACE00E7E619 /* Swifter */,
);
productName = MapboxSearch;
productReference = 3A0D7E4C233522D4006D81BB /* MapboxSearch.framework */;
Expand Down Expand Up @@ -3399,11 +3396,6 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
149948E6290A8ACE00E7E619 /* Swifter */ = {
isa = XCSwiftPackageProductDependency;
package = 149948E5290A8ACE00E7E619 /* XCRemoteSwiftPackageReference "swifter" */;
productName = Swifter;
};
149948EC290A8DCA00E7E619 /* Swifter */ = {
isa = XCSwiftPackageProductDependency;
package = 149948E5290A8ACE00E7E619 /* XCRemoteSwiftPackageReference "swifter" */;
Expand Down

0 comments on commit a3f2433

Please sign in to comment.