diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a1a46173a..dbcce066b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ ### Viaduct * Support setting default user-agent headers. +### FxA Client +- Removed `SwiftKeychainWrapper` logic. ([#7150](https://github.com/mozilla/application-services/pull/7150)) + ### Nimbus * Adds a `Vec` on `ExperimentEnrollment` when it is of type `EnrollmentStatus::Enrolled` and getters and setters. This is to support returning to an original value on Gecko pref experiments. * Added `eval-jexl` command to nimbus-cli for evaluating JEXL targeting expressions against the app context. Useful for testing and debugging targeting expressions on iOS and Android. diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index a2fee0e6e3..91ac1a41f8 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -6,7 +6,6 @@ the details of which are reproduced below. * [Mozilla Public License 2.0](#mozilla-public-license-20) * [Apache License 2.0](#apache-license-20) -* [MIT License: SwiftKeychainWrapper](#mit-license-swiftkeychainwrapper) * [MIT License: aho-corasick, byteorder, memchr](#mit-license-aho-corasick-byteorder-memchr) * [MIT License: bincode](#mit-license-bincode) * [MIT License: bytes](#mit-license-bytes) @@ -799,37 +798,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -``` -------------- -## MIT License: SwiftKeychainWrapper - -The following text applies to code linked from these dependencies: -[SwiftKeychainWrapper](https://github.com/jrendel/SwiftKeychainWrapper) - -``` -The MIT License (MIT) - -Copyright (c) 2014 Jason Rendel - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - - ``` ------------- ## MIT License: aho-corasick, byteorder, memchr diff --git a/megazords/ios-rust/DEPENDENCIES.md b/megazords/ios-rust/DEPENDENCIES.md index 06a089b0d6..f69bbb9051 100644 --- a/megazords/ios-rust/DEPENDENCIES.md +++ b/megazords/ios-rust/DEPENDENCIES.md @@ -6,7 +6,6 @@ the details of which are reproduced below. * [Mozilla Public License 2.0](#mozilla-public-license-20) * [Apache License 2.0](#apache-license-20) -* [MIT License: SwiftKeychainWrapper](#mit-license-swiftkeychainwrapper) * [MIT License: aho-corasick, byteorder, memchr](#mit-license-aho-corasick-byteorder-memchr) * [MIT License: bincode](#mit-license-bincode) * [MIT License: bytes](#mit-license-bytes) @@ -777,37 +776,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -``` -------------- -## MIT License: SwiftKeychainWrapper - -The following text applies to code linked from these dependencies: -[SwiftKeychainWrapper](https://github.com/jrendel/SwiftKeychainWrapper) - -``` -The MIT License (MIT) - -Copyright (c) 2014 Jason Rendel - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - - ``` ------------- ## MIT License: aho-corasick, byteorder, memchr diff --git a/megazords/ios-rust/focus/DEPENDENCIES.md b/megazords/ios-rust/focus/DEPENDENCIES.md index 8d02825b35..d0555b4d6c 100644 --- a/megazords/ios-rust/focus/DEPENDENCIES.md +++ b/megazords/ios-rust/focus/DEPENDENCIES.md @@ -6,7 +6,6 @@ the details of which are reproduced below. * [Mozilla Public License 2.0](#mozilla-public-license-20) * [Apache License 2.0](#apache-license-20) -* [MIT License: SwiftKeychainWrapper](#mit-license-swiftkeychainwrapper) * [MIT License: aho-corasick, memchr](#mit-license-aho-corasick-memchr) * [MIT License: bincode](#mit-license-bincode) * [MIT License: bytes](#mit-license-bytes) @@ -757,37 +756,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -``` -------------- -## MIT License: SwiftKeychainWrapper - -The following text applies to code linked from these dependencies: -[SwiftKeychainWrapper](https://github.com/jrendel/SwiftKeychainWrapper) - -``` -The MIT License (MIT) - -Copyright (c) 2014 Jason Rendel - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - - ``` ------------- ## MIT License: aho-corasick, memchr diff --git a/tools/dependency_summary.py b/tools/dependency_summary.py index 453d0e9e9e..6dae4f2153 100755 --- a/tools/dependency_summary.py +++ b/tools/dependency_summary.py @@ -112,12 +112,6 @@ "license": "BSD-3-Clause", "license_file": "https://raw.githubusercontent.com/protocolbuffers/protobuf/master/LICENSE", }, - "ext-swift-keychain-wrapper": { - "name": "SwiftKeychainWrapper", - "repository": "https://github.com/jrendel/SwiftKeychainWrapper", - "license": "MIT", - "license_file": "https://raw.githubusercontent.com/jrendel/SwiftKeychainWrapper/develop/LICENSE", - }, "ext-nss": { "name": "NSS", "repository": "https://hg.mozilla.org/projects/nss", @@ -1134,8 +1128,6 @@ def get_extra_dependencies_not_managed_by_cargo(self, name, targets, deps): if self.target_is_android(target): extras.add("ext-jna") extras.add("ext-protobuf") - if self.target_is_ios(target): - extras.add("ext-swift-keychain-wrapper") for dep in deps: name = self.pkgInfoById[dep]["name"] if name in PACKAGES_WITH_EXTRA_DEPENDENCIES: