Skip to content

Commit ba76be3

Browse files
Fix missing Dependency (maplibre#61)
* add dependency * fix warnings * add changelog * swiftformat * update workflow * update test device * add another simulator for testing * fix yml syntax * remove additional device * update changelog
1 parent 59853fd commit ba76be3

File tree

5 files changed

+19
-11
lines changed

5 files changed

+19
-11
lines changed

.github/workflows/test.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,40 +8,39 @@ on:
88

99
jobs:
1010
format-lint:
11-
runs-on: macos-14
11+
runs-on: macos-15
1212

1313
steps:
14-
- name: Install tools
15-
run: brew install swiftformat
16-
1714
- name: Checkout maplibre-swiftui-dsl-playground
1815
uses: actions/checkout@v4
1916

2017
- name: Check format
2118
run: swiftformat . --lint
2219

2320
test:
24-
runs-on: macos-14
21+
runs-on: macos-15
2522
strategy:
2623
matrix:
2724
scheme: [
2825
MapLibreSwiftUI-Package
2926
]
3027
destination: [
3128
# TODO: Add more destinations
32-
'platform=iOS Simulator,name=iPhone 15,OS=17.5'
29+
'platform=iOS Simulator,name=iPhone 16,OS=18.1'
3330
]
31+
name: ${{ matrix.destination }}
3432

3533
steps:
3634
- name: Install tools
37-
run: brew install xcbeautify
35+
run: brew update && brew upgrade xcbeautify
3836

3937
- uses: maxim-lobanov/setup-xcode@v1
4038
with:
41-
xcode-version: '15.4'
39+
xcode-version: latest-stable
4240

4341
- name: Checkout maplibre-swiftui-dsl-playground
4442
uses: actions/checkout@v4
4543

4644
- name: Test ${{ matrix.scheme }} on ${{ matrix.destination }}
4745
run: xcodebuild -scheme ${{ matrix.scheme }} test -skipMacroValidation -destination '${{ matrix.destination }}' | xcbeautify && exit ${PIPESTATUS[0]}
46+

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## Version 0.4.1 - 2024-11-19
9+
10+
### Fixed
11+
12+
- Fixes failed builds when this packages is integrated in an App. InternalUtils package was missing a dependency to MapLibre
13+
814
## Version 0.4.0 - 2024-11-19
915

1016
### Changed

Package.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ let package = Package(
5454
),
5555
.target(
5656
name: "InternalUtils",
57+
dependencies: [
58+
.product(name: "MapLibre", package: "maplibre-gl-native-distribution"),
59+
],
5760
swiftSettings: [
5861
.enableExperimentalFeature("StrictConcurrency"),
5962
]

Sources/MapLibreSwiftUI/Extensions/CoreLocation/CLLocationCoordinate2D.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import CoreLocation
22

33
// TODO: We can delete chat about this. I'm not 100% on it, even though I want Hashable
44
// on the MapCameraView (so we can let a user present a MapView with a designated camera from NavigationLink)
5-
extension CLLocationCoordinate2D: Hashable {
5+
extension CLLocationCoordinate2D: @retroactive Hashable {
66
public static func == (lhs: CLLocationCoordinate2D, rhs: CLLocationCoordinate2D) -> Bool {
77
lhs.latitude == rhs.latitude
88
&& lhs.longitude == rhs.longitude

Sources/MapLibreSwiftUI/Models/MapCamera/CameraState.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ extension CameraState: CustomDebugStringConvertible {
6565
}
6666
}
6767

68-
extension MLNCoordinateBounds: Equatable, Hashable {
68+
extension MLNCoordinateBounds: @retroactive Equatable, @retroactive Hashable {
6969
public func hash(into hasher: inout Hasher) {
7070
hasher.combine(ne)
7171
hasher.combine(sw)
@@ -76,7 +76,7 @@ extension MLNCoordinateBounds: Equatable, Hashable {
7676
}
7777
}
7878

79-
extension UIEdgeInsets: Hashable {
79+
extension UIEdgeInsets: @retroactive Hashable {
8080
public func hash(into hasher: inout Hasher) {
8181
hasher.combine(left)
8282
hasher.combine(right)

0 commit comments

Comments
 (0)