[celix] branch feature/508-remove-deployment-admin-bundle updated: #509: Reintroduce zlib requirement if libcurl is used to prevent conflict

[pn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pnoltes pushed a commit to branch feature/508-remove-deployment-admin-bundle
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to refs/heads/feature/508-remove-deployment-admin-bundle by this push:
     new 54f053fc #509: Reintroduce zlib requirement if libcurl is used to prevent conflict
54f053fc is described below

commit 54f053fcee70f323e09f5f15a51684c51351b6b9
Author: Pepijn Noltes <pn...@apache.org>
AuthorDate: Sun Oct 1 15:16:37 2023 +0200

    #509: Reintroduce zlib requirement if libcurl is used to prevent conflict
---
 conanfile.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conanfile.py b/conanfile.py
index b2256098..8b3f7e82 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -382,6 +382,7 @@ class CelixConan(ConanFile):
                 or self.options.build_rsa_discovery_common or self.options.build_rsa_remote_service_admin_dfi
                 or self.options.build_launcher):
             self.requires("libcurl/[>=7.64.1 <8.0.0]")
+            self.requires("zlib/[>=1.2.13 <2.0.0]") #Direct dep on zlib is needed to resolve a conflict with libcurl and libzip
         if (self.options.build_rsa_discovery_common or self.options.build_shell_bonjour or
                 (self.options.build_rsa_remote_service_admin_dfi and self.options.enable_testing)):
             self.requires("libxml2/[>=2.9.9 <3.0.0]")