From 8b848dfefe893623a62e61ea9372c774f4e5199c Mon Sep 17 00:00:00 2001 From: Kino Date: Sat, 18 Jul 2020 21:56:58 -0700 Subject: [PATCH] Don't attempt to build with 32 bit architectures SwiftUI doesn't include symbols for 32-bit archs so xcodebuild fails, and there is no reason to build the example app for 32 bit archs --- Example/Podfile.lock | 2 +- Example/Sources/View Controllers/LaunchViewController.swift | 2 -- Example/Sources/Views/SwiftUI/MessagesView.swift | 2 -- Example/Sources/Views/SwiftUI/SwiftUIExampleView.swift | 2 -- GitHubActions/build.sh | 2 +- 5 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 0d697a90..8bd75481 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -22,4 +22,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 90bd12ca685503630d7fe716609f4974660ed5ee -COCOAPODS: 1.9.3 +COCOAPODS: 1.9.1 diff --git a/Example/Sources/View Controllers/LaunchViewController.swift b/Example/Sources/View Controllers/LaunchViewController.swift index 17a57e88..d5990063 100644 --- a/Example/Sources/View Controllers/LaunchViewController.swift +++ b/Example/Sources/View Controllers/LaunchViewController.swift @@ -25,9 +25,7 @@ import UIKit import MessageKit import SafariServices -#if canImport(SwiftUI) import SwiftUI -#endif final internal class LaunchViewController: UITableViewController { diff --git a/Example/Sources/Views/SwiftUI/MessagesView.swift b/Example/Sources/Views/SwiftUI/MessagesView.swift index cb82ed92..1cf94f79 100644 --- a/Example/Sources/Views/SwiftUI/MessagesView.swift +++ b/Example/Sources/Views/SwiftUI/MessagesView.swift @@ -6,9 +6,7 @@ // Copyright © 2020 MessageKit. All rights reserved. // -#if canImport(SwiftUI) import SwiftUI -#endif import MessageKit import InputBarAccessoryView diff --git a/Example/Sources/Views/SwiftUI/SwiftUIExampleView.swift b/Example/Sources/Views/SwiftUI/SwiftUIExampleView.swift index 434e0dea..b117430d 100644 --- a/Example/Sources/Views/SwiftUI/SwiftUIExampleView.swift +++ b/Example/Sources/Views/SwiftUI/SwiftUIExampleView.swift @@ -6,9 +6,7 @@ // Copyright © 2020 MessageKit. All rights reserved. // -#if canImport(SwiftUI) import SwiftUI -#endif import MessageKit @available(iOS 13.0, *) diff --git a/GitHubActions/build.sh b/GitHubActions/build.sh index 3f998f9a..7bcd40ea 100755 --- a/GitHubActions/build.sh +++ b/GitHubActions/build.sh @@ -53,7 +53,7 @@ if [ "$MODE" = "example" -o "$MODE" = "all" ]; then gem install bundler bundle check || bundle install bundle exec pod install - set -o pipefail && xcodebuild build analyze -workspace ChatExample.xcworkspace -scheme ChatExample -destination "platform=iOS Simulator,name=iPhone 11 Pro" ONLY_ACTIVE_ARCH=NO CODE_SIGNING_REQUIRED=NO | xcpretty -c + set -o pipefail && xcodebuild build analyze -workspace ChatExample.xcworkspace -scheme ChatExample -destination "platform=iOS Simulator,name=iPhone 11 Pro" CODE_SIGNING_REQUIRED=NO | xcpretty -c success="1" fi