Skip to content

Commit c92cb32

Browse files
authored
Merge pull request #26 from yonekawa/swift2.3
Swift 2.3
2 parents fad59f6 + e2115bf commit c92cb32

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: objective-c
22
matrix:
33
include:
4-
- osx_image: xcode7.1
4+
- osx_image: xcode7.3
55
env:
66
global:
77
- LC_CTYPE=en_US.UTF-8
@@ -15,7 +15,7 @@ before_install:
1515

1616
script:
1717
- pod repo update
18-
- pod spec lint SwiftFlux.podspec
18+
- pod spec lint SwiftFlux.podspec --allow-warnings
1919
- set -o pipefail
2020
- carthage build --no-skip-current --platform Mac,iOS
2121
- rake test:ios

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "antitypical/Result" ~> 1.0.0
1+
github "antitypical/Result" ~> 2.1.0

Cartfile.private

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "Quick/Quick" "v0.8.0"
2-
github "Quick/Nimble" "v3.0.0"
1+
github "Quick/Quick" "v0.9.3"
2+
github "Quick/Nimble" "v4.1.0"

Cartfile.resolved

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "Quick/Nimble" "v3.0.0"
2-
github "Quick/Quick" "v0.8.0"
3-
github "antitypical/Result" "1.0.0"
1+
github "Quick/Nimble" "v4.1.0"
2+
github "Quick/Quick" "v0.9.3"
3+
github "antitypical/Result" "2.1.3"

Carthage/Checkouts/Nimble

Submodule Nimble updated 144 files

Carthage/Checkouts/Quick

Submodule Quick updated 133 files

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ It provides concept of "one-way data flow" with **type-safe** modules by Swift l
1313

1414
# Requirements
1515

16-
- Swift 2.0 or later
16+
- Swift 2.2 or later
1717
- iOS 8.0 or later
1818
- Mac OS 10.9 or later
1919
- watch OS 2.0 or later

SwiftFlux/Action.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import Foundation
1010
import Result
1111

1212
public protocol Action {
13-
typealias Payload
14-
typealias Error: ErrorType = NSError
13+
associatedtype Payload
14+
associatedtype Error: ErrorType = NSError
1515
func invoke(dispatcher: Dispatcher)
1616
}
1717

0 commit comments

Comments
 (0)