Add version 2.1.0

.github/workflows/DevCI.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build

.github/workflows/Linux.yml

@@ -58,7 +58,7 @@ jobs:
 
     runs-on: ${{matrix.os}}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         env:

.github/workflows/MacOs.yml

@@ -36,7 +36,7 @@ jobs:
 
     runs-on: ${{matrix.os}}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         if: matrix.compiler.tool != 'apple-clang'

.github/workflows/Windows.yml

@@ -53,7 +53,7 @@ jobs:
 
     runs-on: ${{matrix.os}}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         if: matrix.compiler.tool != 'msvc'

Benchmarks/CMakeLists.txt

@@ -1,24 +1,24 @@
 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 344117638c8ff7e239044fd0fa7085839fc03021 # release-1.14.0
 )
 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/Classes.hpp

@@ -144,7 +144,7 @@ struct ITestComplexClass6
     virtual ~ITestComplexClass6() = default;
 };
 
-class TestComplexClass6 : ITestComplexClass6
+class TestComplexClass6 : public ITestComplexClass6
 {
     std::vector<ITestComplexClass1 *> _vec;
 

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.15.0)
 set(_7BIT_DI_LIBRARY 7bitDI)
 
 set(_7BIT_DI_VERSION_MAJOR 2)
-set(_7BIT_DI_VERSION_MINOR 0)
+set(_7BIT_DI_VERSION_MINOR 1)
 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,10 @@ 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)
 
 include(Setup)
@@ -25,27 +26,27 @@ include_directories(${_7BIT_DI_INCLUDE_DIR})
 
 add_subdirectory(Source)
 
-if (_7BIT_DI_BUILD_DOCS)
+if(_7BIT_DI_BUILD_DOCS)
     add_subdirectory(Docs)
-endif ()
+endif()
 
-if (_7BIT_DI_BUILD_TESTS)
+if(_7BIT_DI_BUILD_TESTS)
     add_subdirectory(Tests)
-endif ()
+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)
@@ -55,29 +56,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)
 
@@ -86,4 +87,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})
 
@@ -63,43 +63,43 @@ option(_7BIT_DI_BUILD_DOCS "Turn on to build documentation (requires sphinx and
 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_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 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}"
 )
 printInfo("${INFOS}" = 50 7 0)

Docs/CMakeLists.txt

@@ -12,19 +12,19 @@ set(SPHINX_OUT ${SPHINX_SOURCE}/conf.py)
 configure_file(${SPHINX_IN} ${SPHINX_OUT} @ONLY)
 
 add_custom_command(OUTPUT ${SPHINX_INDEX_FILE}
-        COMMAND
-        ${SPHINX_EXECUTABLE} -b html
-        ${SPHINX_SOURCE} ${SPHINX_BUILD}
-        WORKING_DIRECTORY ${SPHINX_SOURCE}
-        DEPENDS
-        ${SPHINX_RST_FILES}
-        ${EXAMPLES}
-        ${SOURCES}
-        MAIN_DEPENDENCY ${SPHINX_OUT}
-        COMMENT "Generating documentation with Sphinx")
+    COMMAND
+    ${SPHINX_EXECUTABLE} -b html
+    ${SPHINX_SOURCE} ${SPHINX_BUILD}
+    WORKING_DIRECTORY ${SPHINX_SOURCE}
+    DEPENDS
+    ${SPHINX_RST_FILES}
+    ${EXAMPLES}
+    ${SOURCES}
+    MAIN_DEPENDENCY ${SPHINX_OUT}
+    COMMENT "Generating documentation with Sphinx")
 
 add_custom_target(GenerateDoc
-        ALL DEPENDS
-        ${SPHINX_INDEX_FILE}
-        ${SPHINX_RST_FILES}
+    ALL DEPENDS
+    ${SPHINX_INDEX_FILE}
+    ${SPHINX_RST_FILES}
 )

Docs/advanced-guides.rst

@@ -6,10 +6,6 @@ Advanced Guides
    :titlesonly:
 
    advanced-guides/using-factories
+   advanced-guides/using-aliases
    advanced-guides/external-singleton
    advanced-guides/building-library
-
-
-
-
-