Update to Swift 2.2

uphold · Apr 1, 2016 · 5e451b5 · 5e451b5
1 parent eb87e87
commit 5e451b5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: objective-c
 
-osx_image: xcode7.1
+osx_image: xcode7.3
 
 env:
   - SCHEME=UpholdSdk
@@ -10,9 +10,11 @@ before_script:
   - brew update
   - brew install carthage
   - brew install swiftlint
+  # Workaround to fix xctool issue #666(https://github.com/facebook/xctool/issues/666)
+  - brew reinstall --HEAD xctool
   - carthage update --platform iOS
   # Workaround introduced to fix the xctool issue #454 (https://github.com/facebook/xctool/issues/454).
-  - open /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app --args -CurrentDeviceUDID 4E51E3C5-611D-403E-8EFD-1DA15203C4DF
+  - open /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app --args -CurrentDeviceUDID 75FC400A-B2AA-4DD6-B159-8687FAA5018A
 
 script:
   - swiftlint lint --strict

diff --git a/Source/Paginator/Paginator.swift b/Source/Paginator/Paginator.swift
@@ -62,7 +62,7 @@ public class Paginator<T>: PaginatorProtocol {
     */
     public func getNext() -> Promise<[T]> {
         defer {
-            currentPage++
+            currentPage += 1
 
             objc_sync_exit(self.currentPage)
         }

diff --git a/Source/Paginator/PaginatorProtocol.swift b/Source/Paginator/PaginatorProtocol.swift
@@ -6,7 +6,7 @@ import PromiseKit
 protocol PaginatorProtocol {
 
     /// Paginator generic type.
-    typealias T
+    associatedtype T
 
     /**
       A closure to get a promise with the total number of elements.