Add StrongHash implementation (#135)

* Add StrongHash implementation

* Add swift-crypto support

* Update GitHub workflow file

* Fix Linux include directory issue

* Fix XCTestScaffold.runAllTests issue

* Exclude UpdateTests from non-Darwin platform

* Fix wasm workflow

* Fix CI test case issue

* Update Package.swift

Author: Kyle-Ye

.github/workflows/compatibility_tests.yml

@@ -20,6 +20,7 @@ jobs:
       OPENSWIFTUI_WERROR: 1
       OPENGRAPH_ATTRIBUTEGRAPH: 1
       OPENSWIFTUI_SWIFT_LOG: 0
+      OPENSWIFTUI_SWIFT_CRYPTO: 0
       OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }}
     steps:
       - uses: actions/checkout@v4
@@ -60,6 +61,7 @@ jobs:
       OPENSWIFTUI_WERROR: 1
       OPENGRAPH_ATTRIBUTEGRAPH: 1
       OPENSWIFTUI_SWIFT_LOG: 0
+      OPENSWIFTUI_SWIFT_CRYPTO: 0
       OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }}
     steps:
       - uses: actions/checkout@v4

.github/workflows/ios.yml

@@ -25,6 +25,7 @@ jobs:
       OPENGRAPH_ATTRIBUTEGRAPH: 1
       OPENSWIFTUI_COMPATIBILITY_TEST: 0
       OPENSWIFTUI_SWIFT_LOG: 0
+      OPENSWIFTUI_SWIFT_CRYPTO: 0
       OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }}
     steps:
       - uses: actions/checkout@v4

.github/workflows/macos.yml

@@ -21,6 +21,7 @@ jobs:
       OPENGRAPH_ATTRIBUTEGRAPH: 1
       OPENSWIFTUI_COMPATIBILITY_TEST: 0
       OPENSWIFTUI_SWIFT_LOG: 0
+      OPENSWIFTUI_SWIFT_CRYPTO: 0
       OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }}
     steps:
       - uses: actions/checkout@v4
@@ -35,7 +36,7 @@ jobs:
           swift test \
             -c debug \
             --filter OpenSwiftUITests \
-            -Xswiftc -warnings-as-errors \
+            --filter OpenSwiftUICoreTests \
             --enable-code-coverage \
             --build-path .build-test-debug
           xcrun llvm-cov show \
@@ -47,7 +48,7 @@ jobs:
           swift test \
             -c release \
             --filter OpenSwiftUITests \
-            -Xswiftc -warnings-as-errors \
+            --filter OpenSwiftUICoreTests \
             --enable-code-coverage \
             --build-path .build-test-release
       - uses: codecov/codecov-action@v3

.github/workflows/ubuntu.yml

@@ -12,16 +12,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        swift_version: ["6.0"]
-        include:
-          - container: "swiftlang/swift:nightly-6.0-jammy"
-            continue-on-error: true
+        swift_version: ["6.0.1"]
     runs-on: ubuntu-22.04
     env:
       OPENSWIFTUI_WERROR: 1
       OPENGRAPH_ATTRIBUTEGRAPH: 0
       OPENSWIFTUI_COMPATIBILITY_TEST: 0
       OPENSWIFTUI_SWIFT_LOG: 1
+      OPENSWIFTUI_SWIFT_CRYPTO: 1
     container: swift:${{ matrix.swift_version }}-jammy
     steps:
       - uses: actions/checkout@v4
@@ -30,28 +28,23 @@ jobs:
           swift test \
             -c debug \
             --filter OpenSwiftUITests \
-            -Xswiftc -warnings-as-errors \
+            --filter OpenSwiftUICoreTests \
             --enable-code-coverage \
             --build-path .build-test-debug
           llvm-cov show \
             -instr-profile=.build-test-debug/debug/codecov/default.profdata \
             .build-test-debug/debug/OpenSwiftUIPackageTests.xctest \
             > coverage.txt
-        continue-on-error: ${{ matrix.continue-on-error }}
         id: debug-test
       - name: Building and running tests in release mode
         run: |
           swift test \
             -c release \
             --filter OpenSwiftUITests \
-            -Xswiftc -warnings-as-errors \
+            --filter OpenSwiftUICoreTests \
             --build-path .build-test-release
-        continue-on-error: ${{ matrix.continue-on-error }}
         id: release-test
-        if: steps.debug-test.outcome == 'success'
       - uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          verbose: true
-        continue-on-error: true
-        if: steps.debug-test.outcome == 'success'
+          verbose: true

.github/workflows/wasm.yml

@@ -18,12 +18,15 @@ jobs:
         include:
           - swift_version: "6.0-SNAPSHOT-2024-09-18-a"
             continue-on-error: true
+          - swift_version: "5.10.0-RELEASE"
+            continue-on-error: false
     runs-on: ${{ matrix.os }}
     env:
       OPENSWIFTUI_WERROR: 1
       OPENGRAPH_ATTRIBUTEGRAPH: 0
       OPENSWIFTUI_COMPATIBILITY_TEST: 0
       OPENSWIFTUI_SWIFT_LOG: 1
