From 193d97d4d48b6898ed14a6895eae3d226da7b8ef Mon Sep 17 00:00:00 2001 From: Robert Widmann Date: Mon, 21 Mar 2016 23:19:24 -0400 Subject: [PATCH 1/2] Update to swift 2.2 --- .travis.yml | 2 +- Cartfile.resolved | 4 ++-- Carthage/Checkouts/Operadics | 2 +- Carthage/Checkouts/SwiftCheck | 2 +- Focus/Protocols.swift | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1095bf1..39c5477 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode7.2 +osx_image: xcode7.3 before_install: true install: true script: diff --git a/Cartfile.resolved b/Cartfile.resolved index fecdb6b..7e29a4f 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "typelift/Operadics" "0.1.4" -github "typelift/SwiftCheck" "v0.4.4" +github "typelift/Operadics" "0.2.0" +github "typelift/SwiftCheck" "v0.6.0" diff --git a/Carthage/Checkouts/Operadics b/Carthage/Checkouts/Operadics index c65e635..8117a84 160000 --- a/Carthage/Checkouts/Operadics +++ b/Carthage/Checkouts/Operadics @@ -1 +1 @@ -Subproject commit c65e6355e22282a89d68a8a2d594a32c36c1e7b0 +Subproject commit 8117a84bb4111814c35af80285f3f9baff290d7e diff --git a/Carthage/Checkouts/SwiftCheck b/Carthage/Checkouts/SwiftCheck index 118d474..f214146 160000 --- a/Carthage/Checkouts/SwiftCheck +++ b/Carthage/Checkouts/SwiftCheck @@ -1 +1 @@ -Subproject commit 118d47429bef32296e2f663ae72d8aa24d4c9a66 +Subproject commit f2141461f015315cc583222f0bb30ae07da8aad8 diff --git a/Focus/Protocols.swift b/Focus/Protocols.swift index 23cff7f..c0a178c 100644 --- a/Focus/Protocols.swift +++ b/Focus/Protocols.swift @@ -9,11 +9,11 @@ /// The shared supertype of all optics. /// /// N.B.: Right now, this exists solely to standardize the four -/// `typealias`es that the other `protocol`s all use, but, in future +/// `associatedtype`s that the other `protocol`s all use, but, in future /// releases, `extension`s of it may provide some optic-generic operators. public protocol OpticFamilyType { - typealias Source - typealias Target - typealias AltSource - typealias AltTarget + associatedtype Source + associatedtype Target + associatedtype AltSource + associatedtype AltTarget } From 1134976bb05263c9e0d9f1d7f4ddc987ddec3b09 Mon Sep 17 00:00:00 2001 From: Robert Widmann Date: Tue, 22 Mar 2016 18:50:16 -0400 Subject: [PATCH 2/2] Try a thing --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 39c5477..407435e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ osx_image: xcode7.3 before_install: true install: true script: - - script/cibuild Focus Focus-iOS + - script/cibuild Focus - xcodebuild test -scheme Focus-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 1080p' - xcodebuild build -scheme Focus-watchOS -destination 'platform=watchOS Simulator,name=Apple Watch - 42mm'