diff --git a/.swiftformat b/.swiftformat index 9be9a13..778604c 100644 --- a/.swiftformat +++ b/.swiftformat @@ -1,7 +1,7 @@ ---disable redundantNilInit,redundantSelf,redundantType,unusedArguments +--disable redundantNilInit,redundantSelf,redundantType,unusedArguments,indent --header strip ---indent tab ---ifdef no-indent --extensionacl on-declarations --patternlet inline +--ranges no-space +--trailing-commas always diff --git a/Examples/Demo/Demo/Pages.swift b/Examples/Demo/Demo/Pages.swift index 43931b9..3d3cf69 100644 --- a/Examples/Demo/Demo/Pages.swift +++ b/Examples/Demo/Demo/Pages.swift @@ -126,15 +126,15 @@ struct PageLink: View { var body: some View { ZStack { RoundedRectangle(cornerRadius: 6, style: .continuous) - #if !os(tvOS) && !os(visionOS) + #if !os(tvOS) && !os(visionOS) .fill(Color.blue.opacity(0.8)) - #else + #else .fill(Color.clear) - #endif + #endif Text(title) - #if !os(tvOS) + #if !os(tvOS) .foregroundColor(.white) - #endif + #endif .font(.system(size: 18, weight: .medium, design: .rounded)) } .frame(maxHeight: 50) @@ -163,9 +163,9 @@ struct Code: View { .minimumScaleFactor(0.5) .font(.system(size: 14, design: .monospaced)) .background(shape.stroke(Color(white: 0.1).opacity(0.35), lineWidth: 1)) - .background(Color(white: 0.94).opacity(0.6).clipShape(shape)) - #if !os(tvOS) + #if !os(tvOS) .textSelection(.enabled) - #endif + #endif + .background(Color(white: 0.94).opacity(0.6).clipShape(shape)) } } diff --git a/Package.swift b/Package.swift index 6421a6c..cdbf805 100644 --- a/Package.swift +++ b/Package.swift @@ -65,7 +65,7 @@ package.dependencies = [ .package(url: "https://github.com/davdroman/swift-once-macro", from: "1.0.0"), .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.0.0"), // dev .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.0.0"), - .package(url: "https://github.com/siteline/swiftui-introspect", "1.3.0" ..< "27.0.0"), + .package(url: "https://github.com/siteline/swiftui-introspect", "1.3.0"..<"27.0.0"), ] for target in package.targets {