From d29cf214e9c0e2ecaa02618254016554f46b058c Mon Sep 17 00:00:00 2001 From: Scott Hoyt Date: Sun, 5 Oct 2025 13:27:25 -0700 Subject: [PATCH 1/2] Disable SPM Prebuilts in CI workflow --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 27d1cce..8d26d2a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,5 +42,8 @@ jobs: - name: Checkout maplibre-swiftui-dsl-playground uses: actions/checkout@v4 + - name: Disable SPM Prebuilts + run: defaults write com.apple.dt.Xcode IDEPackageEnablePrebuilts NO + - name: Test ${{ matrix.scheme }} on ${{ matrix.destination }} run: xcodebuild -scheme ${{ matrix.scheme }} test -skipMacroValidation -destination '${{ matrix.destination }}' | xcbeautify && exit ${PIPESTATUS[0]} From de6f9c107de1c6760ca6ed02c2da520e373106d5 Mon Sep 17 00:00:00 2001 From: Scott Hoyt Date: Thu, 9 Oct 2025 12:06:34 -0700 Subject: [PATCH 2/2] Run swiftformat --- Sources/MapLibreSwiftDSL/Style Layers/Circle.swift | 12 ++++++------ .../Style Layers/FillStyleLayer.swift | 12 ++++++------ Sources/MapLibreSwiftDSL/Style Layers/Line.swift | 12 ++++++------ Sources/MapLibreSwiftDSL/Style Layers/Symbol.swift | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Sources/MapLibreSwiftDSL/Style Layers/Circle.swift b/Sources/MapLibreSwiftDSL/Style Layers/Circle.swift index 9e6794a..5d7332f 100644 --- a/Sources/MapLibreSwiftDSL/Style Layers/Circle.swift +++ b/Sources/MapLibreSwiftDSL/Style Layers/Circle.swift @@ -43,23 +43,23 @@ private struct CircleStyleLayerInternal: StyleLayer { private var definition: CircleStyleLayer private let mglSource: MLNSource - public var identifier: String { definition.identifier } - public var insertionPosition: LayerInsertionPosition { + var identifier: String { definition.identifier } + var insertionPosition: LayerInsertionPosition { get { definition.insertionPosition } set { definition.insertionPosition = newValue } } - public var isVisible: Bool { + var isVisible: Bool { get { definition.isVisible } set { definition.isVisible = newValue } } - public var maximumZoomLevel: Float? { + var maximumZoomLevel: Float? { get { definition.maximumZoomLevel } set { definition.maximumZoomLevel = newValue } } - public var minimumZoomLevel: Float? { + var minimumZoomLevel: Float? { get { definition.minimumZoomLevel } set { definition.minimumZoomLevel = newValue } } @@ -69,7 +69,7 @@ private struct CircleStyleLayerInternal: StyleLayer { self.mglSource = mglSource } - public func makeMLNStyleLayer() -> MLNStyleLayer { + func makeMLNStyleLayer() -> MLNStyleLayer { let result = MLNCircleStyleLayer(identifier: identifier, source: mglSource) result.sourceLayerIdentifier = definition.sourceLayerIdentifier diff --git a/Sources/MapLibreSwiftDSL/Style Layers/FillStyleLayer.swift b/Sources/MapLibreSwiftDSL/Style Layers/FillStyleLayer.swift index c6b9a47..a318cc9 100644 --- a/Sources/MapLibreSwiftDSL/Style Layers/FillStyleLayer.swift +++ b/Sources/MapLibreSwiftDSL/Style Layers/FillStyleLayer.swift @@ -41,23 +41,23 @@ private struct FillStyleLayerInternal: StyleLayer { private var definition: FillStyleLayer private let mglSource: MLNSource - public var identifier: String { definition.identifier } - public var insertionPosition: LayerInsertionPosition { + var identifier: String { definition.identifier } + var insertionPosition: LayerInsertionPosition { get { definition.insertionPosition } set { definition.insertionPosition = newValue } } - public var isVisible: Bool { + var isVisible: Bool { get { definition.isVisible } set { definition.isVisible = newValue } } - public var maximumZoomLevel: Float? { + var maximumZoomLevel: Float? { get { definition.maximumZoomLevel } set { definition.maximumZoomLevel = newValue } } - public var minimumZoomLevel: Float? { + var minimumZoomLevel: Float? { get { definition.minimumZoomLevel } set { definition.minimumZoomLevel = newValue } } @@ -67,7 +67,7 @@ private struct FillStyleLayerInternal: StyleLayer { self.mglSource = mglSource } - public func makeMLNStyleLayer() -> MLNStyleLayer { + func makeMLNStyleLayer() -> MLNStyleLayer { let result = MLNFillStyleLayer(identifier: identifier, source: mglSource) result.fillColor = definition.fillColor diff --git a/Sources/MapLibreSwiftDSL/Style Layers/Line.swift b/Sources/MapLibreSwiftDSL/Style Layers/Line.swift index 86f0a4f..1b2b5b9 100644 --- a/Sources/MapLibreSwiftDSL/Style Layers/Line.swift +++ b/Sources/MapLibreSwiftDSL/Style Layers/Line.swift @@ -44,23 +44,23 @@ private struct LineStyleLayerInternal: StyleLayer { private var definition: LineStyleLayer private let mglSource: MLNSource - public var identifier: String { definition.identifier } - public var insertionPosition: LayerInsertionPosition { + var identifier: String { definition.identifier } + var insertionPosition: LayerInsertionPosition { get { definition.insertionPosition } set { definition.insertionPosition = newValue } } - public var isVisible: Bool { + var isVisible: Bool { get { definition.isVisible } set { definition.isVisible = newValue } } - public var maximumZoomLevel: Float? { + var maximumZoomLevel: Float? { get { definition.maximumZoomLevel } set { definition.maximumZoomLevel = newValue } } - public var minimumZoomLevel: Float? { + var minimumZoomLevel: Float? { get { definition.minimumZoomLevel } set { definition.minimumZoomLevel = newValue } } @@ -70,7 +70,7 @@ private struct LineStyleLayerInternal: StyleLayer { self.mglSource = mglSource } - public func makeMLNStyleLayer() -> MLNStyleLayer { + func makeMLNStyleLayer() -> MLNStyleLayer { let result = MLNLineStyleLayer(identifier: identifier, source: mglSource) result.lineColor = definition.lineColor diff --git a/Sources/MapLibreSwiftDSL/Style Layers/Symbol.swift b/Sources/MapLibreSwiftDSL/Style Layers/Symbol.swift index f898780..98a7ac8 100644 --- a/Sources/MapLibreSwiftDSL/Style Layers/Symbol.swift +++ b/Sources/MapLibreSwiftDSL/Style Layers/Symbol.swift @@ -112,23 +112,23 @@ private struct SymbolStyleLayerInternal: StyleLayer { private var definition: SymbolStyleLayer private let mglSource: MLNSource - public var identifier: String { definition.identifier } - public var insertionPosition: LayerInsertionPosition { + var identifier: String { definition.identifier } + var insertionPosition: LayerInsertionPosition { get { definition.insertionPosition } set { definition.insertionPosition = newValue } } - public var isVisible: Bool { + var isVisible: Bool { get { definition.isVisible } set { definition.isVisible = newValue } } - public var maximumZoomLevel: Float? { + var maximumZoomLevel: Float? { get { definition.maximumZoomLevel } set { definition.maximumZoomLevel = newValue } } - public var minimumZoomLevel: Float? { + var minimumZoomLevel: Float? { get { definition.minimumZoomLevel } set { definition.minimumZoomLevel = newValue } } @@ -138,7 +138,7 @@ private struct SymbolStyleLayerInternal: StyleLayer { self.mglSource = mglSource } - public func makeMLNStyleLayer() -> MLNStyleLayer { + func makeMLNStyleLayer() -> MLNStyleLayer { let result = MLNSymbolStyleLayer(identifier: identifier, source: mglSource) result.sourceLayerIdentifier = definition.sourceLayerIdentifier