Merge branch 'master' into qt

.c3i/authorized_users.yml

@@ -1313,3 +1313,15 @@ authorized_users:
 - Ruwei-Liu
 - msparapa
 - pzheltov
+- igadmg
+- eljonny
+- VladimirShaleev
+- phwissmann
+- ybogo
+- ujos
+- nclindroos
+- es20490446e
+- victimsnino
+- dmpriso
+- darakelian
+- sivachandran

.c3i/conan_v2_ready_references.yml

@@ -90,6 +90,7 @@ required_for_references:
 - bdwgc
 - bear
 - beauty
+- behaviortree.cpp
 - benchmark
 - bertrand
 - bezier
@@ -208,6 +209,7 @@ required_for_references:
 - cose-c
 - cotila
 - coz
+- cpp-channel
 - cpp-httplib
 - cpp-ipc
 - cpp-jwt
@@ -236,6 +238,7 @@ required_for_references:
 - cprocessing
 - cpu_features
 - cpuinfo
+- cpython
 - cqrlib
 - crc32c
 - crc_cpp
@@ -533,6 +536,7 @@ required_for_references:
 - id3v2lib
 - idna
 - ignition-cmake
+- iguana
 - iir1
 - im95able-rea
 - imagl
@@ -629,6 +633,7 @@ required_for_references:
 - libbacktrace
 - libbasisu
 - libbigwig
+- libboxes
 - libbpf
 - libbsd
 - libcap
@@ -670,9 +675,11 @@ required_for_references:
 - libexif
 - libfdk_aac
 - libffi
+- libfork
 - libfreenect
 - libfreenect2
 - libftdi
+- libftp
 - libfuse
 - libgcrypt
 - libgd
@@ -690,6 +697,7 @@ required_for_references:
 - libiberty
 - libiconv
 - libid3tag
+- libinput
 - libinterpolate
 - libipt
 - libjpeg
@@ -893,6 +901,7 @@ required_for_references:
 - mingw-builds
 - mingw-w64
 - miniaudio
+- minicoro
 - minimp3
 - minisat
 - miniscript
@@ -970,6 +979,7 @@ required_for_references:
 - numcpp
 - nuraft
 - nv-codec-headers
+- nvcloth
 - nvtx
 - oatpp
 - oatpp-libressl
@@ -1032,6 +1042,7 @@ required_for_references:
 - opentelemetry-cpp
 - opentelemetry-proto
 - opentracing-cpp
+- openvdb
 - openvino
 - openvr
 - openxlsx
@@ -1146,6 +1157,7 @@ required_for_references:
 - quantlib
 - quaternions
 - quazip
+- quickcpplib
 - quickfix
 - quickjs
 - quill
@@ -1281,6 +1293,7 @@ required_for_references:
 - spy
 - sqlcipher
 - sqlite3
+- sqlite3mc
 - sqlite_orm
 - sqlitecpp
 - sqlpp11
@@ -1474,6 +1487,7 @@ required_for_references:
 - whisper-cpp
 - wide-integer
 - wil
+- wildcards
 - wildmidi
 - winflexbison
 - winmd

.c3i/config_v1.yml

@@ -3,7 +3,7 @@
 id: 'conan-io/conan-center-index'
 
 conan:
-  version: 1.62.0
+  version: 1.63.0
 
 artifactory:
   url: "https://c3i.jfrog.io/c3i"

.c3i/config_v2.yml

@@ -3,7 +3,7 @@
 id: 'conan-io/conan-center-index'
 
 conan:
-  version: 2.0.16
+  version: 2.2.2
   backup_sources:
     upload_url: "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"
     download_url: "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"

docs/changelog.md

@@ -1,9 +1,19 @@
 # Changelog
 
-### 13-Mar-2024 - 11:08 CET
+### 03-April-2024 - 13:53 CEST
 
-- [feature]: Build with both */*:shared=True/False option when package type is declared as ``shared-library``.
-- [fix]: Fix ValidateInfra python version check to be aligned with the latest Jenkins version.
+- [feature] Add support for Conan 2.2.2 in the CI
+- [feature] Add support for Conan 1.63.0 in the CI
+
+### 20-March-2024 - 11:13 CET
+
+- [fix] Changing Version Ranges in dependencies is now bump dependencies
+- [fix] Static library package type should be built with both all static and all shared dependencies
+
+### 13-March-2024 - 11:08 CET
+
+- [feature] Build with both */*:shared=True/False option when package type is declared as ``shared-library``.
+- [fix] Fix ValidateInfra python version check to be aligned with the latest Jenkins version.
 
 ### 07-February-2024 - 15:43 CET
 

docs/faqs.md

