Use Swift 5.7 nightly on CI, fix build issues (#507)
* Use Swift 5.7 nightly on CI to fix build issues * Update SwiftWasm snapshots * Remove initializers that became ambiguous in 5.7
This commit is contained in:
parent
10d9d32b97
commit
687baee97f
|
@ -27,8 +27,8 @@ jobs:
|
|||
matrix:
|
||||
include:
|
||||
- { toolchain: wasm-5.6.0-RELEASE }
|
||||
- { toolchain: wasm-5.7-SNAPSHOT-2022-06-01-a }
|
||||
- { toolchain: wasm-DEVELOPMENT-SNAPSHOT-2022-06-23-a }
|
||||
- { toolchain: wasm-5.7-SNAPSHOT-2022-07-27-a }
|
||||
- { toolchain: wasm-DEVELOPMENT-SNAPSHOT-2022-07-23-a }
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
@ -85,7 +85,7 @@ jobs:
|
|||
shell: bash
|
||||
run: |
|
||||
set -ex
|
||||
sudo xcode-select --switch /Applications/Xcode_13.4.app/Contents/Developer/
|
||||
sudo xcode-select --switch /Applications/Xcode_13.4.1.app/Contents/Developer/
|
||||
|
||||
brew install gtk+3
|
||||
|
||||
|
@ -94,7 +94,7 @@ jobs:
|
|||
gtk_ubuntu_18_04_build:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: swiftlang/swift:nightly-bionic
|
||||
image: swiftlang/swift:nightly-5.7-bionic
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
@ -109,7 +109,7 @@ jobs:
|
|||
gtk_ubuntu_20_04_build:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: swiftlang/swift:nightly-focal
|
||||
image: swiftlang/swift:nightly-5.7-focal
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
|
|
@ -8,7 +8,7 @@ on:
|
|||
jobs:
|
||||
codecov:
|
||||
container:
|
||||
image: swiftlang/swift:nightly-focal
|
||||
image: swiftlang/swift:nightly-5.7-focal
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- run: apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y gtk+-3.0 libgtk+-3.0
|
||||
|
|
|
@ -261,30 +261,8 @@ extension VStack: StackLayout {
|
|||
public var _alignment: Alignment { .init(horizontal: alignment, vertical: .center) }
|
||||
}
|
||||
|
||||
public extension VStack where Content == EmptyView {
|
||||
init(
|
||||
alignment: HorizontalAlignment = .center,
|
||||
spacing: CGFloat? = nil
|
||||
) {
|
||||
self.alignment = alignment
|
||||
self.spacing = spacing
|
||||
content = EmptyView()
|
||||
}
|
||||
}
|
||||
|
||||
@_spi(TokamakCore)
|
||||
extension HStack: StackLayout {
|
||||
public static var orientation: Axis { .horizontal }
|
||||
public var _alignment: Alignment { .init(horizontal: .center, vertical: alignment) }
|
||||
}
|
||||
|
||||
public extension HStack where Content == EmptyView {
|
||||
init(
|
||||
alignment: VerticalAlignment = .center,
|
||||
spacing: CGFloat? = nil
|
||||
) {
|
||||
self.alignment = alignment
|
||||
self.spacing = spacing
|
||||
content = EmptyView()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -39,8 +39,7 @@ public struct List<SelectionValue, Content>: View
|
|||
self.content = content()
|
||||
}
|
||||
|
||||
var listStack: some View {
|
||||
VStack(alignment: .leading, spacing: 0) { () -> AnyView in
|
||||
func stackContent() -> AnyView {
|
||||
if let contentContainer = content as? ParentView {
|
||||
var sections = [AnyView]()
|
||||
var currentSection = [AnyView]()
|
||||
|
@ -77,6 +76,9 @@ public struct List<SelectionValue, Content>: View
|
|||
return AnyView(content)
|
||||
}
|
||||
}
|
||||
|
||||
var listStack: some View {
|
||||
VStack(alignment: .leading, spacing: 0, content: stackContent)
|
||||
}
|
||||
|
||||
@_spi(TokamakCore)
|
||||
|
|
Loading…
Reference in New Issue