From acd836219c20e277159345d2a4ad87f9e051335b Mon Sep 17 00:00:00 2001 From: Dev karan Date: Tue, 25 Apr 2023 12:46:01 +0530 Subject: [PATCH 1/9] [CM-1254] Make dimmer a Close button in VO mode. --- Sources/YBottomSheet/BottomSheetController.swift | 14 ++++++++++++-- .../Enums/AccessibilityIdentifiers.swift | 15 +++++++++++++++ .../SheetHeaderView/SheetHeaderView.swift | 1 + 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 Sources/YBottomSheet/Enums/AccessibilityIdentifiers.swift diff --git a/Sources/YBottomSheet/BottomSheetController.swift b/Sources/YBottomSheet/BottomSheetController.swift index 03f916d..1e7b629 100644 --- a/Sources/YBottomSheet/BottomSheetController.swift +++ b/Sources/YBottomSheet/BottomSheetController.swift @@ -38,7 +38,14 @@ public class BottomSheetController: UIViewController { static let sheetCompressionResistanceLow = UILayoutPriority.defaultLow static let sheetCompressionResistanceHigh = UILayoutPriority(800) } - + /// Dimmer tap view + let dimmerTapView: UIView = { + let view = UIView() + view.accessibilityTraits = .button + view.accessibilityLabel = BottomSheetController.Strings.closeButton.localized + view.accessibilityIdentifier = AccessibilityIdentifiers.dimmerId + return view + }() /// Dimmer view. let dimmerView = UIView() /// Bottom sheet view. @@ -211,6 +218,7 @@ private extension BottomSheetController { func buildViews() { view.addSubview(dimmerView) + view.addSubview(dimmerTapView) view.addSubview(sheetView) sheetView.addSubview(stackView) stackView.addArrangedSubview(indicatorContainer) @@ -220,6 +228,8 @@ private extension BottomSheetController { func buildConstraints() { dimmerView.constrainEdges() + dimmerTapView.constrainEdges(.notBottom) + dimmerTapView.constrain(.bottomAnchor, to: sheetView.topAnchor) sheetView.constrainEdges(.notTop) sheetView.constrain( @@ -316,7 +326,7 @@ private extension BottomSheetController { swipeGesture.direction = .down view.addGestureRecognizer(swipeGesture) let tapGesture = UITapGestureRecognizer(target: self, action: #selector(onDimmerTap)) - dimmerView.addGestureRecognizer(tapGesture) + dimmerTapView.addGestureRecognizer(tapGesture) } func onDismiss() { diff --git a/Sources/YBottomSheet/Enums/AccessibilityIdentifiers.swift b/Sources/YBottomSheet/Enums/AccessibilityIdentifiers.swift new file mode 100644 index 0000000..b2f80b1 --- /dev/null +++ b/Sources/YBottomSheet/Enums/AccessibilityIdentifiers.swift @@ -0,0 +1,15 @@ +// +// AccessibilityIdentifiers.swift +// YBottomSheet +// +// Created by Dev Karan on 15/02/23. +// Copyright © 2023 Y Media Labs. All rights reserved. +// + +/// Accessibility Identifiers +enum AccessibilityIdentifiers { + /// Button ID + static let buttonId = "sheet.button.close" + /// Dimmer ID + static let dimmerId = "sheet.dimmer.close" +} diff --git a/Sources/YBottomSheet/SheetHeaderView/SheetHeaderView.swift b/Sources/YBottomSheet/SheetHeaderView/SheetHeaderView.swift index a46d0f8..a416020 100644 --- a/Sources/YBottomSheet/SheetHeaderView/SheetHeaderView.swift +++ b/Sources/YBottomSheet/SheetHeaderView/SheetHeaderView.swift @@ -66,6 +66,7 @@ private extension SheetHeaderView { buildConstraints() closeButton.addTarget(self, action: #selector(closeButtonAction), for: .touchUpInside) closeButton.accessibilityLabel = BottomSheetController.Strings.closeButton.localized + closeButton.accessibilityIdentifier = AccessibilityIdentifiers.buttonId } func buildViews() { From fa049bcf5146941103f0a2a03871edd96f1310de Mon Sep 17 00:00:00 2001 From: Dev karan Date: Tue, 25 Apr 2023 12:58:05 +0530 Subject: [PATCH 2/9] [CM-1254] Comment updated --- Sources/YBottomSheet/Enums/AccessibilityIdentifiers.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/YBottomSheet/Enums/AccessibilityIdentifiers.swift b/Sources/YBottomSheet/Enums/AccessibilityIdentifiers.swift index b2f80b1..5790323 100644 --- a/Sources/YBottomSheet/Enums/AccessibilityIdentifiers.swift +++ b/Sources/YBottomSheet/Enums/AccessibilityIdentifiers.swift @@ -2,7 +2,7 @@ // AccessibilityIdentifiers.swift // YBottomSheet // -// Created by Dev Karan on 15/02/23. +// Created by Dev Karan on 25/04/23. // Copyright © 2023 Y Media Labs. All rights reserved. // From adeedd876808a85df29e8b6a384e9cc29d611f44 Mon Sep 17 00:00:00 2001 From: Dev karan Date: Tue, 25 Apr 2023 14:15:54 +0530 Subject: [PATCH 3/9] [CM-1254] Swiftlint line length error fixed. --- .../YBottomSheet/BottomSheetController.swift | 34 ++++--------------- .../Enums/BottomSheetController+Enums.swift | 25 ++++++++++++++ 2 files changed, 32 insertions(+), 27 deletions(-) create mode 100644 Sources/YBottomSheet/Enums/BottomSheetController+Enums.swift diff --git a/Sources/YBottomSheet/BottomSheetController.swift b/Sources/YBottomSheet/BottomSheetController.swift index 1e7b629..6de4676 100644 --- a/Sources/YBottomSheet/BottomSheetController.swift +++ b/Sources/YBottomSheet/BottomSheetController.swift @@ -12,11 +12,6 @@ import UIKit public class BottomSheetController: UIViewController { // Holds the sheet content until the view is loaded private let content: Content - private enum Content { - case view(title: String, view: UIView) - case controller(_: UIViewController) - } - private var shadowSize: CGSize = .zero private let minimumTopOffset: CGFloat = 44 private let minimumContentHeight: CGFloat = 88 @@ -30,14 +25,7 @@ public class BottomSheetController: UIViewController { /// Minimum downward velocity beyond which we interpret a pan gesture as a downward swipe. public var dismissThresholdVelocity: CGFloat = 1000 - - /// Priorities for various non-required constraints. - enum Priorities { - static let panGesture = UILayoutPriority(775) - static let sheetContentHugging = UILayoutPriority(751) - static let sheetCompressionResistanceLow = UILayoutPriority.defaultLow - static let sheetCompressionResistanceHigh = UILayoutPriority(800) - } + /// Dimmer tap view let dimmerTapView: UIView = { let view = UIView() @@ -94,11 +82,9 @@ public class BottomSheetController: UIViewController { /// `UINavigationController` and hence already has its own `UINavigationBar` header. public var hasHeader: Bool { guard appearance.headerAppearance != nil else { return false } - if case let .controller(childController) = content { return !(childController is UINavigationController) } - return true } @@ -161,7 +147,7 @@ public class BottomSheetController: UIViewController { /// This method is not called when the header's close button is tapped. func didDismiss() { if appearance.isDismissAllowed { - onDismiss() + dismiss(animated: true) } } } @@ -230,8 +216,8 @@ private extension BottomSheetController { dimmerView.constrainEdges() dimmerTapView.constrainEdges(.notBottom) dimmerTapView.constrain(.bottomAnchor, to: sheetView.topAnchor) + sheetView.constrainEdges(.notTop) - sheetView.constrain( .topAnchor, to: view.safeAreaLayoutGuide.topAnchor, @@ -276,11 +262,9 @@ private extension BottomSheetController { sheetView.addGestureRecognizer(pan) panGesture = pan } - } else { - if let pan = panGesture { - sheetView.removeGestureRecognizer(pan) - panGesture = nil - } + } else if let pan = panGesture { + sheetView.removeGestureRecognizer(pan) + panGesture = nil } } @@ -328,17 +312,13 @@ private extension BottomSheetController { let tapGesture = UITapGestureRecognizer(target: self, action: #selector(onDimmerTap)) dimmerTapView.addGestureRecognizer(tapGesture) } - - func onDismiss() { - dismiss(animated: true) - } } extension BottomSheetController: SheetHeaderViewDelegate { @objc func didTapCloseButton() { // Directly dismiss the sheet without considering `isDismissAllowed`. - onDismiss() + dismiss(animated: true) } } diff --git a/Sources/YBottomSheet/Enums/BottomSheetController+Enums.swift b/Sources/YBottomSheet/Enums/BottomSheetController+Enums.swift new file mode 100644 index 0000000..b8170f7 --- /dev/null +++ b/Sources/YBottomSheet/Enums/BottomSheetController+Enums.swift @@ -0,0 +1,25 @@ +// +// BottomSheetController+Enums.swift +// YBottomSheet +// +// Created by Dev Karan on 25/04/23. +// Copyright © 2023 Y Media Labs. All rights reserved. +// + +import Foundation +import UIKit + +extension BottomSheetController { + /// Priorities for various non-required constraints. + internal enum Priorities { + static let panGesture = UILayoutPriority(775) + static let sheetContentHugging = UILayoutPriority(751) + static let sheetCompressionResistanceLow = UILayoutPriority.defaultLow + static let sheetCompressionResistanceHigh = UILayoutPriority(800) + } + + internal enum Content { + case view(title: String, view: UIView) + case controller(_: UIViewController) + } +} From df86d8c51ae94c8741d2182dfd9cc0d18e10fbcf Mon Sep 17 00:00:00 2001 From: Dev karan Date: Tue, 25 Apr 2023 16:19:18 +0530 Subject: [PATCH 4/9] [CM-1254] Comments updated. --- .../YBottomSheet/BottomSheetController.swift | 19 ++++++++++++++----- .../Enums/AccessibilityIdentifiers.swift | 15 --------------- ...tController+AccessibilityIdentifiers.swift | 17 +++++++++++++++++ .../Enums/BottomSheetController+Enums.swift | 6 +++--- .../SheetHeaderView/SheetHeaderView.swift | 2 +- 5 files changed, 35 insertions(+), 24 deletions(-) delete mode 100644 Sources/YBottomSheet/Enums/AccessibilityIdentifiers.swift create mode 100644 Sources/YBottomSheet/Enums/BottomSheetController+AccessibilityIdentifiers.swift diff --git a/Sources/YBottomSheet/BottomSheetController.swift b/Sources/YBottomSheet/BottomSheetController.swift index 6de4676..f3b933a 100644 --- a/Sources/YBottomSheet/BottomSheetController.swift +++ b/Sources/YBottomSheet/BottomSheetController.swift @@ -82,9 +82,11 @@ public class BottomSheetController: UIViewController { /// `UINavigationController` and hence already has its own `UINavigationBar` header. public var hasHeader: Bool { guard appearance.headerAppearance != nil else { return false } + if case let .controller(childController) = content { return !(childController is UINavigationController) } + return true } @@ -147,7 +149,7 @@ public class BottomSheetController: UIViewController { /// This method is not called when the header's close button is tapped. func didDismiss() { if appearance.isDismissAllowed { - dismiss(animated: true) + onDismiss() } } } @@ -242,6 +244,7 @@ private extension BottomSheetController { } func updateViewAppearance() { + dimmerTapView.isAccessibilityElement = appearance.isDismissAllowed sheetView.layer.cornerRadius = appearance.layout.cornerRadius updateShadow() dimmerView.backgroundColor = appearance.dimmerColor @@ -262,9 +265,11 @@ private extension BottomSheetController { sheetView.addGestureRecognizer(pan) panGesture = pan } - } else if let pan = panGesture { - sheetView.removeGestureRecognizer(pan) - panGesture = nil + } else { + if let pan = panGesture { + sheetView.removeGestureRecognizer(pan) + panGesture = nil + } } } @@ -312,13 +317,17 @@ private extension BottomSheetController { let tapGesture = UITapGestureRecognizer(target: self, action: #selector(onDimmerTap)) dimmerTapView.addGestureRecognizer(tapGesture) } + + func onDismiss() { + dismiss(animated: true) + } } extension BottomSheetController: SheetHeaderViewDelegate { @objc func didTapCloseButton() { // Directly dismiss the sheet without considering `isDismissAllowed`. - dismiss(animated: true) + onDismiss() } } diff --git a/Sources/YBottomSheet/Enums/AccessibilityIdentifiers.swift b/Sources/YBottomSheet/Enums/AccessibilityIdentifiers.swift deleted file mode 100644 index 5790323..0000000 --- a/Sources/YBottomSheet/Enums/AccessibilityIdentifiers.swift +++ /dev/null @@ -1,15 +0,0 @@ -// -// AccessibilityIdentifiers.swift -// YBottomSheet -// -// Created by Dev Karan on 25/04/23. -// Copyright © 2023 Y Media Labs. All rights reserved. -// - -/// Accessibility Identifiers -enum AccessibilityIdentifiers { - /// Button ID - static let buttonId = "sheet.button.close" - /// Dimmer ID - static let dimmerId = "sheet.dimmer.close" -} diff --git a/Sources/YBottomSheet/Enums/BottomSheetController+AccessibilityIdentifiers.swift b/Sources/YBottomSheet/Enums/BottomSheetController+AccessibilityIdentifiers.swift new file mode 100644 index 0000000..4a8559f --- /dev/null +++ b/Sources/YBottomSheet/Enums/BottomSheetController+AccessibilityIdentifiers.swift @@ -0,0 +1,17 @@ +// +// BottomSheetController+AccessibilityIdentifiers.swift +// YBottomSheet +// +// Created by Dev Karan on 25/04/23. +// Copyright © 2023 Y Media Labs. All rights reserved. +// + +extension BottomSheetController { + /// Accessibility Identifiers + enum AccessibilityIdentifiers { + /// Button ID + static let buttonId = "sheet.button.close" + /// Dimmer ID + static let dimmerId = "sheet.dimmer.close" + } +} diff --git a/Sources/YBottomSheet/Enums/BottomSheetController+Enums.swift b/Sources/YBottomSheet/Enums/BottomSheetController+Enums.swift index b8170f7..ea62111 100644 --- a/Sources/YBottomSheet/Enums/BottomSheetController+Enums.swift +++ b/Sources/YBottomSheet/Enums/BottomSheetController+Enums.swift @@ -9,16 +9,16 @@ import Foundation import UIKit -extension BottomSheetController { +internal extension BottomSheetController { /// Priorities for various non-required constraints. - internal enum Priorities { + enum Priorities { static let panGesture = UILayoutPriority(775) static let sheetContentHugging = UILayoutPriority(751) static let sheetCompressionResistanceLow = UILayoutPriority.defaultLow static let sheetCompressionResistanceHigh = UILayoutPriority(800) } - internal enum Content { + enum Content { case view(title: String, view: UIView) case controller(_: UIViewController) } diff --git a/Sources/YBottomSheet/SheetHeaderView/SheetHeaderView.swift b/Sources/YBottomSheet/SheetHeaderView/SheetHeaderView.swift index a416020..a3212b7 100644 --- a/Sources/YBottomSheet/SheetHeaderView/SheetHeaderView.swift +++ b/Sources/YBottomSheet/SheetHeaderView/SheetHeaderView.swift @@ -66,7 +66,7 @@ private extension SheetHeaderView { buildConstraints() closeButton.addTarget(self, action: #selector(closeButtonAction), for: .touchUpInside) closeButton.accessibilityLabel = BottomSheetController.Strings.closeButton.localized - closeButton.accessibilityIdentifier = AccessibilityIdentifiers.buttonId + closeButton.accessibilityIdentifier = BottomSheetController.AccessibilityIdentifiers.buttonId } func buildViews() { From 9b32d03ce55f4319751d6e527231c987a30a11c0 Mon Sep 17 00:00:00 2001 From: Mark Pospesel Date: Tue, 25 Apr 2023 17:23:01 +0200 Subject: [PATCH 5/9] Update to latest dependencies --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 4c96781..d38d87e 100644 --- a/Package.swift +++ b/Package.swift @@ -17,7 +17,7 @@ let package = Package( dependencies: [ .package( url: "https://github.com/yml-org/YCoreUI.git", - from: "1.5.0" + from: "1.7.0" ), .package( url: "https://github.com/yml-org/YMatterType.git", From cf9052768b9bcb7d76cd037fd99bbd023d4ac571 Mon Sep 17 00:00:00 2001 From: Mark Pospesel Date: Tue, 25 Apr 2023 17:23:20 +0200 Subject: [PATCH 6/9] Rename files --- ...heet+Strings.swift => BottomSheetController+Strings.swift} | 2 +- ...gsTests.swift => BottomSheetController+StringsTests.swift} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename Sources/YBottomSheet/Enums/{YBottomSheet+Strings.swift => BottomSheetController+Strings.swift} (89%) rename Tests/YBottomSheetTests/Enums/{YBottomSheet+StringsTests.swift => BottomSheetController+StringsTests.swift} (83%) diff --git a/Sources/YBottomSheet/Enums/YBottomSheet+Strings.swift b/Sources/YBottomSheet/Enums/BottomSheetController+Strings.swift similarity index 89% rename from Sources/YBottomSheet/Enums/YBottomSheet+Strings.swift rename to Sources/YBottomSheet/Enums/BottomSheetController+Strings.swift index 27c7555..ca2013c 100644 --- a/Sources/YBottomSheet/Enums/YBottomSheet+Strings.swift +++ b/Sources/YBottomSheet/Enums/BottomSheetController+Strings.swift @@ -1,5 +1,5 @@ // -// YBottomSheet+Strings.swift +// BottomSheetController+Strings.swift // YBottomSheet // // Created by Dev Karan on 15/02/23. diff --git a/Tests/YBottomSheetTests/Enums/YBottomSheet+StringsTests.swift b/Tests/YBottomSheetTests/Enums/BottomSheetController+StringsTests.swift similarity index 83% rename from Tests/YBottomSheetTests/Enums/YBottomSheet+StringsTests.swift rename to Tests/YBottomSheetTests/Enums/BottomSheetController+StringsTests.swift index 755a55a..b81d174 100644 --- a/Tests/YBottomSheetTests/Enums/YBottomSheet+StringsTests.swift +++ b/Tests/YBottomSheetTests/Enums/BottomSheetController+StringsTests.swift @@ -1,5 +1,5 @@ // -// YBottomSheet+StringsTests.swift +// BottomSheetController+StringsTests.swift // YBottomSheet // // Created by Dev Karan on 15/02/23. @@ -10,7 +10,7 @@ import XCTest import YCoreUI @testable import YBottomSheet -final class YBottomSheetStringsTests: XCTestCase { +final class BottomSheetControllerStringsTests: XCTestCase { func testLoad() { BottomSheetController.Strings.allCases.forEach { // Given a localized string constant From 7d74fc72f923e43acd9adfa77343731098694192 Mon Sep 17 00:00:00 2001 From: Mark Pospesel Date: Tue, 25 Apr 2023 17:23:43 +0200 Subject: [PATCH 7/9] Test with Xcode 14.3 / iOS 16.4 --- .github/workflows/run_linter_and_unit_tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_linter_and_unit_tests.yml b/.github/workflows/run_linter_and_unit_tests.yml index c390c4b..7f8e082 100644 --- a/.github/workflows/run_linter_and_unit_tests.yml +++ b/.github/workflows/run_linter_and_unit_tests.yml @@ -20,15 +20,15 @@ jobs: - name: Set Xcode version run: | ls -l /Applications | grep 'Xcode' - sudo xcode-select -s /Applications/Xcode_14.0.1.app + sudo xcode-select -s /Applications/Xcode_14.3.app - name: Lint code using SwiftLint run: swiftlint --strict --reporter github-actions-logging - name: Build iOS run: | - xcodebuild -scheme YBottomSheet -sdk iphonesimulator16.0 -destination 'platform=iOS Simulator,name=iPhone 14' build-for-testing + xcodebuild -scheme YBottomSheet -sdk iphonesimulator16.3 -destination 'platform=iOS Simulator,name=iPhone 14' build-for-testing - name: Run tests iOS run: | - xcodebuild -scheme YBottomSheet -sdk iphonesimulator16.0 -destination 'platform=iOS Simulator,name=iPhone 14' test-without-building + xcodebuild -scheme YBottomSheet -sdk iphonesimulator16.3 -destination 'platform=iOS Simulator,name=iPhone 14' test-without-building From 7dc6d71931f607a70ef045cc2382164166a66bfb Mon Sep 17 00:00:00 2001 From: Mark Pospesel Date: Tue, 25 Apr 2023 17:24:10 +0200 Subject: [PATCH 8/9] Set VO focus to sheet not dimmer --- .../YBottomSheet/BottomSheetController.swift | 19 +++++++++++-------- .../Enums/BottomSheetController+Enums.swift | 3 ++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Sources/YBottomSheet/BottomSheetController.swift b/Sources/YBottomSheet/BottomSheetController.swift index f3b933a..dcf3d7a 100644 --- a/Sources/YBottomSheet/BottomSheetController.swift +++ b/Sources/YBottomSheet/BottomSheetController.swift @@ -19,9 +19,7 @@ public class BottomSheetController: UIViewController { private var indicatorTopAnchor: NSLayoutConstraint? private var childHeightAnchor: NSLayoutConstraint? private var panGesture: UIPanGestureRecognizer? - internal lazy var lastYOffset: CGFloat = { - sheetView.frame.origin.y - }() + internal lazy var lastYOffset: CGFloat = { sheetView.frame.origin.y }() /// Minimum downward velocity beyond which we interpret a pan gesture as a downward swipe. public var dismissThresholdVelocity: CGFloat = 1000 @@ -128,7 +126,14 @@ public class BottomSheetController: UIViewController { super.viewDidLoad() build() } - + + /// :nodoc: + public override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + // set initial VO focus to the sheet not the dimmer + UIAccessibility.post(notification: .screenChanged, argument: sheetView) + } + /// :nodoc: public override func viewDidLayoutSubviews() { super.viewDidLayoutSubviews() @@ -199,7 +204,6 @@ private extension BottomSheetController { func buildSheet() { buildViews() buildConstraints() - view.layoutIfNeeded() updateViewAppearance() addGestures() } @@ -343,7 +347,7 @@ private extension BottomSheetController { } @objc - private func handlePan(_ gesture: UIPanGestureRecognizer) { + func handlePan(_ gesture: UIPanGestureRecognizer) { switch gesture.state { case .began, .changed: let translation = gesture.translation(in: sheetView) @@ -382,8 +386,7 @@ internal extension BottomSheetController { onDimmerTap(sender: UITapGestureRecognizer()) } - @objc - @discardableResult + @objc @discardableResult func simulateDragging(_ gesture: UIPanGestureRecognizer) -> Bool { guard isResizable else { return false } handlePan(gesture) diff --git a/Sources/YBottomSheet/Enums/BottomSheetController+Enums.swift b/Sources/YBottomSheet/Enums/BottomSheetController+Enums.swift index ea62111..a3a2c98 100644 --- a/Sources/YBottomSheet/Enums/BottomSheetController+Enums.swift +++ b/Sources/YBottomSheet/Enums/BottomSheetController+Enums.swift @@ -17,7 +17,8 @@ internal extension BottomSheetController { static let sheetCompressionResistanceLow = UILayoutPriority.defaultLow static let sheetCompressionResistanceHigh = UILayoutPriority(800) } - + + /// Types of content that can populate a bottom sheet enum Content { case view(title: String, view: UIView) case controller(_: UIViewController) From c469b0fae2c71b605528e0a46bd0a99f0a3003ac Mon Sep 17 00:00:00 2001 From: Mark Pospesel Date: Tue, 25 Apr 2023 18:06:56 +0200 Subject: [PATCH 9/9] Run Xcode 14.2 for CI/CD --- .github/workflows/run_linter_and_unit_tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_linter_and_unit_tests.yml b/.github/workflows/run_linter_and_unit_tests.yml index 7f8e082..29f11f3 100644 --- a/.github/workflows/run_linter_and_unit_tests.yml +++ b/.github/workflows/run_linter_and_unit_tests.yml @@ -20,15 +20,15 @@ jobs: - name: Set Xcode version run: | ls -l /Applications | grep 'Xcode' - sudo xcode-select -s /Applications/Xcode_14.3.app + sudo xcode-select -s /Applications/Xcode_14.2.app - name: Lint code using SwiftLint run: swiftlint --strict --reporter github-actions-logging - name: Build iOS run: | - xcodebuild -scheme YBottomSheet -sdk iphonesimulator16.3 -destination 'platform=iOS Simulator,name=iPhone 14' build-for-testing + xcodebuild -scheme YBottomSheet -sdk iphonesimulator16.2 -destination 'platform=iOS Simulator,name=iPhone 14' build-for-testing - name: Run tests iOS run: | - xcodebuild -scheme YBottomSheet -sdk iphonesimulator16.3 -destination 'platform=iOS Simulator,name=iPhone 14' test-without-building + xcodebuild -scheme YBottomSheet -sdk iphonesimulator16.2 -destination 'platform=iOS Simulator,name=iPhone 14' test-without-building