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-571] Update license #182

Merged
merged 4 commits into from
Feb 22, 2024
Merged

[SSDK-571] Update license #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1d4eb7
Remove Demo.xcodeproj (use MapboxSearch.xcodeproj instead)
aokj4ck Feb 16, 2024
7f2b5ee
Update LICENSE.md, add LICENSE.thirdparty - SSDK-571
aokj4ck Feb 16, 2024
939542b
Remove Atlantis from SearchExample, non-essential
aokj4ck Feb 16, 2024
3818fb3
Merge branch 'main' into SSDK-571-update-license
aokj4ck Feb 21, 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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ Guide: https://keepachangelog.com/en/1.0.0/

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


- [License] Update license to reflect 2024 usage

- [Tests] Change MockResponse into a protocol, create separate enums conforming to MockResponse for each API type (geocoding, sbs, autofill), add MockResponse as generic to each test base class and MockWebServer.

## 2.0.0-rc.2
Expand Down
19 changes: 1 addition & 18 deletions Examples/SearchExamples.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 54;
objectVersion = 52;
objects = {

/* Begin PBXBuildFile section */
Expand All @@ -23,7 +23,6 @@
FE849B5626FC9E63001CBC27 /* ExamplesTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE849B5526FC9E63001CBC27 /* ExamplesTableViewController.swift */; };
FE849B5A26FCBCEC001CBC27 /* MapsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE849B5926FCBCEC001CBC27 /* MapsViewController.swift */; };
FEF1D1BA26FDF642004AE229 /* TextViewLoggerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FEF1D1B926FDF642004AE229 /* TextViewLoggerViewController.swift */; };
FEF1D1BD26FDFB1F004AE229 /* Atlantis in Frameworks */ = {isa = PBXBuildFile; productRef = FEF1D1BC26FDFB1F004AE229 /* Atlantis */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -54,7 +53,6 @@
047D759E2B5850DB005182A3 /* MapboxSearch in Frameworks */,
047D75A02B5850DB005182A3 /* MapboxSearchUI in Frameworks */,
04F0A1612B4F276D0097D316 /* MapboxMaps in Frameworks */,
FEF1D1BD26FDFB1F004AE229 /* Atlantis in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -150,7 +148,6 @@
);
name = SearchExamples;
packageProductDependencies = (
FEF1D1BC26FDFB1F004AE229 /* Atlantis */,
04F0A1602B4F276D0097D316 /* MapboxMaps */,
047D759D2B5850DB005182A3 /* MapboxSearch */,
047D759F2B5850DB005182A3 /* MapboxSearchUI */,
Expand Down Expand Up @@ -184,7 +181,6 @@
);
mainGroup = FE114A9B24C10B88001B2CE8;
packageReferences = (
FEF1D1BB26FDFB1F004AE229 /* XCRemoteSwiftPackageReference "atlantis" */,
04F0A15F2B4F276D0097D316 /* XCRemoteSwiftPackageReference "mapbox-maps-ios" */,
);
productRefGroup = FE114AA524C10B88001B2CE8 /* Products */;
Expand Down Expand Up @@ -448,14 +444,6 @@
minimumVersion = 11.0.0;
};
};
FEF1D1BB26FDFB1F004AE229 /* XCRemoteSwiftPackageReference "atlantis" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/ProxymanApp/atlantis";
requirement = {
kind = upToNextMinorVersion;
minimumVersion = 1.23.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand All @@ -472,11 +460,6 @@
package = 04F0A15F2B4F276D0097D316 /* XCRemoteSwiftPackageReference "mapbox-maps-ios" */;
productName = MapboxMaps;
};
FEF1D1BC26FDFB1F004AE229 /* Atlantis */ = {
isa = XCSwiftPackageProductDependency;
package = FEF1D1BB26FDFB1F004AE229 /* XCRemoteSwiftPackageReference "atlantis" */;
productName = Atlantis;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = FE114A9C24C10B88001B2CE8 /* Project object */;
Expand Down
61 changes: 0 additions & 61 deletions Examples/SearchExamples.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions Examples/SearchExamples.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
{
"object": {
"pins": [
{
"package": "Atlantis",
"repositoryURL": "https://github.com/ProxymanApp/atlantis",
"state": {
"branch": null,
"revision": "131d757cf8e6e368ad338728379174f7cfff9326",
"version": "1.23.0"
}
},
{
"package": "CwlCatchException",
"repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",
Expand Down
3 changes: 0 additions & 3 deletions Examples/SearchExamples/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Atlantis
import UIKit

@main
Expand All @@ -17,8 +16,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
window?.rootViewController = navigationController
window?.makeKeyAndVisible()

Atlantis.start()

return true
}
}
2 changes: 0 additions & 2 deletions Examples/SearchExamples/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
<array>
<string>_Proxyman._tcp</string>
</array>
<key>NSLocalNetworkUsageDescription</key>
<string>Atlantis would use Bonjour Service to discover Proxyman app from your local network.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Improve search results</string>
<key>UILaunchStoryboardName</key>
Expand Down
Loading