From 7bfdcfa965c42ef2194c511f51ca66cc7f6e5240 Mon Sep 17 00:00:00 2001 From: Guille Gonzalez Date: Sun, 15 Nov 2020 16:33:22 +0100 Subject: [PATCH] Fix iOS and watchOS build (#18) --- .spi.yml | 5 +++++ Makefile | 8 +++++++- Package.resolved | 4 ++-- Package.swift | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 .spi.yml diff --git a/.spi.yml b/.spi.yml new file mode 100644 index 0000000..a51e89c --- /dev/null +++ b/.spi.yml @@ -0,0 +1,5 @@ +version: 1 +builder: + configs: + - platform: watchos + scheme: AdaptiveCardUI_watchOS diff --git a/Makefile b/Makefile index bd8f10c..43c0aaa 100644 --- a/Makefile +++ b/Makefile @@ -2,10 +2,11 @@ DESTINATION_MACOS = platform=macOS DESTINATION_IOS = platform=iOS Simulator,name=iPhone 8 DESTINATION_IOS_SNAPSHOT = platform=iOS Simulator,OS=14.0,name=iPhone 8 DESTINATION_TVOS = platform=tvOS Simulator,name=Apple TV +DESTINATION_WATCHOS = generic/platform=watchOS default: test -test: test-macos test-ios test-tvos +test: test-macos test-ios test-tvos watchos test-macos: xcodebuild test \ @@ -28,6 +29,11 @@ test-tvos: -scheme AdaptiveCardUI \ -destination '$(DESTINATION_TVOS)' +watchos: + xcodebuild \ + -scheme AdaptiveCardUI_watchOS \ + -destination '$(DESTINATION_WATCHOS)' + format: swiftformat . diff --git a/Package.resolved b/Package.resolved index e30f8f0..a2aef84 100644 --- a/Package.resolved +++ b/Package.resolved @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/gonzalezreal/NetworkImage", "state": { "branch": null, - "revision": "8cd992ecc32b842d4f518032ebfcadcde52f84fd", - "version": "1.1.0" + "revision": "de0632e94acbebe35d78e2f1670398a18f8ac243", + "version": "1.1.1" } }, { diff --git a/Package.swift b/Package.swift index cacd38b..9e55058 100644 --- a/Package.swift +++ b/Package.swift @@ -20,7 +20,7 @@ let package = Package( dependencies: [ .package(url: "https://github.com/gonzalezreal/DefaultCodable", from: "1.2.0"), .package(url: "https://github.com/gonzalezreal/AnyValue", from: "1.0.0"), - .package(url: "https://github.com/gonzalezreal/NetworkImage", from: "1.1.0"), + .package(url: "https://github.com/gonzalezreal/NetworkImage", from: "1.1.1"), .package(url: "https://github.com/pointfreeco/combine-schedulers", from: "0.1.2"), .package(name: "SnapshotTesting", url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.8.1"), ],