Feature/769 libuv package and thread header

.devcontainer/Containerfile

@@ -68,6 +68,7 @@ RUN DEBIAN_FRONTEND="noninteractive" sudo apt-get update && \
         libjansson-dev \
         libxml2-dev \
         libzip-dev \
+        libuv1-dev \
         rapidjson-dev \
         uuid-dev && \
     sudo apt-get clean

.github/workflows/coverage.yml

@@ -19,15 +19,21 @@ jobs:
       - name: Install conan and lcov
         run: |
           sudo apt-get install -yq --no-install-recommends lcov
-          sudo pip install conan==1.62.0 coverage
+          sudo pip install -U conan coverage
       - name: Setup Conan Profile
         run: |
-          conan profile new default --detect
-          conan profile update settings.build_type=Debug default
-          #Note no backwards compatiblity for gcc5 needed, setting libcxx to c++11.
-          conan profile update settings.compiler.libcxx=libstdc++11 default
-          echo "[tool_requires]" >> `conan config home`/profiles/default
-          echo "cmake/3.26.4" >> `conan config home`/profiles/default
+          # build profile
+          conan profile detect -f --name release
+          sed -i 's/compiler.cppstd=gnu14/compiler.cppstd=gnu17/g' `conan profile path release`
+          echo "[tool_requires]" >> `conan profile path release`
+          echo "cmake/3.26.4" >> `conan profile path release`
+
+          # host profile
+          conan profile detect -f 
+          sed -i 's/build_type=Release/build_type=Debug/g' `conan profile path default`
+          sed -i 's/compiler.cppstd=gnu14/compiler.cppstd=gnu17/g' `conan profile path default`
+          echo "[tool_requires]" >> `conan profile path default`
+          echo "cmake/3.26.4" >> `conan profile path default`
       - name: Conan Cache
         id: cache-conan
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf #v4.2.2
@@ -48,19 +54,16 @@ jobs:
           key: ${{ runner.os }}-gcov-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }}
           restore-keys: |
             ${{ runner.os }}-gcov-ccache-
-      - name: Install Dependencies
+      - name: Install Dependencies and Build
         env:
           CONAN_BUILD_OPTIONS: |
