Skip to content

Commit 28b427a

Browse files
committed
Removed SwiftKeychainWrapper logic
1 parent b9d6b54 commit 28b427a

File tree

5 files changed

+3
-104
lines changed

5 files changed

+3
-104
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
### Viaduct
1313
* Support setting default user-agent headers.
1414

15+
### FxA Client
16+
- Removed `SwiftKeychainWrapper` logic. ([#7150](https://github.com/mozilla/application-services/pull/7150))
17+
1518
### Nimbus
1619
* Adds a `Vec<PreviousGeckoPrefState>` 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.
1720
* 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.

DEPENDENCIES.md

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ the details of which are reproduced below.
66

77
* [Mozilla Public License 2.0](#mozilla-public-license-20)
88
* [Apache License 2.0](#apache-license-20)
9-
* [MIT License: SwiftKeychainWrapper](#mit-license-swiftkeychainwrapper)
109
* [MIT License: aho-corasick, byteorder, memchr](#mit-license-aho-corasick-byteorder-memchr)
1110
* [MIT License: bincode](#mit-license-bincode)
1211
* [MIT License: bytes](#mit-license-bytes)
@@ -799,37 +798,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
799798
See the License for the specific language governing permissions and
800799
limitations under the License.
801800
802-
```
803-
-------------
804-
## MIT License: SwiftKeychainWrapper
805-
806-
The following text applies to code linked from these dependencies:
807-
[SwiftKeychainWrapper](https://github.com/jrendel/SwiftKeychainWrapper)
808-
809-
```
810-
The MIT License (MIT)
811-
812-
Copyright (c) 2014 Jason Rendel
813-
814-
Permission is hereby granted, free of charge, to any person obtaining a copy
815-
of this software and associated documentation files (the "Software"), to deal
816-
in the Software without restriction, including without limitation the rights
817-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
818-
copies of the Software, and to permit persons to whom the Software is
819-
furnished to do so, subject to the following conditions:
820-
821-
The above copyright notice and this permission notice shall be included in all
822-
copies or substantial portions of the Software.
823-
824-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
825-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
826-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
827-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
828-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
829-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
830-
SOFTWARE.
831-
832-
833801
```
834802
-------------
835803
## MIT License: aho-corasick, byteorder, memchr

megazords/ios-rust/DEPENDENCIES.md

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ the details of which are reproduced below.
66

77
* [Mozilla Public License 2.0](#mozilla-public-license-20)
88
* [Apache License 2.0](#apache-license-20)
9-
* [MIT License: SwiftKeychainWrapper](#mit-license-swiftkeychainwrapper)
109
* [MIT License: aho-corasick, byteorder, memchr](#mit-license-aho-corasick-byteorder-memchr)
1110
* [MIT License: bincode](#mit-license-bincode)
1211
* [MIT License: bytes](#mit-license-bytes)
@@ -777,37 +776,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
777776
See the License for the specific language governing permissions and
778777
limitations under the License.
779778
780-
```
781-
-------------
782-
## MIT License: SwiftKeychainWrapper
783-
784-
The following text applies to code linked from these dependencies:
785-
[SwiftKeychainWrapper](https://github.com/jrendel/SwiftKeychainWrapper)
786-
787-
```
788-
The MIT License (MIT)
789-
790-
Copyright (c) 2014 Jason Rendel
791-
792-
Permission is hereby granted, free of charge, to any person obtaining a copy
793-
of this software and associated documentation files (the "Software"), to deal
794-
in the Software without restriction, including without limitation the rights
795-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
796-
copies of the Software, and to permit persons to whom the Software is
797-
furnished to do so, subject to the following conditions:
798-
799-
The above copyright notice and this permission notice shall be included in all
800-
copies or substantial portions of the Software.
801-
802-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
803-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
804-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
805-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
806-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
807-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
808-
SOFTWARE.
809-
810-
811779
```
812780
-------------
813781
## MIT License: aho-corasick, byteorder, memchr

megazords/ios-rust/focus/DEPENDENCIES.md

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ the details of which are reproduced below.
66

77
* [Mozilla Public License 2.0](#mozilla-public-license-20)
88
* [Apache License 2.0](#apache-license-20)
9-
* [MIT License: SwiftKeychainWrapper](#mit-license-swiftkeychainwrapper)
109
* [MIT License: aho-corasick, memchr](#mit-license-aho-corasick-memchr)
1110
* [MIT License: bincode](#mit-license-bincode)
1211
* [MIT License: bytes](#mit-license-bytes)
@@ -757,37 +756,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
757756
See the License for the specific language governing permissions and
758757
limitations under the License.
759758
760-
```
761-
-------------
762-
## MIT License: SwiftKeychainWrapper
763-
764-
The following text applies to code linked from these dependencies:
765-
[SwiftKeychainWrapper](https://github.com/jrendel/SwiftKeychainWrapper)
766-
767-
```
768-
The MIT License (MIT)
769-
770-
Copyright (c) 2014 Jason Rendel
771-
772-
Permission is hereby granted, free of charge, to any person obtaining a copy
773-
of this software and associated documentation files (the "Software"), to deal
774-
in the Software without restriction, including without limitation the rights
775-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
776-
copies of the Software, and to permit persons to whom the Software is
777-
furnished to do so, subject to the following conditions:
778-
779-
The above copyright notice and this permission notice shall be included in all
780-
copies or substantial portions of the Software.
781-
782-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
783-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
784-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
785-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
786-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
787-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
788-
SOFTWARE.
789-
790-
791759
```
792760
-------------
793761
## MIT License: aho-corasick, memchr

tools/dependency_summary.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,6 @@
112112
"license": "BSD-3-Clause",
113113
"license_file": "https://raw.githubusercontent.com/protocolbuffers/protobuf/master/LICENSE",
114114
},
115-
"ext-swift-keychain-wrapper": {
116-
"name": "SwiftKeychainWrapper",
117-
"repository": "https://github.com/jrendel/SwiftKeychainWrapper",
118-
"license": "MIT",
119-
"license_file": "https://raw.githubusercontent.com/jrendel/SwiftKeychainWrapper/develop/LICENSE",
120-
},
121115
"ext-nss": {
122116
"name": "NSS",
123117
"repository": "https://hg.mozilla.org/projects/nss",
@@ -1134,8 +1128,6 @@ def get_extra_dependencies_not_managed_by_cargo(self, name, targets, deps):
11341128
if self.target_is_android(target):
11351129
extras.add("ext-jna")
11361130
extras.add("ext-protobuf")
1137-
if self.target_is_ios(target):
1138-
extras.add("ext-swift-keychain-wrapper")
11391131
for dep in deps:
11401132
name = self.pkgInfoById[dep]["name"]
11411133
if name in PACKAGES_WITH_EXTRA_DEPENDENCIES:

0 commit comments

Comments
 (0)