upgrade to conan 2 (#44)

Author: mcb5637

.github/workflows/code_testing.yml

@@ -36,9 +36,9 @@ jobs:
           sudo apt-get update -y
 
       - name: Install CMake
-        uses: lukka/get-cmake@v3.24.3
+        uses: lukka/get-cmake@v3.29.3
         with:
-          cmakeVersion: 3.16.9
+          cmakeVersion: 3.24
 
       - name: Install compiler
         id: install_cc
@@ -49,10 +49,43 @@ jobs:
       - name: Install linker
         uses: rui314/setup-mold@v1
 
-      - uses: actions/checkout@v3
+      - name: Configure conan
+        run: |
+          pip3 install conan==2.3.0
+          
+          # conan profile update is deprecated (https://github.com/conan-io/conan/issues/13205)
+          # and they don't want you to use detect because it is unstable
+          
+          conan profile detect  # Force creation of conan directory structure, will be overwritten
+          
+          echo '{% set compiler, version, c_exe = detect_api.detect_default_compiler() %}'      > ~/.conan2/profiles/default
+          echo '[settings]'                                                                    >> ~/.conan2/profiles/default
+          echo 'os={{ detect_api.detect_os() }}'                                               >> ~/.conan2/profiles/default
+          echo 'arch={{ detect_api.detect_arch() }}'                                           >> ~/.conan2/profiles/default
+          echo 'build_type=Release'                                                            >> ~/.conan2/profiles/default
+          echo 'compiler={{ compiler }}'                                                       >> ~/.conan2/profiles/default
+          echo 'compiler.version={{ detect_api.default_compiler_version(compiler, version) }}' >> ~/.conan2/profiles/default
+          echo 'compiler.libcxx=libstdc++11'                                                   >> ~/.conan2/profiles/default
+          
+          conan remote add -f dice-group https://conan.dice-research.org/artifactory/api/conan/tentris
+
+      - name: Cache conan data
+        id: cache-conan
+        uses: actions/[email protected]
+        with:
+          path: ~/.conan2/p
+          key: ${{ matrix.config.os }}-${{ matrix.config.compiler }}
+
+      - uses: actions/[email protected]
+
+      - name: Get dependency provider
+        run: |
+          sudo apt-get install -y wget
+          
+          wget https://github.com/conan-io/cmake-conan/raw/develop2/conan_provider.cmake -O conan_provider.cmake
 
       - name: Configure CMake
-        run: cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=On -DBUILD_EXAMPLES=On -G Ninja -B build .
+        run: cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=On -DBUILD_EXAMPLES=On -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=conan_provider.cmake -G Ninja -B build .
         env:
           CC: ${{ steps.install_cc.outputs.cc }}
           CXX: ${{ steps.install_cc.outputs.cxx }}

.github/workflows/documentation.yml

@@ -16,13 +16,13 @@ jobs:
       - uses: actions/checkout@v3
       # https://github.com/marketplace/actions/doxygen-action
       - name: generate docu
-        uses: mattnotmitt/doxygen-action@v1
+        uses: mattnotmitt/doxygen-action@v1.9.8
         with:
           working-directory: '.'
           doxyfile-path: 'Doxyfile'
 
       - name: upload to github page branch
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./docu

.github/workflows/publish-conan-branch-package.yml

@@ -13,8 +13,8 @@ jobs:
       public_artifactory: true
       os: ubuntu-22.04
       compiler: clang-15
-      cmake-version: 3.22.6
-      conan-version: 2.0.13
+      cmake-version: 3.24.0
+      conan-version: 2.3.0
     secrets:
       CONAN_USER: ${{ secrets.CONAN_USER }}
       CONAN_PW: ${{ secrets.CONAN_PW }}

.github/workflows/publish-release.yml

@@ -18,7 +18,7 @@ jobs:
       public_artifactory: true
       os: ubuntu-22.04
       compiler: clang-14
-      cmake-version: 3.22.6
+      cmake-version: 3.24.0
       conan-version: 2.0.13
     secrets:
       CONAN_USER: ${{ secrets.CONAN_USER }}

.gitignore

@@ -162,3 +162,4 @@ modules.xml
 /docu/
 
 test_package/build
+conan_provider.cmake

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.22)
+cmake_minimum_required(VERSION 3.24)
 
 project(
         dice-hash

README.md

@@ -23,18 +23,13 @@ A C++20 compatible compiler. Code was only tested on x86_64.
 
 ### CMake
 
-add 
-```cmake
-FetchContent_Declare(
-        dice-hash
-        GIT_REPOSITORY https://github.com/dice-group/dice-hash.git
-        GIT_TAG 0.4.4
-        GIT_SHALLOW TRUE)
-
-FetchContent_MakeAvailable(dice-hash)
+### conan
+To use it with [conan](https://conan.io/) you need to add the repository:
+```shell
+conan remote add dice-group https://conan.dice-research.org/artifactory/api/conan/tentris
 ```
 
-to your CMakeLists.txt
+To use it add `dice-hash/0.4.4` to the `[requires]` section of your conan file.
 
 You can now add it to your target with:
 ```cmake
@@ -43,27 +38,22 @@ target_link_libraries(your_target
         )
 ```
 
-### conan
-To use it with [conan](https://conan.io/) you need to add the repository:
-```shell
-conan remote add dice-group https://conan.dice-research.org/artifactory/api/conan/tentris
-```
-
-To use it add `dice-hash/0.4.4` to the `[requires]` section of your conan file.
-
 ## build and run tests
 
 ```shell
 #get it 
 git clone https://github.com/dice-group/dice-hash.git
 cd dice-hash
 #build it
+wget https://github.com/conan-io/cmake-conan/raw/develop2/conan_provider.cmake -O conan_provider.cmake
 mkdir build
 cd build
-cmake -DBUILD_TESTING -DCMAKE_BUILD_TYPE=Release ..
+cmake -DBUILD_TESTING -DCMAKE_BUILD_TYPE=Release ..  -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=conan_provider.cmake
 make -j tests_dice_hash
 ./test/tests_dice_hash
 ```
+Note: This example uses conan as dependency provider, other providers are possible.
+See https://cmake.org/cmake/help/latest/guide/using-dependencies/index.html#dependency-providers
 
 ## usage
 You need to include a single header:

conanfile.py

@@ -33,9 +33,23 @@ def set_version(self):
             cmake_file = load(self, os.path.join(self.recipe_folder, "CMakeLists.txt"))
             self.description = re.search(r"project\([^)]*DESCRIPTION\s+\"([^\"]+)\"[^)]*\)", cmake_file).group(1)
 
+    def requirements(self):
+        self.test_requires("catch2/2.13.9")
+
+    def layout(self):
+        cmake_layout(self)
+
+    def build(self):
+        if not self.conf.get("tools.build:skip_test", default=False):
+            cmake = CMake(self)
+            cmake.configure()
+            cmake.build()
+
+    def package_id(self):
+        self.info.clear()
+
     def package(self):
         cmake = CMake(self)
-        cmake.configure()
         cmake.install()
 
         for dir in ("lib", "res", "share"):

tests/CMakeLists.txt

@@ -2,14 +2,7 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-include(FetchContent)
-FetchContent_Declare(
-        Catch2
-        GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-        GIT_TAG v2.13.9
-        GIT_SHALLOW TRUE)
-
-FetchContent_MakeAvailable(Catch2)
+find_package(Catch2 REQUIRED)
 
 add_executable(tests_dice_hash TestDiceHash.cpp)
 target_link_libraries(tests_dice_hash PRIVATE