Updated contact, bumped OpenSSL to 3.4.1, updated development container

madduci · madduci · commit 78f1976729d8 · 2025-05-08T22:27:02.000+02:00
diff --git a/.dev/Dockerfile b/.dev/Dockerfile
@@ -1,8 +1,8 @@
 FROM ubuntu:24.04
 
 # Define Conan and CMake versions
-ARG CONAN_VERSION=2.6.0
-ARG CMAKE_VERSION=3.30.1
+ARG CONAN_VERSION=2.16.1
+ARG CMAKE_VERSION=4.0.2
 
 # Define User ID and Group ID
 ARG USER_ID=1000
@@ -11,7 +11,7 @@ ARG GROUP_ID=1000
 WORKDIR /project
 
 # Define Labels
-LABEL maintainer="Michele Adduci <adduci@tutanota.com>" \
+LABEL maintainer="Michele Adduci <michele@adduci.org>" \
       description="Docker image for C++ development with Conan and CMake" \
       cmake.version="${CMAKE_VERSION}" \
       conan.version="${CONAN_VERSION}" 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 # MIT License 
-# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
+# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
 #
 # Main CMake Project file
 
@@ -17,12 +17,12 @@ project(moderncpp-project LANGUAGES CXX DESCRIPTION "moderncpp-project is a star
 
 # Set Project version (used for library versioning and for CPack)
 set(CMAKE_PROJECT_VERSION_MAJOR 1)
-set(CMAKE_PROJECT_VERSION_MINOR 1)
-set(CMAKE_PROJECT_VERSION_PATCH 2)
+set(CMAKE_PROJECT_VERSION_MINOR 2)
+set(CMAKE_PROJECT_VERSION_PATCH 0)
 set(CMAKE_PROJECT_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
 
 # Set required C++ Standard
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 # Generate the compile_commands.json file
 set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
+Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/cmake/clang_format.cmake b/cmake/clang_format.cmake
@@ -1,5 +1,5 @@
 # MIT License 
-# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
+# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
 #
 # Clang-Format instructions
 
diff --git a/cmake/compiler_options.cmake b/cmake/compiler_options.cmake
@@ -1,5 +1,5 @@
 # MIT License 
-# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
+# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
 #
 # Compiler options with hardening flags
 
diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake
@@ -1,9 +1,9 @@
 # MIT License 
-# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
+# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
 #
 # Packaging instructios
 
-set(CPACK_PACKAGE_VENDOR "Michele Adduci <adduci@tutanota.com>")
+set(CPACK_PACKAGE_VENDOR "Michele Adduci <michele@adduci.org>")
 set(CPACK_PACKAGE_VERSION_MAJOR "${CMAKE_PROJECT_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${CMAKE_PROJECT_VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH "${CMAKE_PROJECT_VERSION_PATCH}")
diff --git a/cmake/cppcheck.cmake b/cmake/cppcheck.cmake
@@ -1,5 +1,5 @@
 # MIT License 
-# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
+# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
 #
 # cppcheck instructions
 
diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -1,5 +1,5 @@
 # MIT License 
-# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
+# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
 #
 # Dependencies
 
diff --git a/conanfile.txt b/conanfile.txt
@@ -1,5 +1,5 @@
 [requires]
-openssl/3.3.2
+openssl/3.4.1
 doctest/2.4.11
 
 [generators]
diff --git a/project/CMakeLists.txt b/project/CMakeLists.txt
@@ -1,5 +1,5 @@
 # MIT License 
-# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
+# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
 #
 # Project-related instructions
 
diff --git a/project/helloapp/CMakeLists.txt b/project/helloapp/CMakeLists.txt
@@ -1,5 +1,5 @@
 # MIT License 
-# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
+# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
 #
 # helloapp target instructions
 
diff --git a/project/hellolib/CMakeLists.txt b/project/hellolib/CMakeLists.txt
@@ -1,5 +1,5 @@
 # MIT License 
-# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
+# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
 #
 # hellolib target instructions
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# MIT License`
`2`		`-# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>`
	`2`	`+# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>`
`3`	`3`	`#`
`4`	`4`	`# Clang-Format instructions`
`5`	`5`