chore: update project to require C++20 standard

EndstoneMC · Jan 1, 2025 · 8556841 · 8556841
1 parent 2a421c8
commit 8556841
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -67,9 +67,9 @@ jobs:
       - name: Build with Conan (Linux)
         if: runner.os == 'Linux'
         run: |
-          conan create . --build=missing -s compiler.cppstd=17 -s build_type=${{ matrix.build_type }} -c tools.cmake.cmaketoolchain:generator=Ninja -s compiler.libcxx=libc++
+          conan create . --build=missing -s compiler.cppstd=20 -s build_type=${{ matrix.build_type }} -c tools.cmake.cmaketoolchain:generator=Ninja -s compiler.libcxx=libc++
 
       - name: Build with Conan (Windows)
         if: runner.os == 'Windows'
         run: |
-          conan create . --build=missing -s compiler.cppstd=17 -s build_type=${{ matrix.build_type }} -c tools.cmake.cmaketoolchain:generator=Ninja
+          conan create . --build=missing -s compiler.cppstd=20 -s build_type=${{ matrix.build_type }} -c tools.cmake.cmaketoolchain:generator=Ninja
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -49,7 +49,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install conan
           conan profile detect --force
-          conan install . --build=missing -s compiler.cppstd=17 -s compiler.libcxx=libc++ -s build_type=Debug -c tools.cmake.cmaketoolchain:generator=Ninja
+          conan install . --build=missing -s compiler.cppstd=20 -s compiler.libcxx=libc++ -s build_type=Debug -c tools.cmake.cmaketoolchain:generator=Ninja
 
       - name: Build with CMake
         run: |

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -40,18 +40,18 @@ First of all, run the following commands to install dependencies of this project
 
 === ":fontawesome-brands-windows: Command Prompt"
     ```shell
-    conan install . --build=missing -s compiler.cppstd=17 -s build_type=RelWithDebInfo -c tools.cmake.cmaketoolchain:generator=Ninja
+    conan install . --build=missing -s compiler.cppstd=20 -s build_type=RelWithDebInfo -c tools.cmake.cmaketoolchain:generator=Ninja
     ```
 
 === ":fontawesome-brands-windows: Powershell"
     ```shell
-    conan install . --build=missing -s compiler.cppstd=17 -s build_type=RelWithDebInfo -c tools.cmake.cmaketoolchain:generator=Ninja -c tools.env.virtualenv:powershell=True
+    conan install . --build=missing -s compiler.cppstd=20 -s build_type=RelWithDebInfo -c tools.cmake.cmaketoolchain:generator=Ninja -c tools.env.virtualenv:powershell=True
     ```
 
 === ":fontawesome-brands-linux: Linux"
 
     ```shell
-    conan install . --build=missing -s compiler.cppstd=17 -s compiler.libcxx=libc++ -s build_type=RelWithDebInfo -c tools.cmake.cmaketoolchain:generator=Ninja
+    conan install . --build=missing -s compiler.cppstd=20 -s compiler.libcxx=libc++ -s build_type=RelWithDebInfo -c tools.cmake.cmaketoolchain:generator=Ninja
     ```
 
 Now, activate the build virtual environment create by conan.

diff --git a/conanfile.py b/conanfile.py
@@ -69,7 +69,7 @@ def set_version(self):
 
     @property
     def _min_cppstd(self):
-        return 17
+        return 20
 
     @property
     def _min_msvc_compiler_version(self):
@@ -80,8 +80,8 @@ def _min_msvc_compiler_version(self):
     @property
     def _min_clang_compiler_version(self):
         # NOTE: the latest bedrock server for Linux is compiled with Clang 15.0.7,
-        # but it should be ABI compatible with Clang 5
-        return 5
+        # but it should be ABI compatible with Clang 10
+        return 10
 
     @property
     def _devtools_enabled(self):

diff --git a/pyproject.toml b/pyproject.toml
@@ -72,11 +72,11 @@ config = ["tools.cmake.cmaketoolchain:generator=Ninja"]
 
 [[tool.scikit-build-core-conan.overrides]]
 if.platform-system = "win32"
-settings = ["compiler.cppstd=17"]
+settings = ["compiler.cppstd=20"]
 
 [[tool.scikit-build-core-conan.overrides]]
 if.platform-system = "linux"
-settings = ["compiler.cppstd=gnu17", "compiler.libcxx=libc++"]
+settings = ["compiler.cppstd=20", "compiler.libcxx=libc++"]
 
 [tool.setuptools_scm]
 write_to = "python/src/endstone/_internal/version.py"