+      OPENSWIFTUI_SWIFT_CRYPTO: 1
     steps:
       - uses: actions/checkout@v4
       - uses: swiftwasm/setup-swiftwasm@v1

Package.swift

@@ -133,10 +133,10 @@ let openSwiftUICompatibilityTestTarget = Target.testTarget(
     swiftSettings: sharedSwiftSettings
 )
 
-let swiftBinPath = Context.environment["_"] ?? ""
+let swiftBinPath = Context.environment["_"] ?? "/usr/bin/swift"
 let swiftBinURL = URL(fileURLWithPath: swiftBinPath)
 let SDKPath = swiftBinURL.deletingLastPathComponent().deletingLastPathComponent().deletingLastPathComponent().path
-let includePath = SDKPath.appending("/usr/lib/swift_static")
+let includePath = SDKPath.appending("/usr/lib/swift")
 
 let package = Package(
     name: "OpenSwiftUI",
@@ -213,6 +213,13 @@ extension Target {
         swiftSettings.append(.define("OPENSWIFTUI_SWIFT_LOG"))
         self.swiftSettings = swiftSettings
     }
+    
+    func addSwiftCryptoSettings() {
+        dependencies.append(.product(name: "Crypto", package: "swift-crypto"))
+        var swiftSettings = swiftSettings ?? []
+        swiftSettings.append(.define("OPENSWIFTUI_SWIFT_CRYPTO"))
+        self.swiftSettings = swiftSettings
+    }
 }
 
 if attributeGraphCondition {
@@ -249,6 +256,19 @@ if swiftLogCondition {
     openSwiftUITarget.addSwiftLogSettings()
 }
 
+#if os(macOS)
+let swiftCryptoCondition = envEnable("OPENSWIFTUI_SWIFT_CRYPTO")
+#else
+let swiftCryptoCondition = envEnable("OPENSWIFTUI_SWIFT_CRYPTO", default: true)
+#endif
+if swiftCryptoCondition {
+    package.dependencies.append(
+        .package(url: "https://github.com/apple/swift-crypto.git", from: "3.8.0")
+    )
+    openSwiftUICoreTarget.addSwiftCryptoSettings()
+    openSwiftUITarget.addSwiftCryptoSettings()
+}
+
 let compatibilityTestCondition = envEnable("OPENSWIFTUI_COMPATIBILITY_TEST")
 if compatibilityTestCondition {
     var swiftSettings: [SwiftSetting] = (openSwiftUICompatibilityTestTarget.swiftSettings ?? [])

[email protected]

@@ -129,10 +129,10 @@ let openSwiftUICompatibilityTestTarget = Target.testTarget(
     swiftSettings: sharedSwiftSettings
 )
 
-let swiftBinPath = Context.environment["_"] ?? ""
+let swiftBinPath = Context.environment["_"] ?? "/usr/bin/swift"
 let swiftBinURL = URL(fileURLWithPath: swiftBinPath)
 let SDKPath = swiftBinURL.deletingLastPathComponent().deletingLastPathComponent().deletingLastPathComponent().path
-let includePath = SDKPath.appending("/usr/lib/swift_static")
+let includePath = SDKPath.appending("/usr/lib/swift")
 
 let package = Package(
     name: "OpenSwiftUI",
@@ -206,6 +206,13 @@ extension Target {
         self.swiftSettings = swiftSettings
     }
 
+    func addSwiftCryptoSettings() {
+        dependencies.append(.product(name: "Crypto", package: "swift-crypto"))
+        var swiftSettings = swiftSettings ?? []
+        swiftSettings.append(.define("OPENSWIFTUI_SWIFT_CRYPTO"))
+        self.swiftSettings = swiftSettings
+    }
+    
     func addSwiftTestingSettings() {
         dependencies.append(.product(name: "Testing", package: "swift-testing"))
         var swiftSettings = swiftSettings ?? []
@@ -248,6 +255,19 @@ if swiftLogCondition {
     openSwiftUITarget.addSwiftLogSettings()
 }
 
+#if os(macOS)
+let swiftCryptoCondition = envEnable("OPENSWIFTUI_SWIFT_CRYPTO")
+#else
+let swiftCryptoCondition = envEnable("OPENSWIFTUI_SWIFT_CRYPTO", default: true)
+#endif
+if swiftCryptoCondition {
+    package.dependencies.append(
+        .package(url: "https://github.com/apple/swift-crypto.git", from: "3.8.0")
+    )
+    openSwiftUICoreTarget.addSwiftCryptoSettings()
+    openSwiftUITarget.addSwiftCryptoSettings()
+}
+
 // Remove the check when swift-testing reaches 1.0.0
 let swiftTestingCondition = envEnable("OPENSWIFTUI_SWIFT_TESTING")
 if swiftTestingCondition {