Merge pull request #20 from 7bitcoder/dev

Add version 3.0.0

Author: 7bitcoder

.github/workflows/DevCI.yml

@@ -27,13 +27,13 @@ jobs:
         run: cmake -E make_directory ${{runner.workspace}}/build
 
       - name: Configure
-        run: cmake -B ${{runner.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_STANDARD=${{matrix.std}} -D_7BIT_DI_LIBRARY_TYPE=${{matrix.library_type}} -D_7BIT_DI_BUILD_TESTS=ON -D_7BIT_DI_BUILD_EXAMPLES=ON
+        run: cmake -B ${{runner.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_STANDARD=${{matrix.std}} -D_7BIT_DI_LIBRARY_TYPE=${{matrix.library_type}} -D_7BIT_DI_BUILD_ALL_TESTS=ON -D_7BIT_DI_BUILD_EXAMPLES=ON
 
       - name: Build
         run: cmake --build ${{runner.workspace}}/build --config ${{matrix.build_type}} -j
 
       - name: Test
-        working-directory: ${{runner.workspace}}/build/Tests
+        working-directory: ${{runner.workspace}}/build
         run: ctest -C ${{matrix.build_type}}
         env:
           CTEST_OUTPUT_ON_FAILURE: True

.github/workflows/Linux.yml

@@ -73,13 +73,13 @@ jobs:
         env:
           CXX: ${{matrix.cxx}}-${{matrix.compiler.ver}}
           CC: ${{matrix.cc}}-${{matrix.compiler.ver}}
-        run: cmake -B ${{runner.workspace}}/build -G "${{matrix.generator}}" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_STANDARD=${{matrix.std}} -D_7BIT_DI_LIBRARY_TYPE=${{matrix.library_type}} -D_7BIT_DI_BUILD_TESTS=ON
+        run: cmake -B ${{runner.workspace}}/build -G "${{matrix.generator}}" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_STANDARD=${{matrix.std}} -D_7BIT_DI_LIBRARY_TYPE=${{matrix.library_type}} -D_7BIT_DI_BUILD_ALL_TESTS=ON
 
       - name: Build
         run: cmake --build ${{runner.workspace}}/build --config ${{matrix.build_type}} -j
 
       - name: Test
-        working-directory: ${{runner.workspace}}/build/Tests
+        working-directory: ${{runner.workspace}}/build
         run: ctest -C ${{matrix.build_type}}
         env:
           CTEST_OUTPUT_ON_FAILURE: True

.github/workflows/MacOs.yml

@@ -15,13 +15,12 @@ jobs:
       matrix:
         compiler: [
           { tool: apple-clang },
-          { tool: gcc, ver: 9 },
           { tool: gcc, ver: 10 },
           { tool: gcc, ver: 11 },
           { tool: gcc, ver: 12 },
           { tool: gcc, ver: 13 } ]
         build_type: [ Release ]
-        os: [ macos-12, macos-13 ]
+        os: [ macos-12 ]
         std: [ 17 ]
         library_type: [ Static ]
         include:
@@ -31,8 +30,6 @@ jobs:
           - compiler: { tool: apple-clang }
             cxx: ''
             cc: ''
-        exclude:
-          - { os: macos-12, compiler: { tool: gcc, ver: 9 } }
 
     runs-on: ${{matrix.os}}
     steps:
@@ -48,13 +45,13 @@ jobs:
           echo "CC=${{matrix.cc}}-${{matrix.compiler.ver}}" >> $GITHUB_ENV
 
       - name: Configure
-        run: cmake -B ${{runner.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_STANDARD=${{matrix.std}} -D_7BIT_DI_LIBRARY_TYPE=${{matrix.library_type}} -D_7BIT_DI_BUILD_TESTS=ON
+        run: cmake -B ${{runner.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_STANDARD=${{matrix.std}} -D_7BIT_DI_LIBRARY_TYPE=${{matrix.library_type}} -D_7BIT_DI_BUILD_ALL_TESTS=ON
 
       - name: Build
         run: cmake --build ${{runner.workspace}}/build --config ${{matrix.build_type}} -j
 
       - name: Test
-        working-directory: ${{runner.workspace}}/build/Tests
+        working-directory: ${{runner.workspace}}/build
         run: ctest -C ${{matrix.build_type}}
         env:
           CTEST_OUTPUT_ON_FAILURE: True

.github/workflows/Windows.yml

@@ -32,7 +32,8 @@ jobs:
           { tool: LLVM, ver: 14.0.6 },
           { tool: LLVM, ver: 15.0.7 },
           { tool: LLVM, ver: 16.0.6 },
-          { tool: LLVM, ver: 17.0.6 } ]
+          { tool: LLVM, ver: 17.0.6 },
+          { tool: LLVM, ver: 18.1.2 } ]
         build_type: [ Release ]
         os: [ windows-2019 ]
         std: [ 17 ]
@@ -70,13 +71,13 @@ jobs:
           CXX: ${{matrix.cxx}}
           CC: ${{matrix.cc}}
           PARAMETERS: ${{ matrix.compiler.tool == 'msvc' && format('-A x64 -T v{0}', matrix.compiler.ver) || format('-G "{0}"', matrix.generator) }}
-        run: cmake -B ${{runner.workspace}}/build ${{env.PARAMETERS}} -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_STANDARD=${{matrix.std}} -D_7BIT_DI_LIBRARY_TYPE=${{matrix.library_type}} -D_7BIT_DI_BUILD_TESTS=ON
+        run: cmake -B ${{runner.workspace}}/build ${{env.PARAMETERS}} -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_STANDARD=${{matrix.std}} -D_7BIT_DI_LIBRARY_TYPE=${{matrix.library_type}} -D_7BIT_DI_BUILD_ALL_TESTS=ON
 
       - name: Build
         run: cmake --build ${{runner.workspace}}/build --config ${{matrix.build_type}} -j
 
       - name: Test
-        working-directory: ${{runner.workspace}}/build/Tests
+        working-directory: ${{runner.workspace}}/build
         run: ctest -C ${{matrix.build_type}}
         env:
           CTEST_OUTPUT_ON_FAILURE: True

Benchmarks/CMakeLists.txt

@@ -1,24 +1,23 @@
 include(FetchContent)
 FetchContent_Declare(
-    benchmark
-    GIT_REPOSITORY https://github.com/google/benchmark.git
-    GIT_TAG 344117638c8ff7e239044fd0fa7085839fc03021 # release-1.14.0
+        benchmark
+        GIT_REPOSITORY https://github.com/google/benchmark.git
+        GIT_TAG v1.8.3
 )
+set(BENCHMARK_ENABLE_GTEST_TESTS OFF)
 FetchContent_MakeAvailable(benchmark)
 
-enable_testing()
-
 file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS *.cpp)
 
-foreach(SOURCE ${SOURCES})
+foreach (SOURCE ${SOURCES})
     get_filename_component(FILE_NAME ${SOURCE} NAME_WLE)
 
     add_executable(${FILE_NAME}
-        ${SOURCE}
+            ${SOURCE}
     )
 
     target_link_libraries(${FILE_NAME}
-        7bitDI
-        benchmark::benchmark
+            7bitDI
+            benchmark::benchmark
     )
-endforeach()
+endforeach ()

Benchmarks/ServiceProviderBenchmark.cpp

@@ -8,11 +8,11 @@ class ServiceProviderBenchmark : public benchmark::Fixture
   public:
     sb::di::ServiceProvider _provider = make();
 
-    void SetUp(const ::benchmark::State &state) {}
+    void SetUp(const benchmark::State &state) override {}
 
-    void TearDown(const ::benchmark::State &state) {}
+    void TearDown(const benchmark::State &state) override {}
 
-    sb::di::ServiceProvider make()
+    static sb::di::ServiceProvider make()
     {
         return sb::di::ServiceCollection()
             .addSingleton<ITestComplexClass1, TestComplexClass1>()

CMakeLists.txt

@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.15.0)
 
 set(_7BIT_DI_LIBRARY 7bitDI)
 
-set(_7BIT_DI_VERSION_MAJOR 2)
-set(_7BIT_DI_VERSION_MINOR 1)
+set(_7BIT_DI_VERSION_MAJOR 3)
+set(_7BIT_DI_VERSION_MINOR 0)
 set(_7BIT_DI_VERSION_PATCH 0)
 
 set(_7BIT_DI_VERSION ${_7BIT_DI_VERSION_MAJOR}.${_7BIT_DI_VERSION_MINOR}.${_7BIT_DI_VERSION_PATCH})
@@ -12,9 +12,9 @@ project(${_7BIT_DI_LIBRARY} LANGUAGES CXX VERSION ${_7BIT_DI_VERSION})
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/Cmake")
 
-if(NOT CMAKE_CXX_STANDARD)
+if (NOT CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD 17)
-endif()
+endif ()
 
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
@@ -26,27 +26,29 @@ include_directories(${_7BIT_DI_INCLUDE_DIR})
 
 add_subdirectory(Source)
 
-if(_7BIT_DI_BUILD_DOCS)
-    add_subdirectory(Docs)
-endif()
+if (_7BIT_DI_BUILD_UNIT_TESTS OR _7BIT_DI_BUILD_INTEGRATION_TESTS OR _7BIT_DI_BUILD_E2E_TESTS)
+    enable_testing()
 
-if(_7BIT_DI_BUILD_TESTS)
     add_subdirectory(Tests)
-endif()
+endif ()
+
+if (_7BIT_DI_BUILD_DOCS)
+    add_subdirectory(Docs)
+endif ()
 
-if(_7BIT_DI_BUILD_EXAMPLES)
+if (_7BIT_DI_BUILD_EXAMPLES)
     add_subdirectory(Examples)
-endif()
+endif ()
 
-if(_7BIT_DI_BUILD_BENCHMARKS)
+if (_7BIT_DI_BUILD_BENCHMARKS)
     add_subdirectory(Benchmarks)
-endif()
+endif ()
 
-if(_7BIT_DI_BUILD_SINGLE_HEADER)
+if (_7BIT_DI_BUILD_SINGLE_HEADER)
     add_subdirectory(SingleHeader)
-endif()
+endif ()
 
-if(_7BIT_DI_INSTALL)
+if (_7BIT_DI_INSTALL)
     set(PROJECT_CONFIG_IN ${CMAKE_CURRENT_SOURCE_DIR}/Cmake/7bitDIConfig.cmake.in)
     set(PROJECT_CONFIG_OUT ${CMAKE_CURRENT_BINARY_DIR}/7bitDIConfig.cmake)
     set(CONFIG_TARGETS_FILE 7bitDIConfigTargets.cmake)
@@ -56,29 +58,29 @@ if(_7BIT_DI_INSTALL)
     install(DIRECTORY ${_7BIT_DI_INCLUDE_DIR}/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
     install(
-        TARGETS 7bitDI
-        EXPORT 7bitDI
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+            TARGETS 7bitDI
+            EXPORT 7bitDI
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
     export(
-        TARGETS 7bitDI
-        NAMESPACE 7bitDI::
-        FILE ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_TARGETS_FILE})
+            TARGETS 7bitDI
+            NAMESPACE 7bitDI::
+            FILE ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_TARGETS_FILE})
 
     install(
-        EXPORT 7bitDI
-        EXPORT 7bitDI
-        DESTINATION ${EXPORT_DEST_DIR}
-        NAMESPACE 7bitDI::
-        NAMESPACE 7bitDI::
-        FILE ${CONFIG_TARGETS_FILE})
+            EXPORT 7bitDI
+            EXPORT 7bitDI
+            DESTINATION ${EXPORT_DEST_DIR}
+            NAMESPACE 7bitDI::
+            NAMESPACE 7bitDI::
+            FILE ${CONFIG_TARGETS_FILE})
 
     include(CMakePackageConfigHelpers)
 
     configure_package_config_file(${PROJECT_CONFIG_IN} ${PROJECT_CONFIG_OUT}
-        INSTALL_DESTINATION ${EXPORT_DEST_DIR})
+            INSTALL_DESTINATION ${EXPORT_DEST_DIR})
 
     write_basic_package_version_file(${VERSIONS_CONFIG_FILE} COMPATIBILITY SameMajorVersion)
 
@@ -87,4 +89,4 @@ if(_7BIT_DI_INSTALL)
     export(PACKAGE 7bitDI)
 
     include(CPack)
-endif()
+endif ()

Cmake/Setup.cmake

@@ -1,8 +1,8 @@
 include(Functions)
 
-if(NOT CMAKE_BUILD_TYPE)
+if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose Release or Debug" FORCE)
-endif()
+endif ()
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin)
@@ -33,20 +33,20 @@ set(_7BIT_DI_DETAILS_DIR "${_7BIT_DI_DI_DIR}/Details")
 set(_7BIT_DI_MAIN_HEADER "${_7BIT_DI_INCLUDE_DIR}/SevenBit/DI.hpp")
 file(GLOB _7BIT_DI_TOP_HEADERS "${_7BIT_DI_DI_DIR}/*.hpp")
 file(GLOB _7BIT_DI_DETAILS_HEADERS
-    "${_7BIT_DI_DETAILS_DIR}/Containers/*.hpp"
-    "${_7BIT_DI_DETAILS_DIR}/Core/*.hpp"
-    "${_7BIT_DI_DETAILS_DIR}/Factories/*.hpp"
-    "${_7BIT_DI_DETAILS_DIR}/Helpers/*.hpp"
-    "${_7BIT_DI_DETAILS_DIR}/Services/*.hpp"
-    "${_7BIT_DI_DETAILS_DIR}/Utils/*.hpp"
+        "${_7BIT_DI_DETAILS_DIR}/Containers/*.hpp"
+        "${_7BIT_DI_DETAILS_DIR}/Core/*.hpp"
+        "${_7BIT_DI_DETAILS_DIR}/Factories/*.hpp"
+        "${_7BIT_DI_DETAILS_DIR}/Helpers/*.hpp"
+        "${_7BIT_DI_DETAILS_DIR}/Services/*.hpp"
+        "${_7BIT_DI_DETAILS_DIR}/Utils/*.hpp"
 )
 file(GLOB _7BIT_DI_IMPL_HEADERS
-    "${_7BIT_DI_DI_DIR}/Impl/*.hpp"
-    "${_7BIT_DI_DETAILS_DIR}/Containers/Impl/*.hpp"
-    "${_7BIT_DI_DETAILS_DIR}/Core/Impl/*.hpp"
-    "${_7BIT_DI_DETAILS_DIR}/Factories/Impl/*.hpp"
-    "${_7BIT_DI_DETAILS_DIR}/Helpers/Impl/*.hpp"
-    "${_7BIT_DI_DETAILS_DIR}/Utils/Impl/*.hpp"
+        "${_7BIT_DI_DI_DIR}/Impl/*.hpp"
+        "${_7BIT_DI_DETAILS_DIR}/Containers/Impl/*.hpp"
+        "${_7BIT_DI_DETAILS_DIR}/Core/Impl/*.hpp"
+        "${_7BIT_DI_DETAILS_DIR}/Factories/Impl/*.hpp"
+        "${_7BIT_DI_DETAILS_DIR}/Helpers/Impl/*.hpp"
+        "${_7BIT_DI_DETAILS_DIR}/Utils/Impl/*.hpp"
 )
 set(_7BIT_DI_ALL_HEADERS ${_7BIT_DI_MAIN_HEADER} ${_7BIT_DI_TOP_HEADERS} ${_7BIT_DI_DETAILS_HEADERS} ${_7BIT_DI_IMPL_HEADERS})
 
@@ -58,48 +58,59 @@ set_property(CACHE _7BIT_DI_LIBRARY_TYPE PROPERTY STRINGS Shared Static HeaderOn
 option(_7BIT_DI_BUILD_PIC "Build position independent code (-fPIC)" OFF)
 option(_7BIT_DI_BUILD_EXAMPLES "Build example" OFF)
 option(_7BIT_DI_BUILD_BENCHMARKS "Build benchmarks" OFF)
-option(_7BIT_DI_BUILD_TESTS "Build tests" OFF)
+option(_7BIT_DI_BUILD_ALL_TESTS "Build all tests" OFF)
+option(_7BIT_DI_BUILD_UNIT_TESTS "Build unit tests" OFF)
+option(_7BIT_DI_BUILD_INTEGRATION_TESTS "Build integration tests" OFF)
+option(_7BIT_DI_BUILD_E2E_TESTS "Build e2e tests" OFF)
 option(_7BIT_DI_BUILD_DOCS "Turn on to build documentation (requires sphinx and doxygen installed)" OFF)
 option(_7BIT_DI_INSTALL "Installs 7bitDI" OFF)
 option(_7BIT_DI_BUILD_SINGLE_HEADER "Builds single header SevenBitDI.hpp" OFF)
 
-if(_7BIT_DI_BUILD_PIC)
+if (_7BIT_DI_BUILD_ALL_TESTS)
+    set(_7BIT_DI_BUILD_UNIT_TESTS ${_7BIT_DI_BUILD_ALL_TESTS})
+    set(_7BIT_DI_BUILD_INTEGRATION_TESTS ${_7BIT_DI_BUILD_ALL_TESTS})
+    set(_7BIT_DI_BUILD_E2E_TESTS ${_7BIT_DI_BUILD_ALL_TESTS})
+endif ()
+
+if (_7BIT_DI_BUILD_PIC)
     set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-endif()
+endif ()
 
-if(_7BIT_DI_LIBRARY_TYPE STREQUAL "Shared" OR BUILD_SHARED_LIBS)
+if (_7BIT_DI_LIBRARY_TYPE STREQUAL "Shared" OR BUILD_SHARED_LIBS)
     set(_7BIT_DI_BUILD_LIBRARY_TYPE "Shared")
     set(_7BIT_DI_SHARED_LIB ON)
-elseif(_7BIT_DI_LIBRARY_TYPE STREQUAL "HeaderOnly")
+elseif (_7BIT_DI_LIBRARY_TYPE STREQUAL "HeaderOnly")
     set(_7BIT_DI_BUILD_LIBRARY_TYPE "HeaderOnly")
     set(_7BIT_DI_HEADER_ONLY_LIB ON)
-else()
+else ()
     set(_7BIT_DI_BUILD_LIBRARY_TYPE "Static")
     set(_7BIT_DI_STATIC_LIB ON)
-endif()
+endif ()
 
 configure_file(${_7BIT_DI_DI_DIR}/CmakeDef.hpp.input ${_7BIT_DI_DI_DIR}/CmakeDef.hpp)
 
 set(BYTE_SIZE 8)
 math(EXPR MEMORY_SIZE "${CMAKE_SIZEOF_VOID_P} * ${BYTE_SIZE}")
 
 set(INFOS
-    "${_7BIT_DI_LIBRARY} ${_7BIT_DI_VERSION}"
-    "Build type: ${CMAKE_BUILD_TYPE}"
-    "Library type: ${_7BIT_DI_BUILD_LIBRARY_TYPE}"
-    "=================================================="
-    "Cmake version: ${CMAKE_VERSION}"
-    "Os: ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION}"
-    "Architecture: ${CMAKE_SYSTEM_PROCESSOR} ${MEMORY_SIZE}bit"
-    "CXX compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}"
-    "CXX standard: ${CMAKE_CXX_STANDARD}"
-    "Generator: ${CMAKE_GENERATOR}"
-    "=================================================="
-    "Build tests: ${_7BIT_DI_BUILD_TESTS}"
-    "Build examples: ${_7BIT_DI_BUILD_EXAMPLES}"
-    "Build benchmarks: ${_7BIT_DI_BUILD_BENCHMARKS}"
-    "Build documentation: ${_7BIT_DI_BUILD_DOCS}"
-    "Build single header: ${_7BIT_DI_BUILD_SINGLE_HEADER}"
-    "Install project: ${_7BIT_DI_INSTALL}"
+        "${_7BIT_DI_LIBRARY} ${_7BIT_DI_VERSION}"
+        "Build type: ${CMAKE_BUILD_TYPE}"
+        "Library type: ${_7BIT_DI_BUILD_LIBRARY_TYPE}"
+        "=================================================="
+        "Cmake version: ${CMAKE_VERSION}"
+        "Os: ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION}"
+        "Architecture: ${CMAKE_SYSTEM_PROCESSOR} ${MEMORY_SIZE}bit"
+        "CXX compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}"
+        "CXX standard: ${CMAKE_CXX_STANDARD}"
+        "Generator: ${CMAKE_GENERATOR}"
+        "=================================================="
+        "Build unit tests: ${_7BIT_DI_BUILD_UNIT_TESTS}"
+        "Build integration tests: ${_7BIT_DI_BUILD_INTEGRATION_TESTS}"
+        "Build e2e tests: ${_7BIT_DI_BUILD_E2E_TESTS}"
+        "Build examples: ${_7BIT_DI_BUILD_EXAMPLES}"
+        "Build benchmarks: ${_7BIT_DI_BUILD_BENCHMARKS}"
+        "Build documentation: ${_7BIT_DI_BUILD_DOCS}"
+        "Build single header: ${_7BIT_DI_BUILD_SINGLE_HEADER}"
+        "Install project: ${_7BIT_DI_INSTALL}"
 )
 printInfo("${INFOS}" = 50 7 0)