diff --git a/.swift-version b/.swift-version index 7d5c902e..bf77d549 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.1 +4.2 diff --git a/.travis.yml b/.travis.yml index 192841a7..a650ceff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode9.3 +osx_image: xcode10 script: sh build.sh /tmp/LayoutKit after_success: - bash <(curl -s https://codecov.io/bash) -D /tmp/LayoutKit diff --git a/LayoutKit.xcodeproj/project.pbxproj b/LayoutKit.xcodeproj/project.pbxproj index 275da17d..6987c650 100644 --- a/LayoutKit.xcodeproj/project.pbxproj +++ b/LayoutKit.xcodeproj/project.pbxproj @@ -1804,7 +1804,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; - SWIFT_VERSION = 4.1; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -1837,7 +1837,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_VERSION = 4.1; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -1900,6 +1900,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1957,6 +1958,7 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; diff --git a/LayoutKitSampleApp/AppDelegate.swift b/LayoutKitSampleApp/AppDelegate.swift index 46cebad2..393674a2 100644 --- a/LayoutKitSampleApp/AppDelegate.swift +++ b/LayoutKitSampleApp/AppDelegate.swift @@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool { window = UIWindow(frame: UIScreen.main.bounds) window?.rootViewController = UINavigationController(rootViewController: MenuViewController()) window?.makeKeyAndVisible() diff --git a/LayoutKitSampleApp/Benchmarks/TableViewController.swift b/LayoutKitSampleApp/Benchmarks/TableViewController.swift index d486d0df..3ca041f9 100644 --- a/LayoutKitSampleApp/Benchmarks/TableViewController.swift +++ b/LayoutKitSampleApp/Benchmarks/TableViewController.swift @@ -28,7 +28,7 @@ class TableViewController: UITableViewController where init(data: [CellType.DataType]) { self.data = data - super.init(style: UITableViewStyle.grouped) + super.init(style: UITableView.Style.grouped) } required init?(coder aDecoder: NSCoder) { @@ -52,7 +52,7 @@ class TableViewController: UITableViewController where } override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { - return UITableViewAutomaticDimension + return UITableView.automaticDimension } } diff --git a/LayoutKitTests/LabelLayoutTests.swift b/LayoutKitTests/LabelLayoutTests.swift index f7eed7c2..f1c20321 100644 --- a/LayoutKitTests/LabelLayoutTests.swift +++ b/LayoutKitTests/LabelLayoutTests.swift @@ -52,7 +52,7 @@ class LabelLayoutTests: XCTestCase { } func testAttributedLabel() { - let attributedText = NSAttributedString(string: "Hi", attributes: [NSAttributedStringKey.font: UIFont.helvetica(size: 42)]) + let attributedText = NSAttributedString(string: "Hi", attributes: [NSAttributedString.Key.font: UIFont.helvetica(size: 42)]) let font = UIFont.helvetica(size: 99) let arrangement = LabelLayout(attributedText: attributedText, font: font).arrangement() @@ -122,7 +122,7 @@ class LabelLayoutTests: XCTestCase { func testAttributedTextCustomFont() { #if !os(tvOS) // tvOS doesn't currently support custom fonts let font = UIFont(name: "Papyrus", size: 20)! - let attributes = [NSAttributedStringKey.font: font] + let attributes = [NSAttributedString.Key.font: font] let text = NSAttributedString(string: "Hello! 😄😄😄", attributes: attributes) let arrangement = LabelLayout(attributedText: text).arrangement() @@ -136,7 +136,7 @@ class LabelLayoutTests: XCTestCase { #if !os(tvOS) // tvOS doesn't currently support custom fonts let font = UIFont(name: "Papyrus", size: 20)! let text = NSMutableAttributedString(string: "Hello world! 😄😄😄") - text.addAttribute(NSAttributedStringKey.font, value: font, range: NSMakeRange(6, 6)) + text.addAttribute(NSAttributedString.Key.font, value: font, range: NSMakeRange(6, 6)) let arrangement = LabelLayout(attributedText: text).arrangement() let label = UILabel(attributedText: text) diff --git a/LayoutKitTests/ReloadableViewLayoutAdapterCollectionViewTests.swift b/LayoutKitTests/ReloadableViewLayoutAdapterCollectionViewTests.swift index dfcd83d7..3e57aa3b 100644 --- a/LayoutKitTests/ReloadableViewLayoutAdapterCollectionViewTests.swift +++ b/LayoutKitTests/ReloadableViewLayoutAdapterCollectionViewTests.swift @@ -110,11 +110,11 @@ private class TestCollectionView: LayoutAdapterCollectionView, TestableReloadabl } fileprivate func verifyHeader(_ section: Int, text: String?, frame: CGRect?, file: StaticString, line: UInt) { - verifySupplementaryView(UICollectionElementKindSectionHeader, section: section, text: text, frame: frame, file: file, line: line) + verifySupplementaryView(UICollectionView.elementKindSectionHeader, section: section, text: text, frame: frame, file: file, line: line) } fileprivate func verifyFooter(_ section: Int, text: String?, frame: CGRect?, file: StaticString, line: UInt) { - verifySupplementaryView(UICollectionElementKindSectionFooter, section: section, text: text, frame: frame, file: file, line: line) + verifySupplementaryView(UICollectionView.elementKindSectionFooter, section: section, text: text, frame: frame, file: file, line: line) } private func verifySupplementaryView(_ kind: String, section: Int, text: String?, frame: CGRect?, file: StaticString, line: UInt) { diff --git a/LayoutKitTests/ReloadableViewLayoutAdapterTableViewTests.swift b/LayoutKitTests/ReloadableViewLayoutAdapterTableViewTests.swift index b081c605..c11013e7 100644 --- a/LayoutKitTests/ReloadableViewLayoutAdapterTableViewTests.swift +++ b/LayoutKitTests/ReloadableViewLayoutAdapterTableViewTests.swift @@ -68,17 +68,17 @@ private class TestTableView: LayoutAdapterTableView, TestableReloadableView { reloadDataCount += 1 } - fileprivate override func insertRows(at indexPaths: [IndexPath], with animation: UITableViewRowAnimation) { + fileprivate override func insertRows(at indexPaths: [IndexPath], with animation: UITableView.RowAnimation) { super.insertRows(at: indexPaths, with: animation) batchUpdates.insertItems.append(contentsOf: indexPaths) } - fileprivate override func deleteRows(at indexPaths: [IndexPath], with animation: UITableViewRowAnimation) { + fileprivate override func deleteRows(at indexPaths: [IndexPath], with animation: UITableView.RowAnimation) { super.deleteRows(at: indexPaths, with: animation) batchUpdates.deleteItems.append(contentsOf: indexPaths) } - fileprivate override func reloadRows(at indexPaths: [IndexPath], with animation: UITableViewRowAnimation) { + fileprivate override func reloadRows(at indexPaths: [IndexPath], with animation: UITableView.RowAnimation) { super.reloadRows(at: indexPaths, with: animation) batchUpdates.reloadItems.append(contentsOf: indexPaths) } @@ -88,17 +88,17 @@ private class TestTableView: LayoutAdapterTableView, TestableReloadableView { batchUpdates.moveItems.append(ItemMove(from: indexPath, to: newIndexPath)) } - fileprivate override func insertSections(_ sections: IndexSet, with animation: UITableViewRowAnimation) { + fileprivate override func insertSections(_ sections: IndexSet, with animation: UITableView.RowAnimation) { super.insertSections(sections, with: animation) batchUpdates.insertSections.formUnion(sections) } - fileprivate override func reloadSections(_ sections: IndexSet, with animation: UITableViewRowAnimation) { + fileprivate override func reloadSections(_ sections: IndexSet, with animation: UITableView.RowAnimation) { super.reloadSections(sections, with: animation) batchUpdates.reloadSections.formUnion(sections) } - fileprivate override func deleteSections(_ sections: IndexSet, with animation: UITableViewRowAnimation) { + fileprivate override func deleteSections(_ sections: IndexSet, with animation: UITableView.RowAnimation) { super.deleteSections(sections, with: animation) batchUpdates.deleteSections.formUnion(sections) } diff --git a/LayoutKitTests/TextExtension.swift b/LayoutKitTests/TextExtension.swift index 699787f4..af6ce383 100644 --- a/LayoutKitTests/TextExtension.swift +++ b/LayoutKitTests/TextExtension.swift @@ -30,12 +30,12 @@ extension Text { .unattributed("Hello! 😄😄😄"), .attributed(NSAttributedString(string: "")), .attributed(NSAttributedString(string: " ")), - .attributed(NSAttributedString(string: "", attributes: [NSAttributedStringKey.font: UIFont.helvetica(size: 42)])), - .attributed(NSAttributedString(string: " ", attributes: [NSAttributedStringKey.font: UIFont.helvetica(size: 42)])), + .attributed(NSAttributedString(string: "", attributes: [NSAttributedString.Key.font: UIFont.helvetica(size: 42)])), + .attributed(NSAttributedString(string: " ", attributes: [NSAttributedString.Key.font: UIFont.helvetica(size: 42)])), .attributed(NSAttributedString(string: "Hi")), .attributed(NSAttributedString(string: "Hello world")), .attributed(NSAttributedString(string: "Hello! 😄😄😄")), - .attributed(NSAttributedString(string: "Hello! 😄😄😄", attributes: [NSAttributedStringKey.font: UIFont.helvetica(size: 42)])), + .attributed(NSAttributedString(string: "Hello! 😄😄😄", attributes: [NSAttributedString.Key.font: UIFont.helvetica(size: 42)])), ] let fontSizes = 0...20 diff --git a/LayoutKitTests/TextViewLayoutTests.swift b/LayoutKitTests/TextViewLayoutTests.swift index cf9db5a3..353767e9 100644 --- a/LayoutKitTests/TextViewLayoutTests.swift +++ b/LayoutKitTests/TextViewLayoutTests.swift @@ -67,10 +67,10 @@ class TextViewLayoutTests: XCTestCase { let textString = "Hello World\nHello World\nHello World\nHello World\nHello World" let attributedString1 = NSMutableAttributedString( string: textString, - attributes: [NSAttributedStringKey.font: UIFont.helvetica(size: 15)]) + attributes: [NSAttributedString.Key.font: UIFont.helvetica(size: 15)]) let attributedString2 = NSMutableAttributedString( string: textString, - attributes: [NSAttributedStringKey.font: UIFont.helvetica(size: 12)]) + attributes: [NSAttributedString.Key.font: UIFont.helvetica(size: 12)]) attributedString1.append(attributedString2) let attributedText = Text.attributed(attributedString1) diff --git a/Sources/Internal/NSAttributedStringExtension.swift b/Sources/Internal/NSAttributedStringExtension.swift index 51a7b0f0..673f789e 100644 --- a/Sources/Internal/NSAttributedStringExtension.swift +++ b/Sources/Internal/NSAttributedStringExtension.swift @@ -12,7 +12,7 @@ extension NSAttributedString { /// Returns a new NSAttributedString with a given font and the same attributes. func with(font: UIFont) -> NSAttributedString { - let fontAttribute = [NSAttributedStringKey.font: font] + let fontAttribute = [NSAttributedString.Key.font: font] let attributedTextWithFont = NSMutableAttributedString(string: string, attributes: fontAttribute) let fullRange = NSMakeRange(0, (string as NSString).length) attributedTextWithFont.beginEditing() diff --git a/Sources/Layouts/ButtonLayout.swift b/Sources/Layouts/ButtonLayout.swift index f1189548..35e6dbf1 100644 --- a/Sources/Layouts/ButtonLayout.swift +++ b/Sources/Layouts/ButtonLayout.swift @@ -292,7 +292,7 @@ public enum ButtonLayoutType { case infoDark case contactAdd - public var buttonType: UIButtonType { + public var buttonType: UIButton.ButtonType { switch (self) { case .custom: return .custom diff --git a/Sources/Layouts/TextViewLayout.swift b/Sources/Layouts/TextViewLayout.swift index b71c8ac8..5f43adf7 100644 --- a/Sources/Layouts/TextViewLayout.swift +++ b/Sources/Layouts/TextViewLayout.swift @@ -233,7 +233,7 @@ private extension Text { case .attributed(_): let text = Text.attributed(NSAttributedString( string: spaceString, - attributes: [NSAttributedStringKey.font: font])) + attributes: [NSAttributedString.Key.font: font])) size = text.textSize(within: maxSize, font: font) case .unattributed(_): diff --git a/Sources/Text.swift b/Sources/Text.swift index 0166104f..e50e1d33 100644 --- a/Sources/Text.swift +++ b/Sources/Text.swift @@ -39,7 +39,7 @@ public enum Text { if text.isEmpty { return .zero } - size = text.boundingRect(with: maxSize, options: options, attributes: [NSAttributedStringKey.font: font], context: nil).size + size = text.boundingRect(with: maxSize, options: options, attributes: [NSAttributedString.Key.font: font], context: nil).size } // boundingRect(with:options:attributes:) returns size to a precision of hundredths of a point, // but UILabel only returns sizes with a point precision of 1/screenDensity. diff --git a/Sources/Views/ReloadableView.swift b/Sources/Views/ReloadableView.swift index 4fb7f55c..ddb7b257 100644 --- a/Sources/Views/ReloadableView.swift +++ b/Sources/Views/ReloadableView.swift @@ -60,8 +60,8 @@ extension UICollectionView: ReloadableView { @objc open func registerViews(withReuseIdentifier reuseIdentifier: String) { register(UICollectionViewCell.self, forCellWithReuseIdentifier: reuseIdentifier) - register(UICollectionReusableView.self, forSupplementaryViewOfKind: UICollectionElementKindSectionHeader, withReuseIdentifier: reuseIdentifier) - register(UICollectionReusableView.self, forSupplementaryViewOfKind: UICollectionElementKindSectionFooter, withReuseIdentifier: reuseIdentifier) + register(UICollectionReusableView.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: reuseIdentifier) + register(UICollectionReusableView.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionFooter, withReuseIdentifier: reuseIdentifier) } @objc diff --git a/Sources/Views/ReloadableViewLayoutAdapter+UICollectionView.swift b/Sources/Views/ReloadableViewLayoutAdapter+UICollectionView.swift index 985cd0fa..87f2bcab 100644 --- a/Sources/Views/ReloadableViewLayoutAdapter+UICollectionView.swift +++ b/Sources/Views/ReloadableViewLayoutAdapter+UICollectionView.swift @@ -55,9 +55,9 @@ extension ReloadableViewLayoutAdapter: UICollectionViewDataSource { let view = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: reuseIdentifier, for: indexPath) let arrangement: LayoutArrangement? switch kind { - case UICollectionElementKindSectionHeader: + case UICollectionView.elementKindSectionHeader: arrangement = currentArrangement[indexPath.section].header - case UICollectionElementKindSectionFooter: + case UICollectionView.elementKindSectionFooter: arrangement = currentArrangement[indexPath.section].footer default: arrangement = nil diff --git a/Sources/Views/StackView.swift b/Sources/Views/StackView.swift index 4fdffed9..94d4bfc4 100644 --- a/Sources/Views/StackView.swift +++ b/Sources/Views/StackView.swift @@ -154,7 +154,7 @@ private struct ViewLayout: ConfigurableLayout { return Flexibility(horizontal: horizontal, vertical: vertical) } - private func flexForAxis(_ axis: UILayoutConstraintAxis) -> Flexibility.Flex { + private func flexForAxis(_ axis: NSLayoutConstraint.Axis) -> Flexibility.Flex { switch view.contentHuggingPriority(for: .horizontal) { case UILayoutPriority.required: return nil diff --git a/Tests/cocoapods/ios/LayoutKit-iOS.xcodeproj/project.pbxproj b/Tests/cocoapods/ios/LayoutKit-iOS.xcodeproj/project.pbxproj index c78201a2..a9e3ba2e 100644 --- a/Tests/cocoapods/ios/LayoutKit-iOS.xcodeproj/project.pbxproj +++ b/Tests/cocoapods/ios/LayoutKit-iOS.xcodeproj/project.pbxproj @@ -307,7 +307,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.Linkedin.LayoutKit-iOS"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.1; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -320,7 +320,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.Linkedin.LayoutKit-iOS"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.1; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/Tests/cocoapods/macos/LayoutKit-macOS.xcodeproj/project.pbxproj b/Tests/cocoapods/macos/LayoutKit-macOS.xcodeproj/project.pbxproj index e86474ce..95010e60 100644 --- a/Tests/cocoapods/macos/LayoutKit-macOS.xcodeproj/project.pbxproj +++ b/Tests/cocoapods/macos/LayoutKit-macOS.xcodeproj/project.pbxproj @@ -310,7 +310,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.11; PRODUCT_BUNDLE_IDENTIFIER = "com.Linkedin.LayoutKit-macOS"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.1; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -325,7 +325,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.11; PRODUCT_BUNDLE_IDENTIFIER = "com.Linkedin.LayoutKit-macOS"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.1; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/Tests/cocoapods/tvos/LayoutKit-tvOS.xcodeproj/project.pbxproj b/Tests/cocoapods/tvos/LayoutKit-tvOS.xcodeproj/project.pbxproj index db010b98..16edce61 100644 --- a/Tests/cocoapods/tvos/LayoutKit-tvOS.xcodeproj/project.pbxproj +++ b/Tests/cocoapods/tvos/LayoutKit-tvOS.xcodeproj/project.pbxproj @@ -304,7 +304,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.linkedin.LayoutKit-tvOS"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.1; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -316,7 +316,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.linkedin.LayoutKit-tvOS"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.1; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/build.sh b/build.sh index 33f3b85d..7760a08b 100755 --- a/build.sh +++ b/build.sh @@ -12,12 +12,13 @@ rm -rf $DERIVED_DATA && time xcodebuild clean test \ -project LayoutKit.xcodeproj \ -scheme LayoutKit-iOS \ - -sdk iphonesimulator11.3 \ + -sdk iphonesimulator12.0 \ -derivedDataPath $DERIVED_DATA \ -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.3.1' \ -destination 'platform=iOS Simulator,name=iPhone 6 Plus,OS=10.3.1' \ -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.3' \ -destination 'platform=iOS Simulator,name=iPhone 7 Plus,OS=11.3' \ + -disable-concurrent-destination-testing test-without-building \ OTHER_SWIFT_FLAGS='-Xfrontend -debug-time-function-bodies' \ | tee build.log \ | xcpretty && @@ -27,7 +28,7 @@ echo "Run tests on macOS..." && time xcodebuild clean test \ -project LayoutKit.xcodeproj \ -scheme LayoutKit-macOS \ - -sdk macosx10.13 \ + -sdk macosx10.14 \ -derivedDataPath $DERIVED_DATA \ OTHER_SWIFT_FLAGS='-Xfrontend -debug-time-function-bodies' \ | tee build.log \ @@ -39,9 +40,9 @@ rm -rf $DERIVED_DATA && time xcodebuild clean test \ -project LayoutKit.xcodeproj \ -scheme LayoutKit-tvOS \ - -sdk appletvsimulator11.3 \ + -sdk appletvsimulator12.0 \ -derivedDataPath $DERIVED_DATA \ - -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=11.0' \ + -destination 'platform=tvOS Simulator,name=Apple TV 4K (at 1080p),OS=11.0' \ OTHER_SWIFT_FLAGS='-Xfrontend -debug-time-function-bodies' \ | tee build.log \ | xcpretty && @@ -52,12 +53,13 @@ rm -rf $DERIVED_DATA && time xcodebuild clean build \ -project LayoutKit.xcodeproj \ -scheme LayoutKitSampleApp \ - -sdk iphonesimulator11.3 \ + -sdk iphonesimulator12.0 \ -derivedDataPath $DERIVED_DATA \ -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.3.1' \ -destination 'platform=iOS Simulator,name=iPhone 6 Plus,OS=10.3.1' \ -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.3' \ -destination 'platform=iOS Simulator,name=iPhone 7 Plus,OS=11.3' \ + -disable-concurrent-destination-testing \ OTHER_SWIFT_FLAGS='-Xfrontend -debug-time-function-bodies' \ | tee ../build.log \ | xcpretty && @@ -72,7 +74,7 @@ pod install && time xcodebuild clean build \ -workspace LayoutKit-iOS.xcworkspace \ -scheme LayoutKit-iOS \ - -sdk iphonesimulator11.3 \ + -sdk iphonesimulator12.0 \ -derivedDataPath $DERIVED_DATA \ -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.3' \ OTHER_SWIFT_FLAGS='-Xfrontend -debug-time-function-bodies' \ @@ -88,7 +90,7 @@ pod install && time xcodebuild clean build \ -workspace LayoutKit-macOS.xcworkspace \ -scheme LayoutKit-macOS \ - -sdk macosx10.13 \ + -sdk macosx10.14 \ -derivedDataPath $DERIVED_DATA \ OTHER_SWIFT_FLAGS='-Xfrontend -debug-time-function-bodies' \ | tee ../../../build.log \ @@ -103,9 +105,9 @@ pod install && time xcodebuild clean build \ -workspace LayoutKit-tvOS.xcworkspace \ -scheme LayoutKit-tvOS \ - -sdk appletvsimulator11.3 \ + -sdk appletvsimulator12.0 \ -derivedDataPath $DERIVED_DATA \ - -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=11.0' \ + -destination 'platform=tvOS Simulator,name=Apple TV 4K (at 1080p),OS=11.0' \ OTHER_SWIFT_FLAGS='-Xfrontend -debug-time-function-bodies' \ | tee ../../../build.log \ | xcpretty &&