@@ -453,6 +453,8 @@ and does not install libraries with the boost prefix.
 
 Yes, but make sure it does not have Boost in the name. Use the [`author-name` convention](https://github.com/conan-io/conan-center-index/blob/master/docs/faqs.md#what-is-the-policy-on-recipe-name-collisions) so there are no conflicts. In addition to follow the rules outlined above.
 
+**NOTE**: In case you have no intention to submit to Boost, then you can use the project name as is (e.g `boost-foobar`).
+
 ## Can I add options that do not affect `package_id` or the package contents
 
 Generally no, these sorts of options can most likely be set from a profile or downstream recipes. However if the project supports this option from its build script

recipes/7bitdi/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "3.0.0":
+    url: "https://github.com/7bitcoder/7bitDI/archive/refs/tags/v3.0.0.tar.gz"
+    sha256: "aabb8e907c0cafb8e4b7c8367ed5dbb3cba2d83af090bdef9a7f855c0778c8f3"
   "2.1.0":
     url: "https://github.com/7bitcoder/7bitDI/archive/refs/tags/v2.1.0.tar.gz"
     sha256: "54edceb4f90bf652126310ca0b78150d05a02d7081cef3c9ccaba5f4dd112935"

recipes/7bitdi/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "3.0.0":
+    folder: all
   "2.1.0":
     folder: all
   "2.0.0":

recipes/alembic/all/conanfile.py

@@ -44,9 +44,9 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("imath/3.1.9", transitive_headers=True)
+        self.requires("imath/3.1.10", transitive_headers=True)
         if self.options.with_hdf5:
-            self.requires("hdf5/1.14.2")
+            self.requires("hdf5/1.14.3")
 
     def validate(self):
         if self.settings.compiler.get_safe("cppstd"):

recipes/android-ndk/all/conandata.yml

@@ -1,4 +1,17 @@
 sources:
+  "r26c":
+    "Windows":
+      "x86_64":
+        url: "https://dl.google.com/android/repository/android-ndk-r26c-windows.zip"
+        sha256: "67d0c7e4ba853e9168584e8640a562af431dcf086c08efef3ec23ee827139303"
+    "Linux":
+      "x86_64":
+        url: "https://dl.google.com/android/repository/android-ndk-r26c-linux.zip"
+        sha256: "6d6e659834d28bb24ba7ae66148ad05115ebbad7dabed1af9b3265674774fcf6"
+    "Macos":
+      "x86_64":
+        url: "https://dl.google.com/android/repository/android-ndk-r26c-darwin.zip"
+        sha256: "312756dfcbdbf389d35d651e17ca98683bd36cb83cc7bf7ad51cac5c06bd064b"
   "r26b":
     "Windows":
       "x86_64":

recipes/android-ndk/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "r26c":
+    folder: all
   "r26b":
     folder: all
   "r26":

recipes/arrow/all/conandata.yml

@@ -38,12 +38,6 @@ sources:
   "7.0.0":
     url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-7.0.0/apache-arrow-7.0.0.tar.gz?action=download"
     sha256: "e8f49b149a15ecef4e40fcfab1b87c113c6b1ee186005c169e5cdf95d31a99de"
-  "2.0.0":
-    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-2.0.0/apache-arrow-2.0.0.tar.gz?action=download"
-    sha256: "be0342cc847bb340d86aeaef43596a0b6c1dbf1ede9c789a503d939e01c71fbe"
-  "1.0.0":
-    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-1.0.0/apache-arrow-1.0.0.tar.gz?action=download"
-    sha256: "86ddb9feb48203a5aaf9cc4f2827525e20a2ca4d7239e492af17e74532ccf243"
 patches:
   "8.0.1":
     - patch_file: "patches/8.0.0-0005-install-utils.patch"
@@ -66,23 +60,3 @@ patches:
     - patch_file: "patches/7.0.0-0007-fix-cmake.patch"
       patch_description: "use cci package"
       patch_type: "conan"
-  "2.0.0":
-    - patch_file: "patches/2.0.0-0003-fix-shared-msvc.patch"
-      patch_description: "make shared enabled in msvc"
-      patch_type: "official"
-    - patch_file: "patches/2.0.0-0005-gandiva-engine.patch"
-      patch_description: "fix grandiva compilation error"
-      patch_type: "official"
-    - patch_file: "patches/2.0.0-0008-fix-cmake.patch"
-      patch_description: "use cci package"
-      patch_type: "conan"
-  "1.0.0":
-    - patch_file: "patches/1.0.0-0003-fix-shared-msvc.patch"
-      patch_description: "make shared enabled in msvc"
-      patch_type: "official"
-    - patch_file: "patches/1.0.0-0005-fix-make12-namespace.patch"
-      patch_description: "fix ambiguous `make12` function between std and date"
-      patch_type: "official"
-    - patch_file: "patches/1.0.0-0006-fix-cmake.patch"
-      patch_description: "use cci package"
-      patch_type: "conan"