Skip to content

Commit 9531445

Browse files
authored
Use newer versions for zlib and cmake in docs (#4157)
* use newest versions for zlib and cmake * revert some changes
1 parent 4be7455 commit 9531445

27 files changed

+120
-120
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ indentation. Documentation makes an extensive use of bash, python, txt and cmake
130130
131131
[requires]
132132
poco/1.9.4
133-
zlib/1.2.11
133+
zlib/1.3.1
134134
```
135135

136136
```

examples/tools/meson/build_simple_meson_project.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Let's create a *conanfile.txt* with the following content to install **Zlib**:
8989
:caption: **conanfile.txt**
9090
9191
[requires]
92-
zlib/1.2.11
92+
zlib/1.3.1
9393
9494
[generators]
9595
PkgConfigDeps

knowledge/faq.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ that you get an error like the following one:
1919

2020
.. code-block:: text
2121
22-
ERROR: Missing binary: zlib/1.2.11:b1d267f77ddd5d10d06d2ecf5a6bc433fbb7eeed
22+
ERROR: Missing binary: zlib/1.3.1:b1d267f77ddd5d10d06d2ecf5a6bc433fbb7eeed
2323
24-
zlib/1.2.11: WARN: Can't find a 'zlib/1.2.11' package binary 'b1d267f77ddd5d10d06d2ecf5a6bc433fbb7eeed' for the configuration:
24+
zlib/1.3.1: WARN: Can't find a 'zlib/1.3.1' package binary 'b1d267f77ddd5d10d06d2ecf5a6bc433fbb7eeed' for the configuration:
2525
[settings]
2626
arch=x86_64
2727
build_type=Release
@@ -34,14 +34,14 @@ that you get an error like the following one:
3434
fPIC=True
3535
shared=False
3636
37-
ERROR: Missing prebuilt package for 'zlib/1.2.11'. You can try:
37+
ERROR: Missing prebuilt package for 'zlib/1.3.1'. You can try:
3838
- List all available packages using 'conan list "{ref}:*" -r=remote'
3939
- Explain missing binaries: replace 'conan install ...' with 'conan graph explain ...'
40-
- Try to build locally from sources using the '--build=zlib/1.2.11' argument
40+
- Try to build locally from sources using the '--build=zlib/1.3.1' argument
4141
4242
More Info at 'https://docs.conan.io/en/2/knowledge/faq.html#error-missing-prebuilt-package'
4343
44-
This means that the package recipe ``zlib/1.2.11`` exists, but for some reason there is no
44+
This means that the package recipe ``zlib/1.3.1`` exists, but for some reason there is no
4545
precompiled package for your current settings or options. Maybe the package creator didn't build and
4646
shared pre-built packages at all and only uploaded the package recipe, or they are only
4747
providing packages for some platforms or compilers. E.g. the package creator built

reference/commands/cache.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ For example, to verify the integrity of the whole Conan local cache, do:
208208
mypkg/1.0: Integrity checked: ok
209209
mypkg/1.0:454923cd42d0da27b9b1294ebc3e4ecc84020747: Integrity checked: ok
210210
mypkg/1.0:454923cd42d0da27b9b1294ebc3e4ecc84020747: Integrity checked: ok
211-
zlib/1.2.11: Integrity checked: ok
212-
zlib/1.2.11:6fe7fa69f760aee504e0be85c12b2327c716f9e7: Integrity checked: ok
211+
zlib/1.3.1: Integrity checked: ok
212+
zlib/1.3.1:6fe7fa69f760aee504e0be85c12b2327c716f9e7: Integrity checked: ok
213213
214214
215215
conan cache backup-upload

reference/commands/list.rst

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Listing recipe references
4949
string-view-lite
5050
string-view-lite/1.6.0
5151
zlib
52-
zlib/1.2.11
52+
zlib/1.3.1
5353
5454
This command is equivalent to ``$ conan list "*"`` (make sure to quote the argument), if no argument
5555
is provided Conan will list all packages.
@@ -61,7 +61,7 @@ is provided Conan will list all packages.
6161
$ conan list zlib
6262
Local Cache
6363
zlib
64-
zlib/1.2.11
64+
zlib/1.3.1
6565
zlib/1.2.12
6666
6767
@@ -75,7 +75,7 @@ search.
7575
$ conan list "zlib/*"
7676
Local Cache
7777
zlib
78-
zlib/1.2.11
78+
zlib/1.3.1
7979
zlib/1.2.12
8080
8181
You can also use version ranges in the version field to define the versions you want:
@@ -87,7 +87,7 @@ You can also use version ranges in the version field to define the versions you
8787
$ conan list "zlib/[<1.2.12]" -r=conancenter
8888
Local Cache
8989
zlib
90-
zlib/1.2.11
90+
zlib/1.3.1
9191
$ conan list "zlib/[>1.2.11]" -r=conancenter
9292
Local Cache
9393
zlib
@@ -115,7 +115,7 @@ Use the ``...@`` pattern for searching only references that don't have *user* an
115115
string-view-lite
116116
string-view-lite/1.6.0
117117
zlib
118-
zlib/1.2.11
118+
zlib/1.3.1
119119
120120
Listing recipe revisions
121121
------------------------
@@ -126,10 +126,10 @@ we can use the ``#latest`` placeholder:
126126
.. code-block:: text
127127
:caption: *list latest recipe revision*
128128
129-
$ conan list zlib/1.2.11#latest
129+
$ conan list zlib/1.3.1#latest
130130
Local Cache
131131
zlib
132-
zlib/1.2.11
132+
zlib/1.3.1
133133
revisions
134134
ffa77daf83a57094149707928bdce823 (2022-11-02 13:46:53 UTC)
135135
@@ -138,10 +138,10 @@ To list all recipe revisions use the ``*`` wildcard:
138138
.. code-block:: text
139139
:caption: *list all recipe revisions*
140140
141-
$ conan list "zlib/1.2.11#*"
141+
$ conan list "zlib/1.3.1#*"
142142
Local Cache
143143
zlib
144-
zlib/1.2.11
144+
zlib/1.3.1
145145
revisions
146146
ffa77daf83a57094149707928bdce823 (2022-11-02 13:46:53 UTC)
147147
8b23adc7acd6f1d6e220338a78e3a19e (2022-10-19 09:19:10 UTC)
@@ -160,10 +160,10 @@ using ``name/version@user/channel:*`` as the pattern:
160160
:caption: *list all package IDs for latest recipe revision*
161161
162162
# Make sure to quote the argument
163-
$ conan list "zlib/1.2.11:*"
163+
$ conan list "zlib/1.3.1:*"
164164
Local Cache
165165
zlib
166-
zlib/1.2.11
166+
zlib/1.3.1
167167
revisions
168168
d77ee68739fcbe5bf37b8a4690eea6ea (2022-08-05 17:17:30 UTC)
169169
packages
@@ -193,7 +193,7 @@ using ``name/version@user/channel:*`` as the pattern:
193193
.. note::
194194

195195
Here the ``#latest`` for the recipe revision is implicit, i.e., that pattern is
196-
equivalent to ``zlib/1.2.11#latest:*``
196+
equivalent to ``zlib/1.3.1#latest:*``
197197

198198

199199
To list all the package IDs for all the recipe revisions use the ``*`` wildcard in the
@@ -203,10 +203,10 @@ revision ``#`` part:
203203
:caption: *list all the package IDs for all the recipe revisions*
204204
205205
# Make sure to quote the argument
206-
$ conan list "zlib/1.2.11#*:*"
206+
$ conan list "zlib/1.3.1#*:*"
207207
Local Cache
208208
zlib
209-
zlib/1.2.11
209+
zlib/1.3.1
210210
revisions
211211
d77ee68739fcbe5bf37b8a4690eea6ea (2022-08-05 17:17:30 UTC)
212212
packages
@@ -245,10 +245,10 @@ package ID is using the pattern ``name/version@user/channel#rrev:pkgid``
245245
.. code-block:: text
246246
:caption: *list latest package revision for a specific recipe revision and package ID*
247247
248-
$ conan list zlib/1.2.11#8b23adc7acd6f1d6e220338a78e3a19e:fdb823f07bc228621617c6397210a5c6c4c8807b
248+
$ conan list zlib/1.3.1#8b23adc7acd6f1d6e220338a78e3a19e:fdb823f07bc228621617c6397210a5c6c4c8807b
249249
Local Cache
250250
zlib
251-
zlib/1.2.11
251+
zlib/1.3.1
252252
revisions
253253
8b23adc7acd6f1d6e220338a78e3a19e (2022-08-05 17:17:30 UTC)
254254
packages
@@ -263,10 +263,10 @@ To list all the package revisions for for the latest recipe revision:
263263
:caption: *list all the package revisions for all package-ids the latest recipe revision*
264264
265265
# Make sure to quote the argument
266-
$ conan list "zlib/1.2.11:*#*"
266+
$ conan list "zlib/1.3.1:*#*"
267267
Local Cache
268268
zlib
269-
zlib/1.2.11
269+
zlib/1.3.1
270270
revisions
271271
6a6451bbfcb0e591333827e9784d7dfa (2022-12-29 11:51:39 UTC)
272272
packages
@@ -282,7 +282,7 @@ To list all the package revisions for for the latest recipe revision:
282282
.. note::
283283

284284
Here the ``#latest`` for the recipe revision is implicit, i.e., that pattern is
285-
equivalent to ``zlib/1.2.11#latest:*#*``
285+
equivalent to ``zlib/1.3.1#latest:*#*``
286286

287287

288288
Listing graph artifacts
@@ -366,7 +366,7 @@ with the following structure:
366366
.. code-block:: text
367367
368368
# Make sure to quote the argument
369-
$ conan list "zlib/1.2.11:*#*" --format=json
369+
$ conan list "zlib/1.3.1:*#*" --format=json
370370
{
371371
"Local Cache": {
372372
"zli/1.0.0": {

reference/commands/search.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,29 @@ This command is equivalent to ``conan list <query> -r=*``, and is provided for s
1616
conancenter
1717
zlib
1818
zlib/1.2.8
19-
zlib/1.2.11
19+
zlib/1.3.1
2020
zlib/1.2.12
2121
zlib/1.2.13
2222
2323
$ conan search zlib -r=conancenter
2424
conancenter
2525
zlib
2626
zlib/1.2.8
27-
zlib/1.2.11
27+
zlib/1.3.1
2828
zlib/1.2.12
2929
zlib/1.2.13
3030
3131
$ conan search zlib/1.2.1* -r=conancenter
3232
conancenter
3333
zlib
34-
zlib/1.2.11
34+
zlib/1.3.1
3535
zlib/1.2.12
3636
zlib/1.2.13
3737
3838
$ conan search zlib/1.2.1* -r=conancenter --format=json
3939
{
4040
"conancenter": {
41-
"zlib/1.2.11": {},
41+
"zlib/1.3.1": {},
4242
"zlib/1.2.12": {},
4343
"zlib/1.2.13": {}
4444
}

reference/conanfile/methods/generate.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ Iterating the dependencies can be done as:
214214

215215
.. code-block:: python
216216
217-
requires = "zlib/1.2.11", "poco/1.9.4"
217+
requires = "zlib/1.3.1", "poco/1.9.4"
218218
219219
def generate(self):
220220
for require, dependency in self.dependencies.items():
@@ -224,7 +224,7 @@ will output:
224224

225225
.. code-block:: bash
226226
227-
conanfile.py (hello/0.1): Dependency is direct=True: zlib/1.2.11
227+
conanfile.py (hello/0.1): Dependency is direct=True: zlib/1.3.1
228228
conanfile.py (hello/0.1): Dependency is direct=True: poco/1.9.4
229229
conanfile.py (hello/0.1): Dependency is direct=False: pcre/8.44
230230
conanfile.py (hello/0.1): Dependency is direct=False: expat/2.4.1
@@ -255,7 +255,7 @@ They can be used in the same way:
255255

256256
.. code-block:: python
257257
258-
requires = "zlib/1.2.11", "poco/1.9.4"
258+
requires = "zlib/1.3.1", "poco/1.9.4"
259259
260260
def generate(self):
261261
cmake = self.dependencies.direct_build["cmake"]

reference/conanfile/methods/requirements.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ The ``requirements()`` method is used to specify the dependencies of a package.
88
.. code-block:: python
99
1010
def requirements(self):
11-
self.requires("zlib/1.2.11")
11+
self.requires("zlib/1.3.1")
1212
1313
14-
For simple cases the attribute syntax can be used, like ``requires = "zlib/1.2.11"``.
14+
For simple cases the attribute syntax can be used, like ``requires = "zlib/1.3.1"``.
1515

1616

1717
Requirement traits

reference/conanfile_txt.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ List of requirements, specifying the full reference. Equivalent to ``self.requir
2020
2121
[requires]
2222
poco/1.9.4
23-
zlib/1.2.11
23+
zlib/1.3.1
2424
2525
2626
This section supports references with version-ranges too:
@@ -29,7 +29,7 @@ This section supports references with version-ranges too:
2929
3030
[requires]
3131
poco/[>1.0 <1.9]
32-
zlib/1.2.11
32+
zlib/1.3.1
3333
3434
And specific recipe revisions can be pinned too:
3535

@@ -103,7 +103,7 @@ List of options scoped for each package with a pattern like **package_name*:opti
103103
104104
[requires]
105105
poco/1.9.4
106-
zlib/1.2.11
106+
zlib/1.3.1
107107
108108
[generators]
109109
CMakeDeps

reference/config_files/profiles.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ you could specify so as:
463463
:caption: *myprofile*
464464
465465
[platform_requires]
466-
zlib/1.2.11
466+
zlib/1.3.1
467467
468468
469469
.. _reference_config_files_profiles_platform_tool_requires:

0 commit comments

Comments
 (0)