Merge pull request #255 from CodaFi/forward-march

Swift 2.0 Support

.gitignore

@@ -16,3 +16,8 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
+*.xcscmblueprint
+*.resolved
+Carthage/Build
+Carthage/Checkouts
+

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "Carthage/Checkouts/SwiftCheck"]
 	path = Carthage/Checkouts/SwiftCheck
 	url = https://github.com/typelift/SwiftCheck.git
+[submodule "Carthage/Checkouts/Operadics"]
+	path = Carthage/Checkouts/Operadics
+	url = https://github.com/typelift/Operadics.git

.travis.yml

@@ -1,10 +1,12 @@
 language: objective-c
-osx_image: beta-xcode6.3
+osx_image: xcode7
 
-install: 
+before_install:
+    - gem install xcpretty-travis-formatter --no-rdoc --no-ri --no-document --quiet
+
+install:
     - git submodule update -i --recursive
 
 script:
-    - xctool -project Swiftz.xcodeproj -scheme Swiftz -sdk macosx ONLY_ACTIVE_ARCH=NO clean build test
-    - xctool -project Swiftz.xcodeproj -scheme Swiftz-iOS -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO clean build test
-
+    - set -o pipefail && xcodebuild -project Swiftz.xcodeproj -scheme Swiftz -sdk macosx ONLY_ACTIVE_ARCH=NO clean build test | xcpretty -c -f `xcpretty-travis-formatter`
+    - set -o pipefail && xcodebuild -project Swiftz.xcodeproj -scheme Swiftz-iOS -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO clean build test | xcpretty -c -f `xcpretty-travis-formatter`

Cartfile.private

@@ -1,2 +1,4 @@
 github "typelift/Swiftx"
 github "typelift/SwiftCheck"
+github "typelift/Operadics"
+

Cartfile.resolved

@@ -1,2 +1,3 @@
-github "typelift/SwiftCheck" "v0.2.6"
-github "typelift/Swiftx" "v0.2.1"
+github "typelift/Operadics" "0.1.4"
+github "typelift/SwiftCheck" "v0.3.1"
+github "typelift/Swiftx" "v0.3.0"

README.md

@@ -52,7 +52,7 @@ the library rely on their combinatorial semantics to allow declarative ideas to
 be expressed more clearly in Swift.
 
 Swiftz is a proper superset of [Swiftx](https://github.com/typelift/Swiftx) that
-implements higher-level data types like Lenses, Zippers, HLists, and a number of
+implements higher-level data types like Arrows, Lists, HLists, and a number of
 typeclasses integral to programming with the maximum amount of support from the
 type system.
 
@@ -112,11 +112,6 @@ public class User : JSONDecodable {
 			<*> x <? "tweets" 
 			<*> x <? "attrs" <> "one" // A nested keypath
     }
-
-    // lens example
-    public class func luserName() -> Lens<User, User, String, String> {
-        return Lens { user in IxStore(user.name) { User($0, user.age, user.tweets, user.attr) } }
-    }
 }
 
 public func ==(lhs : User, rhs : User) -> Bool {
@@ -129,55 +124,7 @@ let userjs = "{\"name\": \"max\", \"age\": 10, \"tweets\": [\"hello\"], \"attrs\
 //: the user would be nil.
 let user : User? = JSONValue.decode(userjs) >>- User.fromJSON // .Some( User("max", 10, ["hello"], "1") )
 ```
-
-**Lenses**
-
-```swift
-import struct Swiftz.Lens
-import struct Swiftz.IxStore
-
-//: A party has a host, who is a user.
-final class Party {
-    let host : User
-
-    init(h : User) {
-        host = h
-    }
-
-    class func lpartyHost() -> Lens<Party, Party, User, User> {
-        let getter = { (party : Party) -> User in
-            party.host
-        }
-
-        let setter = { (party : Party, host : User) -> Party in
-            Party(h: host)
-        }
-
-        return Lens(get: getter, set: setter)
-    }
-}
-
-//: A Lens for the User's name.
-extension User {
-    public class func luserName() -> Lens<User, User, String, String> {
-        return Lens { user in IxStore(user.name) { User($0, user.age, user.tweets, user.attrs) } }
-    }
-}
-
-//: Let's throw a party now.
-let party = Party(h: User("max", 1, [], Dictionary()))
-
-//: A lens for a party host's name.
-let hostnameLens = Party.lpartyHost() • User.luserName()
-
-//: Retrieve our gracious host's name.
-let name = hostnameLens.get(party) // "max"
-
-//: Our party seems to be lacking in proper nouns. 
-let updatedParty = (Party.lpartyHost() • User.luserName()).set(party, "Max")
-let properName = hostnameLens.get(updatedParty) // "Max"
-```
-
+
 **Semigroups and Monoids**
 
 ```swift

Swiftz.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name        = "Swiftz"
-  s.version     = "0.2.4"
+  s.version     = "0.3.0"
   s.summary     = "Swiftz is a Swift library for functional programming."
   s.homepage    = "https://github.com/typelift/Swiftz"
   s.license     = { :type => "BSD" }
@@ -10,6 +10,5 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = "10.9"
   s.ios.deployment_target = "8.0"
   s.source   = { :git => "https://github.com/typelift/Swiftz.git", :tag => "v#{s.version}", :submodules => true }
-  s.source_files = "Swiftz/*.swift", "**/Swiftx/*.swift"
-  s.exclude_files = "**/Swiftx/Operators.swift"
+  s.source_files = "Swiftz/*.swift", "**/Swiftx/*.swift", "**/Operadics/*.swift"
 end