Skip to content

Commit ac2d348

Browse files
authored
Merge pull request #313 from CodaFi/one-two-three-go
Update to Xcode 8 GM
2 parents 72b3393 + 4881386 commit ac2d348

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1243
-1004
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Xcode
22
.DS_Store
33
build/
4+
.build/*
5+
Packages/*
46
*.pbxuser
57
!default.pbxuser
68
*.mode1v3

.travis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,11 @@ matrix:
3737
before_install:
3838
- git submodule update --init --recursive
3939
- wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
40-
- wget https://swift.org/builds/swift-3.0-preview-6/ubuntu1404/swift-3.0-PREVIEW-6/swift-3.0-PREVIEW-6-ubuntu14.04.tar.gz
41-
- tar xzf swift-3.0-PREVIEW-6-ubuntu14.04.tar.gz
42-
- export PATH=${PWD}/swift-3.0-PREVIEW-6-ubuntu14.04/usr/bin:"${PATH}"
40+
- wget https://swift.org/builds/swift-3.0-release/ubuntu1404/swift-3.0-RELEASE/swift-3.0-RELEASE-ubuntu14.04.tar.gz
41+
- tar xzf swift-3.0-RELEASE-ubuntu14.04.tar.gz
42+
- export PATH=${PWD}/swift-3.0-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
4343
script:
44-
# Uncomment when releasing Swift 3.0
45-
# - swift build
44+
- swift build
4645
notifications:
4746
webhooks:
4847
urls:

Cartfile.private

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "typelift/Swiftx" "swift-develop"
2-
github "typelift/SwiftCheck" "swift-develop"
3-
github "typelift/Operadics" "swift-develop"
1+
github "typelift/Swiftx"
2+
github "typelift/SwiftCheck"
3+
github "typelift/Operadics"
44

Cartfile.resolved

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "typelift/Operadics" "464d5c1c67866a372d8ae226c5dc2a1372a2320b"
2-
github "typelift/SwiftCheck" "bd5d620660b3fb2356dea89573baa99e7f3c1c28"
3-
github "typelift/Swiftx" "dd5396912d08101f1fac0e6c229ec2f0ad4a242b"
1+
github "typelift/Operadics" "0.2.2"
2+
github "typelift/SwiftCheck" "v0.7.0"
3+
github "typelift/Swiftx" "0.5.0"

Package.swift

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import PackageDescription
2+
3+
let package = Package(
4+
name: "Swiftz",
5+
targets: [
6+
Target(name: "Swiftz")
7+
],
8+
dependencies: [
9+
.Package(url: "https://github.com/typelift/Operadics.git", versions: Version(0,2,2)...Version(0,2,2)),
10+
.Package(url: "https://github.com/typelift/Swiftx.git", versions: Version(0,5,0)...Version(0,5,0)),
11+
]
12+
)
13+
14+
let libSwiftz = Product(name: "Swiftz", type: .Library(.Dynamic), modules: "Swiftz")
15+
products.append(libSwiftz)
16+
Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,26 @@
33
// Swiftz
44
//
55
// Created by Maxwell Swadling on 15/06/2014.
6-
// Copyright (c) 2014 Maxwell Swadling. All rights reserved.
6+
// Copyright (c) 2014-2016 Maxwell Swadling. All rights reserved.
77
//
88

9-
/// Applicative sits in the middle distance between a Functor and a Monad. An Applicative Functor
10-
/// is a Functor equipped with a function (called point or pure) that takes a value to an instance
11-
/// of a functor containing that value. Applicative Functors provide the ability to operate on not
12-
/// just values, but values in a functorial context such as Eithers, Lists, and Optionals without
9+
/// Applicative sits in the middle distance between a Functor and a Monad. An
10+
/// Applicative Functor is a Functor equipped with a function (called point or
11+
/// pure) that takes a value to an instance of a functor containing that value.
12+
/// Applicative Functors provide the ability to operate on not just values, but
13+
/// values in a functorial context such as Eithers, Lists, and Optionals without
1314
/// needing to unwrap or map over their contents.
1415
public protocol Applicative : Pointed, Functor {
1516
/// Type of Functors containing morphisms from our objects to a target.
1617
associatedtype FAB = K1<(A) -> B>
1718

18-
/// Applies the function encapsulated by the Functor to the value encapsulated by the receiver.
19+
/// Applies the function encapsulated by the Functor to the value
20+
/// encapsulated by the receiver.
1921
func ap(_ f : FAB) -> FB
2022
}
2123

22-
/// Additional functions to be implemented by those types conforming to the Applicative protocol.
24+
/// Additional functions to be implemented by those types conforming to the
25+
/// Applicative protocol.
2326
public protocol ApplicativeOps : Applicative {
2427
associatedtype C
2528
associatedtype FC = K1<C>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
// Copyright (c) 2014 Maxwell Swadling. All rights reserved.
77
//
88

9+
#if !XCODE_BUILD
10+
import Operadics
11+
import Swiftx
12+
#endif
13+
914
/// MARK: Array extensions
1015

1116
public enum ArrayMatcher<A> {

0 commit comments

Comments
 (0)