merge develop

dice-group · Jan 24, 2025 · b5fbf02 · b5fbf02
2 parents 9864210 + 446518d
commit b5fbf02
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/code_testing.yml b/.github/workflows/code_testing.yml
@@ -51,7 +51,7 @@ jobs:
 
       - name: Cache conan data
         id: cache-conan
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4
         with:
           path: ~/.conan2/p
           key: ${{ matrix.config.os }}-${{ matrix.config.compiler }}
@@ -62,7 +62,7 @@ jobs:
         uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/add_conan_provider@main
 
       - name: Configure CMake
-        run: cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=On -DWITH_SODIUM=On -DBUILD_EXAMPLES=On -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=conan_provider.cmake -G Ninja -B build .
+        run: cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=On -DWITH_SODIUM=On -DBUILD_EXAMPLES=On -DCMAKE_COMPILE_WARNING_AS_ERROR=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 }}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.24)
 
 project(
         dice-hash
-        VERSION 0.4.9
+        VERSION 0.4.10
         DESCRIPTION "dice-hash provides a framework to generate stable hashes. It provides state-of-the-art hash functions, supports STL containers out of the box and helps you to defines stable hashes for your own structs and classes."
         HOMEPAGE_URL "https://dice-group.github.io/dice-hash/")
 set(POBR_VERSION 1)  # Persisted Object Binary Representation Version

diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ To use it with [conan](https://conan.io/) you need to add the repository:
 conan remote add dice-group https://conan.dice-research.org/artifactory/api/conan/tentris
 ```
 
-To use it add `dice-hash/0.4.9` to the `[requires]` section of your conan file.
+To use it add `dice-hash/0.4.10` to the `[requires]` section of your conan file.
 
 You can now add it to your target with:
 ```cmake

diff --git a/conanfile.py b/conanfile.py
@@ -7,7 +7,7 @@
 
 
 class DiceHashConan(ConanFile):
-    license = "AGPL"
+    license = "MIT", "Apache-2.0"
     author = "DICE Group <[email protected]>"
     homepage = "https://github.com/dice-group/dice-hash"
     url = homepage