Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to cpp20 and update deps #339

Merged
merged 7 commits into from
Dec 25, 2023
Merged

Update to cpp20 and update deps #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
74700c5
update to cpp20 and deps
andiwand Dec 25, 2023
8f44ced
update more deps version
andiwand Dec 25, 2023
2a9cafe
try again
andiwand Dec 25, 2023
875864c
pin compiler version
andiwand Dec 25, 2023
7406371
fix
andiwand Dec 25, 2023
be4b115
Merge branch 'main' of github.com:opendocument-app/OpenDocument.core …
andiwand Dec 25, 2023
60d4ef0
Update conanfile.py
andiwand Dec 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions .github/workflows/build_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@ jobs:
fail-fast: false
matrix:
config:
- { os: ubuntu-22.04, cc: clang, cxx: clang++ }
- { os: ubuntu-22.04, cc: gcc, cxx: g++ }
- { os: macos-12, cc: clang, cxx: clang++ }
- { os: windows-2022 }
- { os: ubuntu-20.04, cc: clang, cxx: clang++ } # TODO remove; but there is no firefox in 22.04 yet
- { os: ubuntu-22.04, compiler: clang, cc: clang-15, cxx: clang++-15 }
- { os: ubuntu-22.04, compiler: gcc, cc: gcc-13, cxx: g++-13 }
- { os: macos-12, compiler: clang, cc: clang, cxx: clang++ }
- { os: windows-2022, compiler: msvc }

steps:
- name: ubuntu install ccache
Expand Down Expand Up @@ -56,9 +55,9 @@ jobs:
~/.conan/data
C:/.conan
C:/Users/runneradmin/.conan/data
key: ${{ matrix.config.os }}-${{ matrix.config.cxx }}-${{ env.CCACHE_KEY_SUFFIX }}
key: ${{ matrix.config.os }}-${{ matrix.config.compiler }}-${{ env.CCACHE_KEY_SUFFIX }}
restore-keys: |
${{ matrix.config.os }}-${{ matrix.config.cxx }}-
${{ matrix.config.os }}-${{ matrix.config.compiler }}-

- name: checkout
uses: actions/checkout@v2
Expand All @@ -74,7 +73,7 @@ jobs:
- name: upload binaries
uses: actions/upload-artifact@v2
with:
name: bin-${{ matrix.config.os }}-${{ matrix.config.cxx }}
name: bin-${{ matrix.config.os }}-${{ matrix.config.compiler }}
path: |
build/test/odr_test

Expand All @@ -85,8 +84,8 @@ jobs:
fail-fast: true
matrix:
config:
- { os: ubuntu-20.04, bin: bin-ubuntu-20.04-clang++ }
- { os: macos-12, bin: bin-macos-12-clang++ }
- { os: ubuntu-22.04, bin: bin-ubuntu-22.04-clang }
- { os: macos-12, bin: bin-macos-12-clang }

steps:
- name: ubuntu install tidy
Expand Down
3 changes: 1 addition & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.12.4)

project(odr LANGUAGES C CXX)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

Expand Down Expand Up @@ -39,7 +39,6 @@ if (NOT DEFINED CONAN_EXPORTED)
conan_cmake_install(PATH_OR_REFERENCE ".."
BUILD missing
SETTINGS ${settings}
SETTINGS compiler.cppstd=${CMAKE_CXX_STANDARD}
ENV CC=${CMAKE_C_COMPILER}
ENV CXX=${CMAKE_CXX_COMPILER})
#include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
Expand Down
4 changes: 2 additions & 2 deletions conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ class OpenDocumentCoreConan(ConanFile):

exports_sources = ["cli/*", "cmake/*", "src/*", "CMakeLists.txt"]

requires = ["pugixml/1.11", "cryptopp/8.5.0", "miniz/2.1.0", "nlohmann_json/3.10.4",
requires = ["pugixml/1.14", "cryptopp/8.8.0", "miniz/2.1.0", "nlohmann_json/3.11.3",
"vincentlaucsb-csv-parser/2.1.3", "uchardet/0.0.7"]
build_requires = ["gtest/1.11.0"]
build_requires = ["gtest/1.14.0"]
generators = "cmake_paths", "cmake_find_package"

_cmake = None
Expand Down
2 changes: 2 additions & 0 deletions src/odr/internal/crypto/crypto_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include <odr/internal/crypto/crypto_util.hpp>

#include <cstdint>

#include <cryptopp/aes.h>
#include <cryptopp/base64.h>
#include <cryptopp/blowfish.h>
Expand Down
Loading