Skip to content

Commit 736a3ba

Browse files
authored
Bump tutorial versions to more modern ones (#187)
* bump versions * wip * bump versions
1 parent 3d49529 commit 736a3ba

File tree

14 files changed

+25
-26
lines changed

14 files changed

+25
-26
lines changed

examples/cross_build/toolchain_packages/consumer/conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class CompressorRecipe(ConanFile):
66
generators = "CMakeToolchain", "CMakeDeps"
77

88
def requirements(self):
9-
self.requires("zlib/1.2.11")
9+
self.requires("zlib/1.3.1")
1010

1111
def layout(self):
1212
cmake_layout(self)

examples/libraries/libcurl/ascii_art_color/ci_test_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77

88
# not using conanfile in case someone downloads the whole folder
99
# we do not want to interfere with the one created by the extension
10-
run("conan install --requires=libcurl/8.6.0 --requires=stb/cci.20230920 --requires=fmt/10.2.1 --build=missing -g MSBuildDeps -g MSBuildToolchain --output-folder=conan")
10+
run("conan install --requires=libcurl/8.12.1 --requires=stb/cci.20240531 --requires=fmt/11.2.0 --build=missing -g MSBuildDeps -g MSBuildToolchain --output-folder=conan")
1111
run('.\\conan\\conanvcvars.bat & MSBuild asciiartgen.sln /p:Configuration=Release /p:Platform="x64"')
1212
run(".\\x64\\Release\\asciiartgen.exe")

examples/libraries/libcurl/download_image/ci_test_example.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55

66
# not using a conanfile because that will be created by the CLion plugin, in case someone just wants to
77
# copy this code to its folder so that the user does not find any conflicting file
8-
run("conan install --requires=stb/cci.20220909 --build=missing -g CMakeDeps -g CMakeToolchain --output-folder=build")
9-
run("conan install --requires=libcurl/8.2.0 --build=missing -g CMakeDeps -g CMakeToolchain --output-folder=build")
10-
8+
run("conan install --requires=stb/cci.20240531 --build=missing -g CMakeDeps -g CMakeToolchain --output-folder=build")
9+
run("conan install --requires=libcurl/8.12.1 --build=missing -g CMakeDeps -g CMakeToolchain --output-folder=build")
1110
# with presets
1211

1312
if platform.system() == "Windows":

examples/tools/meson/mesontoolchain/simple_meson_project/conanfile.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[requires]
2-
zlib/1.2.11
2+
zlib/1.3.1
33

44
[generators]
55
PkgConfigDeps
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
project('tutorial', 'c')
2-
zlib = dependency('zlib', version : '1.2.11')
2+
zlib = dependency('zlib', version : '1.3.1')
33
executable('compressor', 'src/main.c', dependencies: zlib)

tutorial/consuming_packages/conanfile_py/ci_test_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def run_example(output_folder=""):
3333
run(" && ".join(command))
3434
cmd_out = run("./compressor")
3535

36-
assert "ZLIB VERSION: 1.2.11" in cmd_out
36+
assert "ZLIB VERSION: 1.3.1" in cmd_out
3737

3838

3939
print("- Understanding the flexibility of using conanfile.py vs conanfile.txt -")

tutorial/consuming_packages/conanfile_py/complete_conanfile.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ class CompressorRecipe(ConanFile):
1010
generators = "CMakeToolchain", "CMakeDeps"
1111

1212
def requirements(self):
13-
self.requires("zlib/1.2.11")
13+
self.requires("zlib/1.3.1")
1414
# Add base64 dependency only for Windows
1515
if self.settings.os == "Windows":
1616
self.requires("base64/0.4.0")
1717

1818
def build_requirements(self):
19-
if self.settings.os != "Windows": # we need cmake 3.22.6 in other platforms
20-
self.tool_requires("cmake/3.22.6")
19+
if self.settings.os != "Windows": # we need cmake 3.27.9 in other platforms
20+
self.tool_requires("cmake/3.27.9")
2121

2222
def layout(self):
2323
# We make the assumption that if the compiler is msvc the

tutorial/consuming_packages/conanfile_py/conanfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class CompressorRecipe(ConanFile):
66
generators = "CMakeToolchain", "CMakeDeps"
77

88
def requirements(self):
9-
self.requires("zlib/1.2.11")
9+
self.requires("zlib/1.3.1")
1010

1111
def build_requirements(self):
12-
self.tool_requires("cmake/3.22.6")
12+
self.tool_requires("cmake/3.27.9")

tutorial/consuming_packages/cross_building/conanfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ class CompressorRecipe(ConanFile):
66
generators = "CMakeToolchain", "CMakeDeps"
77

88
def requirements(self):
9-
self.requires("zlib/1.2.11")
9+
self.requires("zlib/1.3.1")
1010

1111
def build_requirements(self):
12-
self.tool_requires("cmake/3.22.6")
12+
self.tool_requires("cmake/3.27.9")
1313

1414
def layout(self):
1515
cmake_layout(self)

tutorial/consuming_packages/different_configurations/ci_test_example.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
assert "Debug configuration!" in cmd_out
2929

3030
# Build for Release with shared libraries
31-
run("conan install . --output-folder=build --build=missing -s build_type=Release --options=zlib/1.2.11:shared=True")
31+
run("conan install . --output-folder=build --build=missing -s build_type=Release --options=zlib/1.3.1:shared=True")
3232
with chdir("build"):
3333
command = []
3434
command.append("conanbuild.bat")
@@ -68,7 +68,7 @@
6868
assert "Debug configuration!" in cmd_out
6969

7070
# Build for Release with shared libraries
71-
run("conan install . --output-folder=build --build=missing -s build_type=Release --options=zlib/1.2.11:shared=True")
71+
run("conan install . --output-folder=build --build=missing -s build_type=Release --options=zlib/1.3.1:shared=True")
7272
with chdir("build"):
7373
command = []
7474
command.append(". ./conanbuild.sh")

0 commit comments

Comments
 (0)