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.

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

Update to Glean v38.0.0 #4086

Merged
merged 1 commit into from
May 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 12 additions & 52 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 33 additions & 7 deletions DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ the details of which are reproduced below.
* [MIT License: http-body](#mit-license-http-body)
* [MIT License: hyper](#mit-license-hyper)
* [MIT License: kernel32-sys, winapi-build, ws2_32-sys](#mit-license-kernel32-sys-winapi-build-ws2_32-sys)
* [MIT License: libsqlite3-sys, rusqlite](#mit-license-libsqlite3-sys-rusqlite)
* [MIT License: libsqlite3-sys](#mit-license-libsqlite3-sys)
* [MIT License: matches](#mit-license-matches)
* [MIT License: mime_guess](#mit-license-mime_guess)
* [MIT License: miniz_oxide](#mit-license-miniz_oxide)
Expand All @@ -29,6 +29,7 @@ the details of which are reproduced below.
* [MIT License: openssl-sys](#mit-license-openssl-sys)
* [MIT License: ordered-float](#mit-license-ordered-float)
* [MIT License: oslog](#mit-license-oslog)
* [MIT License: rusqlite](#mit-license-rusqlite)
* [MIT License: schannel](#mit-license-schannel)
* [MIT License: slab](#mit-license-slab)
* [MIT License: textwrap](#mit-license-textwrap)
Expand Down Expand Up @@ -459,8 +460,6 @@ The following text applies to code linked from these dependencies:
[cc](https://github.com/alexcrichton/cc-rs),
[cfg-if](https://github.com/alexcrichton/cfg-if),
[chrono](https://github.com/chronotope/chrono),
[const-random-macro](https://github.com/tkaitchuck/constrandom),
[const-random](https://github.com/tkaitchuck/constrandom),
[core-foundation-sys](https://github.com/servo/core-foundation-rs),
[core-foundation](https://github.com/servo/core-foundation-rs),
[cpuid-bool](https://github.com/RustCrypto/utils),
Expand Down Expand Up @@ -1221,14 +1220,13 @@ SOFTWARE.

```
-------------
## MIT License: libsqlite3-sys, rusqlite
## MIT License: libsqlite3-sys

The following text applies to code linked from these dependencies:
[libsqlite3-sys](https://github.com/rusqlite/rusqlite),
[rusqlite](https://github.com/rusqlite/rusqlite)
[libsqlite3-sys](https://github.com/rusqlite/rusqlite)

```
Copyright (c) 2014-2020 The rusqlite developers
Copyright (c) 2014-2021 The rusqlite developers

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -1498,6 +1496,34 @@ 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: rusqlite

The following text applies to code linked from these dependencies:
[rusqlite](https://github.com/rusqlite/rusqlite)

```
Copyright (c) 2014-2020 The rusqlite developers

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: schannel
Expand Down
2 changes: 1 addition & 1 deletion components/external/glean
Submodule glean updated 153 files
38 changes: 33 additions & 5 deletions megazords/full/DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ the details of which are reproduced below.
* [MIT License: caseless](#mit-license-caseless)
* [MIT License: clap](#mit-license-clap)
* [MIT License: generic-array](#mit-license-generic-array)
* [MIT License: libsqlite3-sys, rusqlite](#mit-license-libsqlite3-sys-rusqlite)
* [MIT License: libsqlite3-sys](#mit-license-libsqlite3-sys)
* [MIT License: matches](#mit-license-matches)
* [MIT License: nom](#mit-license-nom)
* [MIT License: ordered-float](#mit-license-ordered-float)
* [MIT License: rusqlite](#mit-license-rusqlite)
* [MIT License: textwrap](#mit-license-textwrap)
* [MIT License: weedle](#mit-license-weedle)
* [CC0-1.0 License: base16](#cc0-10-license-base16)
Expand Down Expand Up @@ -924,14 +925,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
```
-------------
## MIT License: libsqlite3-sys, rusqlite
## MIT License: libsqlite3-sys

The following text applies to code linked from these dependencies:
[libsqlite3-sys](https://github.com/rusqlite/rusqlite),
[rusqlite](https://github.com/rusqlite/rusqlite)
[libsqlite3-sys](https://github.com/rusqlite/rusqlite)

```
Copyright (c) 2014-2020 The rusqlite developers
Copyright (c) 2014-2021 The rusqlite developers

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -1048,6 +1048,34 @@ 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: rusqlite

The following text applies to code linked from these dependencies:
[rusqlite](https://github.com/rusqlite/rusqlite)

```
Copyright (c) 2014-2020 The rusqlite developers

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: textwrap
Expand Down
8 changes: 4 additions & 4 deletions megazords/full/android/dependency-licenses.xml
Original file line number Diff line number Diff line change
Expand Up @@ -416,10 +416,6 @@ the details of which are reproduced below.
<name>MIT License: libsqlite3-sys</name>
<url>https://github.com/rusqlite/rusqlite/blob/master/LICENSE</url>
</license>
<license>
<name>MIT License: rusqlite</name>
<url>https://github.com/rusqlite/rusqlite/blob/master/LICENSE</url>
</license>
<license>
<name>MIT License: matches</name>
<url>https://github.com/SimonSapin/rust-std-candidates/blob/master/LICENSE</url>
Expand All @@ -432,6 +428,10 @@ the details of which are reproduced below.
<name>MIT License: ordered-float</name>
<url>https://github.com/reem/rust-ordered-float/blob/master/LICENSE-MIT</url>
</license>
<license>
<name>MIT License: rusqlite</name>
<url>https://github.com/rusqlite/rusqlite/blob/master/LICENSE</url>
</license>
<license>
<name>MIT License: textwrap</name>
<url>https://github.com/mgeisler/textwrap/blob/master/LICENSE</url>
Expand Down
40 changes: 33 additions & 7 deletions megazords/ios/DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ the details of which are reproduced below.
* [MIT License: h2](#mit-license-h2)
* [MIT License: http-body](#mit-license-http-body)
* [MIT License: hyper](#mit-license-hyper)
* [MIT License: libsqlite3-sys, rusqlite](#mit-license-libsqlite3-sys-rusqlite)
* [MIT License: libsqlite3-sys](#mit-license-libsqlite3-sys)
* [MIT License: matches](#mit-license-matches)
* [MIT License: mime_guess](#mit-license-mime_guess)
* [MIT License: miniz_oxide](#mit-license-miniz_oxide)
* [MIT License: mio](#mit-license-mio)
* [MIT License: nom](#mit-license-nom)
* [MIT License: ordered-float](#mit-license-ordered-float)
* [MIT License: oslog](#mit-license-oslog)
* [MIT License: rusqlite](#mit-license-rusqlite)
* [MIT License: slab](#mit-license-slab)
* [MIT License: textwrap](#mit-license-textwrap)
* [MIT License: tokio, tokio-tls, tokio-util, tracing, tracing-core, tracing-futures](#mit-license-tokio-tokio-tls-tokio-util-tracing-tracing-core-tracing-futures)
Expand Down Expand Up @@ -449,8 +450,6 @@ The following text applies to code linked from these dependencies:
[cc](https://github.com/alexcrichton/cc-rs),
[cfg-if](https://github.com/alexcrichton/cfg-if),
[chrono](https://github.com/chronotope/chrono),
[const-random-macro](https://github.com/tkaitchuck/constrandom),
[const-random](https://github.com/tkaitchuck/constrandom),
[core-foundation-sys](https://github.com/servo/core-foundation-rs),
[core-foundation](https://github.com/servo/core-foundation-rs),
[cpuid-bool](https://github.com/RustCrypto/utils),
Expand Down Expand Up @@ -1172,14 +1171,13 @@ THE SOFTWARE.

```
-------------
## MIT License: libsqlite3-sys, rusqlite
## MIT License: libsqlite3-sys

The following text applies to code linked from these dependencies:
[libsqlite3-sys](https://github.com/rusqlite/rusqlite),
[rusqlite](https://github.com/rusqlite/rusqlite)
[libsqlite3-sys](https://github.com/rusqlite/rusqlite)

```
Copyright (c) 2014-2020 The rusqlite developers
Copyright (c) 2014-2021 The rusqlite developers

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -1415,6 +1413,34 @@ 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: rusqlite

The following text applies to code linked from these dependencies:
[rusqlite](https://github.com/rusqlite/rusqlite)

```
Copyright (c) 2014-2020 The rusqlite developers

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: slab
Expand Down