-            -o celix:enable_testing=True
-            -o celix:build_all=True
-            -o celix:enable_code_coverage=True
-            -o celix:enable_testing_on_ci=True
-            -o celix:enable_ccache=True
+            -o celix/*:enable_testing=True
+            -o celix/*:build_all=True
+            -o celix/*:enable_code_coverage=True
+            -o celix/*:enable_testing_on_ci=True
+            -o celix/*:enable_ccache=True
         run: |
-          conan install . celix/ci -pr:b default -pr:h default -if build ${CONAN_BUILD_OPTIONS} -b missing --require-override=openssl/1.1.1s
-      - name: Build
-        run: |
-          conan build . -bf build
+          conan build .  -pr:b release -pr:h default -of build ${CONAN_BUILD_OPTIONS} -b missing
       - name: Test with coverage
         run: |
           cd build

.github/workflows/macos.yml

@@ -80,7 +80,7 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
       - name: Install dependencies
         run: |
-          brew install lcov jansson rapidjson libzip ccache ninja openssl@1.1 google-benchmark
+          brew install lcov jansson rapidjson libzip ccache ninja openssl@1.1 google-benchmark libuv
       - name: Prepare ccache timestamp
         id: ccache_cache_timestamp
         run: |

.github/workflows/ubuntu.yml

@@ -28,29 +28,25 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
       - name: Install build dependencies
         run: |
-          sudo pip install -U conan==1.62.0
+          sudo pip install -U conan
           sudo apt-get install -yq --no-install-recommends ninja-build
       - name: Setup Conan Profile
         env:
           CC: ${{ matrix.compiler[0] }}
           CXX: ${{ matrix.compiler[1] }}
         run: |
           # build profile
-          conan profile new release --detect
-          conan profile update settings.build_type=Release release
-          #Note no backwards compatibility for gcc5 needed, setting libcxx to c++11.
-          conan profile update settings.compiler.libcxx=libstdc++11 release
-          conan profile show release
-          echo "[tool_requires]" >> `conan config home`/profiles/release
-          echo "cmake/3.26.4" >> `conan config home`/profiles/release
+          conan profile detect -f --name release
+          sed -i 's/compiler.cppstd=gnu14/compiler.cppstd=gnu17/g' `conan profile path release`
+          echo "[tool_requires]" >> `conan profile path release`
+          echo "cmake/3.26.4" >> `conan profile path release`
+
           # host profile
-          conan profile new default --detect
-          conan profile update settings.build_type=${{ matrix.type }} default
-          #Note no backwards compatibility for gcc5 needed, setting libcxx to c++11.
-          conan profile update settings.compiler.libcxx=libstdc++11 default
-          conan profile show default
-          echo "[tool_requires]" >> `conan config home`/profiles/default
-          echo "cmake/3.26.4" >> `conan config home`/profiles/default
+          conan profile detect -f 
+          sed -i 's/build_type=Release/build_type=${{ matrix.type }}/g' `conan profile path default`
+          sed -i 's/compiler.cppstd=gnu14/compiler.cppstd=gnu17/g' `conan profile path default`
+          echo "[tool_requires]" >> `conan profile path default`
+          echo "cmake/3.26.4" >> `conan profile path default`
       - name: Conan Cache
         id: cache-conan
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf #v4.2.2
@@ -71,29 +67,22 @@ jobs:
           key: ${{ runner.os }}-test-ccache-${{ matrix.compiler[0] }}-${{ matrix.type }}-${{ steps.ccache_cache_timestamp.outputs.timestamp }}
           restore-keys: |
             ${{ runner.os }}-test-ccache-${{ matrix.compiler[0] }}-${{ matrix.type }}-
-      - name: Configure and install dependencies
+      - name: Install Dependencies and Build
         env:
           CC: ${{ matrix.compiler[0] }}
           CXX: ${{ matrix.compiler[1] }}
           CONAN_BUILD_OPTIONS: |
-            -o celix:enable_testing=True
-            -o celix:enable_benchmarking=True
-            -o celix:enable_address_sanitizer=True
-            -o celix:enable_undefined_sanitizer=True
-            -o celix:build_all=True
-            -o celix:enable_cmake_warning_tests=True
-            -o celix:enable_testing_on_ci=True
-            -o celix:framework_curlinit=False
-            -o celix:enable_ccache=True
+            -o celix/*:enable_testing=True
+            -o celix/*:enable_benchmarking=True
+            -o celix/*:enable_address_sanitizer=True
+            -o celix/*:enable_undefined_sanitizer=True
+            -o celix/*:build_all=True
+            -o celix/*:enable_cmake_warning_tests=True
+            -o celix/*:enable_testing_on_ci=True
+            -o celix/*:framework_curlinit=False
+            -o celix/*:enable_ccache=True
         run: |
-          conan install . celix/ci -c tools.cmake.cmaketoolchain:generator=Ninja -pr:b release -pr:h default -if build ${CONAN_BUILD_OPTIONS} -b missing
-      - name: Build
-        env:
-          CC: ${{ matrix.compiler[0] }}
-          CXX: ${{ matrix.compiler[1] }}
-          CONAN_CMAKE_GENERATOR: Ninja
-        run: |
-          conan build . -bf build
+          conan build .  -c tools.cmake.cmaketoolchain:generator=Ninja -pr:b release -pr:h default -of build ${CONAN_BUILD_OPTIONS} -b missing
       - name: Test
         run: |
           cd build
@@ -123,6 +112,7 @@ jobs:
           libjansson-dev \
           libcurl4-openssl-dev \
           libbenchmark-dev \
+          libuv1-dev \
           default-jdk \
           cmake \
           libffi-dev \

cmake/CelixConfig.cmake

@@ -35,16 +35,16 @@ include(CMakeFindDependencyMacro)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_dependency(Threads)
 
+# The rest is added to ensure backwards compatibility with project using the cmake lib/include var instead of targets.
+set(CELIX_CMAKE_MODULES_DIR ${CELIX_REL_INSTALL_DIR}/share/celix/cmake/Modules)
+
 #adds celix optional dependencies
 include("${CELIX_REL_INSTALL_DIR}/share/celix/cmake/CelixDeps.cmake")
 
 #imports lib and exe targets (e.g. Celix::framework)
 include("${CELIX_REL_INSTALL_DIR}/share/celix/cmake/Targets.cmake")
 include("${CELIX_REL_INSTALL_DIR}/share/celix/cmake/CelixTargets.cmake")
 
-# The rest is added to ensure backwards compatiblity with project using the cmake lib/include var instead of targets.
-set(CELIX_CMAKE_MODULES_DIR ${CELIX_REL_INSTALL_DIR}/share/celix/cmake/Modules)
-
 set(CELIX_FRAMEWORK_INCLUDE_DIR "${CELIX_REL_INSTALL_DIR}/include/celix")
 set(CELIX_UTILS_INCLUDE_DIR "${CELIX_REL_INSTALL_DIR}/include/utils")
 set(CELIX_DFI_INCLUDE_DIR "${CELIX_REL_INSTALL_DIR}/include/dfi")
@@ -69,16 +69,6 @@ if (TARGET Celix::etcdlib)
   set(CELIX_ETCD_LIB Celix::etcdlib)
 endif ()
 
-if (TARGET Celix::dependency_manager_so)
-  set(CELIX_DM_LIB Celix::dependency_manager_so)
-  set(CELIX_DM_INCLUDE_DIR $<TARGET_PROPERTY:Celix::dependency_manager_so,INTERFACE_INCLUDE_DIRECTORIES>)
-  set(CELIX_DM_STATIC_LIB Celix::dependency_manager_static)
-endif ()
-if (TARGET Celix::dependency_manager_cxx)
-  set(CELIX_DM_STATIC_CXX_LIB Celix::dependency_manager_cxx)
-  set(CELIX_DM_CXX_STATIC_LIB $<TARGET_PROPERTY:Celix::dependency_manager_cxx,INTERFACE_INCLUDE_DIRECTORIES>)
-endif ()
-
 set(CELIX_BUNDLES_DIR ${CELIX_REL_INSTALL_DIR}/share/celix/bundles)
 set(CELIX_SHELL_BUNDLE ${CELIX_BUNDLES_DIR}/shell.zip)
 set(CELIX_SHELL_TUI_BUNDLE ${CELIX_BUNDLES_DIR}/shell_tui.zip)

cmake/CelixDeps.cmake.in

@@ -2,6 +2,8 @@ $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::framework>>:find_dependency(libuuid)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::deployment_admin>>:find_dependency(libuuid)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::pubsub_spi>>:find_dependency(libuuid)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::utils>>:find_dependency(libzip)>
+$<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::utils>>:find_dependency(jansson)>
+$<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::utils>>:find_dependency(libuv)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::deployment_admin>>:find_dependency(ZLIB)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::dfi>>:find_dependency(libffi)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::dfi>>:find_dependency(jansson)>

cmake/Modules/Findlibuv.cmake

@@ -0,0 +1,61 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# - Try to find libuv
+# 	Once done this will define
+#  libuv_FOUND - System has libuv
+#  LIBUV_INCLUDE_DIR - The libuv include directory
+#  LIBUV_LIBRARY - The libuv library
+#  uv - Imported target for libuv
+
+find_package(libuv CONFIG QUIET)
+
+if (NOT libuv_FOUND)
+    find_package(PkgConfig QUIET)
+    if (PkgConfig_FOUND)
+        pkg_check_modules(LIBUV QUIET libuv)
+    endif ()
+endif ()
+
+if (NOT libuv_FOUND)
+    find_path(LIBUV_INCLUDE_DIR
+        NAMES uv.h
+        HINTS ${LIBUV_INCLUDEDIR} ${LIBUV_INCLUDE_DIRS}
+    )
+
+    find_library(LIBUV_LIBRARY
+        NAMES uv libuv
+        HINTS ${LIBUV_LIBDIR} ${LIBUV_LIBRARY_DIRS}
+    )
+
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(libuv DEFAULT_MSG LIBUV_LIBRARY LIBUV_INCLUDE_DIR)
+    mark_as_advanced(LIBUV_INCLUDE_DIR LIBUV_LIBRARY)
+endif ()
+
+if (libuv_FOUND AND NOT TARGET libuv::uv AND TARGET libuv::libuv)
+    #Note: libuv cmake config possible defines libuv::libuv target
+    #      and conan libuv package defines uv target
+    #      so create an alias target uv for consistency
+    add_library(libuv::uv ALIAS libuv::libuv)
+elseif (libuv_FOUND AND NOT TARGET libuv::uv AND LIBUV_LIBRARY AND LIBUV_INCLUDE_DIR)
+    add_library(libuv::uv SHARED IMPORTED)
+    set_target_properties(libuv::uv PROPERTIES
+        IMPORTED_LOCATION "${LIBUV_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${LIBUV_INCLUDE_DIR}"
+    )
+endif ()

conanfile.py

@@ -309,6 +309,7 @@ def configure(self):
         # https://github.com/conan-io/conan/issues/14528#issuecomment-1685344080
         if self.options.build_utils:
             self.options['libzip'].shared = True
+            self.options['libuv'].shared = True
         if self.options.build_framework:
             self.options['util-linux-libuuid'].shared = True
         if ((self.options.build_framework and self.options.framework_curlinit)
@@ -340,6 +341,7 @@ def configure(self):
     def requirements(self):
         if self.options.build_utils:
             self.requires("libzip/[>=1.7.3 <2.0.0]")
+            self.requires("libuv/[>=1.49.2 <2.0.0]")
         if self.options.build_framework:
             self.requires("util-linux-libuuid/[>=2.39 <3.0.0]")
             if self.settings.os == "Macos":

libs/utils/CMakeLists.txt

@@ -18,7 +18,8 @@
 celix_subproject(UTILS "Option to enable building the Utilities library" ON)
 if (UTILS)
     find_package(libzip REQUIRED)
-    find_package(jansson REQUIRED) #TODO add jansson dep info to build (conan) and documentation info
+    find_package(jansson REQUIRED)
+    find_package(libuv REQUIRED)
 
     set(MEMSTREAM_SOURCES )
     set(MEMSTREAM_INCLUDES )
@@ -46,7 +47,7 @@ if (UTILS)
             ${MEMSTREAM_SOURCES}
             )
     set(UTILS_PRIVATE_DEPS libzip::zip jansson::jansson)
-    set(UTILS_PUBLIC_DEPS)
+    set(UTILS_PUBLIC_DEPS libuv::uv)
 
     add_library(utils SHARED ${UTILS_SRC})
 

libs/utils/gtest/CMakeLists.txt

@@ -35,14 +35,15 @@ add_executable(test_utils
         src/VersionTestSuite.cc
         src/ErrTestSuite.cc
         src/ThreadsTestSuite.cc
+        src/UvThreadsTestSuite.cc
         src/CelixErrnoTestSuite.cc
         src/CelixUtilsAutoCleanupTestSuite.cc
         src/ArrayListTestSuite.cc
         src/DeprecatedHashmapTestSuite.cc
         src/CxxExceptionsTestSuite.cc
 )
 
-target_link_libraries(test_utils PRIVATE utils_cut Celix::utils GTest::gtest GTest::gtest_main libzip::zip)
+target_link_libraries(test_utils PRIVATE utils_cut Celix::utils GTest::gtest GTest::gtest_main libzip::zip libuv::uv)
 target_include_directories(test_utils PRIVATE ../src) #for version_private (needs refactoring of test)
 celix_deprecated_utils_headers(test_utils)