Android and IOS support using <Random>

Author: MauroDeryckere

.github/workflows/ci.yml

@@ -68,11 +68,11 @@ jobs:
       - name: Test
         run: ctest --test-dir build -C ${{ matrix.build_type }} --output-on-failure
 
-  # Android: cross-compile with NDK (no tests — no device)
+  # Android: cross-compile with NDK (build only — no device to run tests)
   android:
     name: Android (${{ matrix.abi }})
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 15
     strategy:
       fail-fast: false
       matrix:
@@ -81,6 +81,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Cache FetchContent dependencies
+        uses: actions/cache@v4
+        with:
+          path: build/_deps
+          key: android-${{ matrix.abi }}-deps-${{ hashFiles('tests/CMakeLists.txt') }}
+
       - name: Configure
         run: >
           cmake -B build
@@ -89,15 +95,16 @@ jobs:
           -DANDROID_PLATFORM=android-24
           -DCMAKE_BUILD_TYPE=Release
           -DMAU_UUID_BUILD_EXAMPLE=ON
+          -DMAU_UUID_BUILD_TESTS=ON
 
       - name: Build
         run: cmake --build build
 
-  # iOS: cross-compile with Xcode toolchain (no tests — no device)
+  # iOS: cross-compile with Xcode toolchain (build only — no device to run tests)
   ios:
     name: iOS (${{ matrix.arch }})
     runs-on: macos-latest
-    timeout-minutes: 10
+    timeout-minutes: 15
     strategy:
       fail-fast: false
       matrix:
@@ -106,6 +113,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Cache FetchContent dependencies
+        uses: actions/cache@v4
+        with:
+          path: build/_deps
+          key: ios-${{ matrix.arch }}-deps-${{ hashFiles('tests/CMakeLists.txt') }}
+
       - name: Configure
         run: >
           cmake -B build
@@ -114,6 +127,7 @@ jobs:
           -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}
           -DCMAKE_OSX_DEPLOYMENT_TARGET=15.0
           -DMAU_UUID_BUILD_EXAMPLE=ON
+          -DMAU_UUID_BUILD_TESTS=ON
 
       - name: Build
         run: cmake --build build --config Release

CMakeLists.txt

@@ -24,9 +24,7 @@ target_compile_features(MauUUID INTERFACE cxx_std_20)
 # --- Platform dependencies ---
 if(WIN32)
 	target_link_libraries(MauUUID INTERFACE ole32)
-endif()
-
-if(UNIX AND NOT APPLE)
+elseif(UNIX AND NOT APPLE AND NOT ANDROID)
 	target_link_libraries(MauUUID INTERFACE uuid)
 endif()
 

include/uuid.h

@@ -13,20 +13,19 @@
 #include <string_view>
 
 #ifdef _WIN32
-#define NOMINMAX
-#include <objbase.h>
-#endif
-
-#ifdef __linux__
-#include <uuid/uuid.h>
-#endif
-
-#ifdef __APPLE__
-#include <uuid/uuid.h>
-#endif
-
-#if !defined(_WIN32) && !defined(__linux__) && !defined(__APPLE__)
-#error Unsupported platform
+	#define NOMINMAX
+	#include <objbase.h>
+#elif defined(__APPLE__)
+	#include <TargetConditionals.h>
+	#if TARGET_OS_IOS
+		#include <random>
+	#else
+		#include <uuid/uuid.h>
+	#endif
+#elif defined(__linux__) && !defined(__ANDROID__)
+	#include <uuid/uuid.h>
+#else
+	#include <random>
 #endif
 
 namespace MauUUID
@@ -122,16 +121,47 @@ namespace MauUUID
 
 			std::memcpy(&m_Bytes[8], guid.Data4, 8);
 		}
-	#endif
-
-	#if defined(__linux__) || defined(__APPLE__)
+	#elif defined(__APPLE__) && !TARGET_OS_IOS
+		/**
+		 * @brief Generate a new UUID.
+		 */
+		UUID() noexcept
+		{
+			uuid_generate(m_Bytes.data());
+		}
+	#elif defined(__linux__) && !defined(__ANDROID__)
 		/**
 		 * @brief Generate a new UUID.
 		 */
 		UUID() noexcept
 		{
 			uuid_generate(m_Bytes.data());
 		}
+	#else
+		/**
+		 * @brief Generate a new UUID (portable fallback using std::random).
+		 */
+		UUID() noexcept
+		{
+			static thread_local std::mt19937_64 rng{ []
+			{
+				std::random_device rd;
+				return (static_cast<uint64_t>(rd()) << 32) | rd();
+			}() };
+
+			std::uniform_int_distribution<uint64_t> dist;
+
+			uint64_t const a{ dist(rng) };
+			uint64_t const b{ dist(rng) };
+
+			std::memcpy(m_Bytes.data(), &a, 8);
+			std::memcpy(m_Bytes.data() + 8, &b, 8);
+
+			// RFC 4122 version 4 (random)
+			m_Bytes[6] = (m_Bytes[6] & 0x0F) | 0x40;
+			// RFC 4122 variant 1
+			m_Bytes[8] = (m_Bytes[8] & 0x3F) | 0x80;
+		}
 	#endif
 
 		~UUID() = default;