From 644af8d5355949f54c972e0a1f72030b068a22c7 Mon Sep 17 00:00:00 2001 From: Evan Maloney Date: Wed, 29 Mar 2017 15:35:39 -0400 Subject: [PATCH] updating for Xcode 8.3 --- .travis.yml | 2 +- BuildControl/bin/releaseMe.sh | 6 ++--- BuildControl/bin/travisBuildHelper.sh | 6 ++--- BuildControl/repos.xml | 24 +++++++++---------- INTEGRATION.md | 14 +++++------ README.md | 4 ++-- .../TargetActionTests.swift | 2 +- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index adfe899..fdc4884 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: objective-c xcode_project: CleanroomBridging.xcodeproj -osx_image: xcode8.2 +osx_image: xcode8.3 git: depth: 1 diff --git a/BuildControl/bin/releaseMe.sh b/BuildControl/bin/releaseMe.sh index 93f573a..713e120 100755 --- a/BuildControl/bin/releaseMe.sh +++ b/BuildControl/bin/releaseMe.sh @@ -480,10 +480,10 @@ testActionForPlatform() runDestinationForPlatform() { case $1 in - iOS) echo "platform=iOS Simulator,OS=10.2,name=iPad Pro (9.7 inch)";; + iOS) echo "platform=iOS Simulator,OS=10.3,name=iPad Pro (9.7 inch)";; macOS) echo "platform=macOS";; - tvOS) echo "platform=tvOS Simulator,OS=10.1,name=Apple TV 1080p";; - watchOS) echo "platform=watchOS Simulator,OS=3.1,name=Apple Watch Series 2 - 42mm";; + tvOS) echo "platform=tvOS Simulator,OS=10.2,name=Apple TV 1080p";; + watchOS) echo "platform=watchOS Simulator,OS=3.2,name=Apple Watch Series 2 - 42mm";; esac } diff --git a/BuildControl/bin/travisBuildHelper.sh b/BuildControl/bin/travisBuildHelper.sh index 5e15b99..d01dc12 100755 --- a/BuildControl/bin/travisBuildHelper.sh +++ b/BuildControl/bin/travisBuildHelper.sh @@ -18,10 +18,10 @@ PLATFORM="$2" runDestinationForPlatform() { case $1 in - iOS) echo "platform=iOS Simulator,OS=10.2,name=iPad Pro (9.7 inch)";; + iOS) echo "platform=iOS Simulator,OS=10.3,name=iPad Pro (9.7 inch)";; macOS) echo "platform=macOS";; - tvOS) echo "platform=tvOS Simulator,OS=10.1,name=Apple TV 1080p";; - watchOS) echo "platform=watchOS Simulator,OS=3.1,name=Apple Watch Series 2 - 42mm";; + tvOS) echo "platform=tvOS Simulator,OS=10.2,name=Apple TV 1080p";; + watchOS) echo "platform=watchOS Simulator,OS=3.2,name=Apple Watch Series 2 - 42mm";; esac } diff --git a/BuildControl/repos.xml b/BuildControl/repos.xml index 6024125..5168ee9 100644 --- a/BuildControl/repos.xml +++ b/BuildControl/repos.xml @@ -10,9 +10,9 @@ - + - + @@ -20,18 +20,18 @@ - + - + - - + + @@ -53,17 +53,17 @@ - - - + + + - + - - + + diff --git a/INTEGRATION.md b/INTEGRATION.md index 99d2765..7b2247a 100644 --- a/INTEGRATION.md +++ b/INTEGRATION.md @@ -9,12 +9,12 @@ CleanroomBridging is designed as a *universal Swift framework* with support for Platform|Latest supported OS|Oldest supported OS --------|-------------------|------------------- -iPhone/iPad|iOS 10.2|iOS 9.0 +iPhone/iPad|iOS 10.3|iOS 9.0 Macintosh|macOS 10.12|macOS 10.11 -Apple TV|tvOS 10.1|tvOS 9.0 -Apple Watch|watchOS 3.1|watchOS 2.0 +Apple TV|tvOS 10.2|tvOS 9.0 +Apple Watch|watchOS 3.2|watchOS 2.0 -CleanroomBridging uses **Swift 3.0.2** and **requires Xcode 8.2** to compile. +CleanroomBridging uses **Swift 3.1** and **requires Xcode 8.3** to compile. ### Options for integration @@ -37,12 +37,12 @@ Within to your project’s root directory, Carthage-based projects will store a To integrate CleanroomBridging in your workspace, you would start by adding the following line to the `Cartfile`: ``` -github "emaloney/CleanroomBridging" ~> 1.3.0 +github "emaloney/CleanroomBridging" ~> 1.4.0 ``` -This specifies that Carthage use the latest version of CleanroomBridging that is API-compatible with 1.3, i.e. any 1.3.*x* version. +This specifies that Carthage use the latest version of CleanroomBridging that is API-compatible with 1.4, i.e. any 1.4.*x* version. -**Note:** Be sure to check the [latest releases](https://github.com/emaloney/CleanroomBridging/releases); there may be a newer version than 1.3 that is no longer API-compatible. +**Note:** Be sure to check the [latest releases](https://github.com/emaloney/CleanroomBridging/releases); there may be a newer version than 1.4 that is no longer API-compatible. ### 2. Download CleanroomBridging using Carthage diff --git a/README.md b/README.md index 432e7fb..a5d39ef 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ CleanroomBridging is part of [the Cleanroom Project](https://github.com/gilt/Cle ### Swift compatibility -This is the `master` branch. It uses **Swift 3.0.2** and **requires Xcode 8.2** to compile. +This is the `master` branch. It uses **Swift 3.1** and **requires Xcode 8.3** to compile. #### Current status @@ -36,7 +36,7 @@ The simplest way to integrate CleanroomBridging is with the [Carthage](https://g First, add this line to your [`Cartfile`](https://github.com/Carthage/Carthage/blob/master/Documentation/Artifacts.md#cartfile): ``` -github "emaloney/CleanroomBridging" ~> 1.3.0 +github "emaloney/CleanroomBridging" ~> 1.4.0 ``` Then, use the `carthage` command to [update your dependencies](https://github.com/Carthage/Carthage#upgrading-frameworks). diff --git a/Tests/CleanroomBridgingTests/TargetActionTests.swift b/Tests/CleanroomBridgingTests/TargetActionTests.swift index 9cc1780..02d4dd5 100644 --- a/Tests/CleanroomBridgingTests/TargetActionTests.swift +++ b/Tests/CleanroomBridgingTests/TargetActionTests.swift @@ -44,7 +44,7 @@ class TargetActionTests: XCTestCase let userInfo = "(info for the user)" let targetAction = TargetAction() { (argument: Any?) -> Void in - print("Invoked with: \(argument)") + print("Invoked with: \(String(describing: argument))") let timer = argument as? Timer XCTAssertTrue(timer != nil)