Skip to content

Commit 3758e90

Browse files
authored
Remove 5.10 WASM support (#156)
* Remove 5.10 WASM support * Remove unused file * Skip the WASM build
1 parent 57797b1 commit 3758e90

File tree

7 files changed

+2
-402
lines changed

7 files changed

+2
-402
lines changed

.github/workflows/wasm.yml

+2-8
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,9 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
swift_version: ["5.10.0-RELEASE", "6.0-SNAPSHOT-2024-09-18-a"]
15+
swift_version: ["6.0.2-RELEASE"]
1616
os: [ubuntu-22.04]
1717
extra_params: [""]
18-
include:
19-
- swift_version: "6.0-SNAPSHOT-2024-09-18-a"
20-
continue-on-error: true
21-
- swift_version: "5.10.0-RELEASE"
22-
continue-on-error: false
2318
runs-on: ${{ matrix.os }}
2419
env:
2520
OPENSWIFTUI_WERROR: 1
@@ -35,8 +30,7 @@ jobs:
3530
- name: build
3631
run: |
3732
swift build --triple wasm32-unknown-wasi ${{ matrix.extra_params }}
38-
continue-on-error: ${{ matrix.continue-on-error }}
39-
# Blocked by upstream support for WASM. See https://github.com/apple/swift-testing/issues/228
33+
continue-on-error: true # See https://github.com/swiftwasm/swift/issues/5592
4034
# - name: test
4135
# run: |
4236
# swift test --triple wasm32-unknown-wasi ${{ matrix.extra_params }}

[email protected]

-304
This file was deleted.

Sources/OpenSwiftUICore/Data/Protobuf/ProtobufEncoder.swift

-18
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,6 @@ extension ProtobufEncoder {
741741
encodeVarintZZ(Int(value))
742742
}
743743

744-
#if compiler(>=6.0)
745744
/// Encodes a bitwise copyable value.
746745
///
747746
/// - Parameters:
@@ -757,23 +756,6 @@ extension ProtobufEncoder {
757756
buffer.advanced(by: oldSize).storeBytes(of: value, as: T.self)
758757
}
759758
}
760-
#else // FIXME: Remove this after we drop WASI 5.10 support
761-
/// Encodes a bitwise copyable value.
762-
///
763-
/// - Parameters:
764-
/// - value: The value to encode.
765-
@inline(__always)
766-
private mutating func encodeBitwiseCopyable<T>(_ value: T) {
767-
let oldSize = size
768-
let newSize = oldSize + MemoryLayout<T>.size
769-
if capacity < newSize {
770-
growBufferSlow(to: newSize).storeBytes(of: value, as: T.self)
771-
} else {
772-
size = newSize
773-
buffer.advanced(by: oldSize).storeBytes(of: value, as: T.self)
774-
}
775-
}
776-
#endif
777759

778760
/// Encodes a boolean value.
779761
///

Tests/OpenSwiftUICompatibilityTests/Scaffolding.swift

-18
This file was deleted.

0 commit comments

Comments
 (0)