From cbbf0b2469113a6967b86bbe57e46db026b2e1e1 Mon Sep 17 00:00:00 2001
From: Seth Parker <csparker247@gmail.com>
Date: Mon, 25 Aug 2025 09:21:23 -0400
Subject: [PATCH 1/3] github: Update CI matrix

---
 .github/workflows/unit_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
index 2fa301f..56c3e60 100644
--- a/.github/workflows/unit_test.yml
+++ b/.github/workflows/unit_test.yml
@@ -10,7 +10,7 @@ jobs:
   build_and_test:
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, macos-13, macos-14]
+        os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14, macos-15]
     runs-on: ${{ matrix.os }}
     env:
       EXTRA_CMAKE_FLAGS: -DCMAKE_BUILD_TYPE=Release -DEDUCE_CORE_BUILD_TESTS=ON -DEDUCE_CORE_BUILD_EXAMPLES=ON

From 74a8bcaed4b884f040f28e4586642da2dfeaa058 Mon Sep 17 00:00:00 2001
From: Seth Parker <csparker247@gmail.com>
Date: Mon, 25 Aug 2025 09:24:53 -0400
Subject: [PATCH 2/3] Include cstdint

---
 include/educelab/core/Version.hpp | 7 ++++---
 src/Version.cpp.in                | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/educelab/core/Version.hpp b/include/educelab/core/Version.hpp
index da72ca6..66dba4e 100644
--- a/include/educelab/core/Version.hpp
+++ b/include/educelab/core/Version.hpp
@@ -2,6 +2,7 @@
 
 /** @file */
 
+#include <cstdint>
 #include <string>
 
 namespace educelab::core
@@ -16,11 +17,11 @@ struct ProjectInfo {
     /** Get the library name and version string */
     static auto NameAndVersion() -> std::string;
     /** Get the library Major version number */
-    static auto VersionMajor() -> uint32_t;
+    static auto VersionMajor() -> std::uint32_t;
     /** Get the library Minor version number */
-    static auto VersionMinor() -> uint32_t;
+    static auto VersionMinor() -> std::uint32_t;
     /** Get the library Patch version number */
-    static auto VersionPatch() -> uint32_t;
+    static auto VersionPatch() -> std::uint32_t;
     /** Get the git repository URL */
     static auto RepositoryURL() -> std::string;
     /** Get the full hash for the current git commit */
diff --git a/src/Version.cpp.in b/src/Version.cpp.in
index a4c083e..07802c1 100644
--- a/src/Version.cpp.in
+++ b/src/Version.cpp.in
@@ -8,19 +8,19 @@ auto ProjectInfo::Name() -> std::string
     return name;
 }
 
-auto ProjectInfo::VersionMajor() -> uint32_t
+auto ProjectInfo::VersionMajor() -> std::uint32_t
 {
     static uint32_t vMaj{@PROJECT_VERSION_MAJOR@};
     return vMaj;
 }
 
-auto ProjectInfo::VersionMinor() -> uint32_t
+auto ProjectInfo::VersionMinor() -> std::uint32_t
 {
     static uint32_t vMin{@PROJECT_VERSION_MINOR@};
     return vMin;
 }
 
-auto ProjectInfo::VersionPatch() -> uint32_t
+auto ProjectInfo::VersionPatch() -> std::uint32_t
 {
     static uint32_t vPatch{@PROJECT_VERSION_PATCH@};
     return vPatch;

From f1dbad5f5ae539e2768c74eb4ed5ea18fc7b69f4 Mon Sep 17 00:00:00 2001
From: Seth Parker <csparker247@gmail.com>
Date: Mon, 25 Aug 2025 09:28:55 -0400
Subject: [PATCH 3/3] uuid: cstdint

---
 include/educelab/core/types/Uuid.hpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/educelab/core/types/Uuid.hpp b/include/educelab/core/types/Uuid.hpp
index 07ae98a..189a158 100644
--- a/include/educelab/core/types/Uuid.hpp
+++ b/include/educelab/core/types/Uuid.hpp
@@ -3,6 +3,7 @@
 /** @file */
 
 #include <array>
+#include <cstdint>
 #include <string>
 #include <string_view>
 
@@ -57,7 +58,7 @@ class Uuid
 
 private:
     /** Byte type */
-    using Byte = uint8_t;
+    using Byte = std::uint8_t;
     /** Byte storage */
     std::array<Byte, 16> buffer_{};
 };
@@ -67,15 +68,12 @@ auto operator<<(std::ostream& os, const Uuid& uuid) -> std::ostream&;
 
 }  // namespace educelab
 
-namespace std
-{
 /** @brief Hash function for educelab::Uuid */
 template <>
-struct hash<educelab::Uuid> {
+struct std::hash<educelab::Uuid> {
     /** Hash Uuid */
     auto operator()(educelab::Uuid const& u) const noexcept -> std::size_t
     {
         return std::hash<std::string>{}(u.string());
     }
-};
-}  // namespace std
\ No newline at end of file
+};  // namespace std
\ No newline at end of file