Replace partial MiniFoundation with FoundationEssentials (#307)

Give up on the overwhelming –and dumb– task of replacing Foundation
completely. The footprint with FoundationEssentials is only marginally
bigger, for dramatic benefits. If going serious at some point, dropping
Swift would be a much wiser choice in the future.

Basically, merge MiniFoundation Native and Compat targets. Then export
Foundation on Apple, and FoundationEssentials everywhere else. In the
latter case, add some custom code behind the MINIF_COMPAT symbol to
attain feature-parity with Foundation for the sake of the library.

MiniFoundation folders:

- Foundation (Apple)
- FoundationCompat (cross)
- FoundationEssentials (Apple and cross)
- Everything else is shared as before

Steps:

- Delete SWON, rely on Codable/JSONEncoder/JSONDecoder
- Delete redundant reimplementations (Data, Date, FileManager, URL,
UUID)
- Delete unused C code
- Delete "mini" wrappers in the middle (e.g. MiniURLProtocol)
- Return contents of URL path, not of a generic URL (would potentially
require networking)
- Implement compatible regular expressions in C++ (still targeting Swift
5.x)
- Always export Dispatch
- Disambiguate UUID on Windows

CMake issues:

- Enforce FoundationEssentials autolinked libs manually in Linux/Android
toolchains ([dynamic linking failure if autolinked libs are not
provided](https://forums.swift.org/t/missing-symbol-with-static-foundationessentials-on-linux/85044/))

Author: keeshux

.github/workflows/test.yml

@@ -17,10 +17,6 @@ jobs:
       - uses: partout-io/action-prepare-xcode-build@master
         with:
           access-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Fetch SWON submodule
-        run: |
-          git submodule init vendors/swon
-          git submodule update --depth 1 vendors/swon
       - name: Ensure previews are off
         run: |
           expected="let forPreviews = false"

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "vendors/openssl"]
 	path = vendors/openssl
 	url = https://github.com/openssl/openssl
-[submodule "vendors/swon"]
-	path = vendors/swon
-	url = https://github.com/keeshux/swon

CMakeLists.txt

@@ -37,9 +37,6 @@ if(PP_BUILD_USE_WGGO)
     include("vendors/wg-go.cmake")
 endif()
 
-# Include SWON macros
-add_subdirectory("vendors/swon")
-
 # Fetch wintun.dll on Windows
 if(WIN32)
     set(WINTUN_VERSION "0.14.1")
@@ -57,5 +54,4 @@ if(PP_BUILD_LIBRARY)
     if(PP_BUILD_USE_WGGO)
         target_link_libraries(partout_c PUBLIC WireGuardGoInterface)
     endif()
-    target_link_libraries(partout PUBLIC SWONInterface)
 endif()

Package.swift

@@ -112,11 +112,6 @@ let package = Package(
     ]
 )
 
-// SWON macros (submodule)
-package.dependencies.append(
-    .package(url: "https://github.com/keeshux/swon", from: "0.1.0")
-)
-
 // Swift-DocC for documentation, do not include by default
 if envDocs {
     package.dependencies.append(
@@ -141,8 +136,7 @@ package.targets.append(contentsOf: [
         dependencies: [
             "MiniFoundation",
             "PartoutABI_C",
-            "PartoutCore_C",
-            "swon"
+            "PartoutCore_C"
         ],
         swiftSettings: useFoundationCompatibility.swiftSettings
     ),
@@ -426,27 +420,11 @@ package.products.append(
 package.targets.append(contentsOf: [
     .target(
         name: "MiniFoundation",
-        dependencies: [
-            useFoundationCompatibility == .on ?
-                .target(name: "MiniFoundationCompat") :
-                .target(name: "MiniFoundationNative")
-        ],
+        dependencies: ["MiniFoundation_C"],
         swiftSettings: useFoundationCompatibility.swiftSettings
     ),
     .target(
-        name: "MiniFoundationCore",
-        dependencies: ["MiniFoundationCore_C"]
-    ),
-    .target(
-        name: "MiniFoundationCore_C"
-    ),
-    .target(
-        name: "MiniFoundationCompat",
-        dependencies: ["MiniFoundationCore"]
-    ),
-    .executableTarget(
-        name: "MiniFoundationExample",
-        dependencies: ["MiniFoundation"]
+        name: "MiniFoundation_C"
     ),
     .testTarget(
         name: "MiniFoundationTests",
@@ -458,15 +436,6 @@ package.targets.append(contentsOf: [
     )
 ])
 
-if useFoundationCompatibility == .off {
-    package.targets.append(
-        .target(
-            name: "MiniFoundationNative",
-            dependencies: ["MiniFoundationCore"]
-        )
-    )
-}
-
 // MARK: - Configuration structures
 
 enum Area: CaseIterable {

README.md

@@ -129,7 +129,6 @@ Libraries:
 - [MbedTLS][credits-mbedtls]
 - [OpenSSL][credits-openssl]
 - [url.c][credits-url.c]
-- [uuidv4][credits-uuidv4]
 - [Wintun][credits-wintun]
 - [WireGuard (Go)][credits-wireguard-go]
 

Sources/CMakeLists.txt

@@ -12,7 +12,7 @@ target_compile_options(partout_c PRIVATE
 
 # Header search paths from all C targets
 set(PARTOUT_C_INCLUDE_DIRS
-    ${CMAKE_CURRENT_SOURCE_DIR}/MiniFoundationCore_C/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/MiniFoundation_C/include
     ${CMAKE_CURRENT_SOURCE_DIR}/PartoutABI_C/include
     ${CMAKE_CURRENT_SOURCE_DIR}/PartoutCore_C/include
     ${CMAKE_CURRENT_SOURCE_DIR}/PartoutOpenVPN_C/include
@@ -92,15 +92,9 @@ if(USE_COMPAT)
         -DMINIF_COMPAT
     )
     set(EXCLUDED_PATTERNS
-        MiniFoundationNative.*
         PartoutOS\/Apple.*
     )
-else()
-    set(EXCLUDED_PATTERNS
-        MiniFoundationCompat.*
-    )
 endif()
-list(APPEND EXCLUDED_PATTERNS MiniFoundationExample.*)
 
 foreach(pattern ${EXCLUDED_PATTERNS})
     list(FILTER PARTOUT_SOURCES EXCLUDE REGEX ${pattern})

…undationCore/MiniRegularExpression.swift …niFoundation/Core/EnumeratingRegex.swiftSources/MiniFoundationCore/MiniRegularExpression.swift renamed to Sources/MiniFoundation/Core/EnumeratingRegex.swift Sources/MiniFoundationCore/MiniRegularExpression.swift renamed to Sources/MiniFoundation/Core/EnumeratingRegex.swift

@@ -2,6 +2,6 @@
 //
 // SPDX-License-Identifier: MIT
 
-public protocol MiniRegularExpression: Sendable {
+public protocol EnumeratingRegex: Sendable {
     func enumerateMatches(in string: String, using block: @escaping (String) -> Void)
 }

…ces/MiniFoundationCore/Expectation.swift …es/MiniFoundation/Core/Expectation.swiftSources/MiniFoundationCore/Expectation.swift renamed to Sources/MiniFoundation/Core/Expectation.swift Sources/MiniFoundationCore/Expectation.swift renamed to Sources/MiniFoundation/Core/Expectation.swift

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-internal import _MiniFoundationCore_C
+internal import _MiniFoundation_C
 
 public final class PRNG {
     public init() {