Skip to content

Commit f3213e1

Browse files
authored
Merge pull request #38 from CodaFi/one-two-three-go
Finishing touches for Swift 3.0 compatibility
2 parents 7c046de + 8c039c3 commit f3213e1

26 files changed

+177
-480
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Xcode
22
.DS_Store
3+
.build/*
34
build/
45
*.pbxuser
56
!default.pbxuser

.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "typelift/SwiftCheck" "swift-develop"
1+
github "typelift/SwiftCheck"

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "typelift/SwiftCheck" "a260f94ae3cf5d430e8140ba3905d3d47663bff7"
1+
github "typelift/SwiftCheck" "v0.7.0"

Concurrent.xcodeproj/project.pbxproj

Lines changed: 12 additions & 48 deletions
Large diffs are not rendered by default.

Package.swift

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import PackageDescription
2+
3+
let package = Package(
4+
name: "Concurrent",
5+
targets: [
6+
Target(
7+
name: "Concurrent",
8+
dependencies: []),
9+
]
10+
)
11+

Sources/CONCRealWorld.h

Lines changed: 0 additions & 25 deletions
This file was deleted.

Sources/CONCRealWorld.m

Lines changed: 0 additions & 79 deletions
This file was deleted.

Sources/Chan.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
// Copyright (c) 2014 TypeLift. All rights reserved.
77
//
88

9-
/// Channels are unbounded FIFO streams of values with a read and write terminals comprised of
10-
/// MVars.
9+
/// Channels are unbounded FIFO streams of values with a read and write
10+
/// terminals comprised of `MVar`s.
1111
public struct Chan<A> {
12-
let readEnd : MVar<MVar<ChItem<A>>>
13-
let writeEnd : MVar<MVar<ChItem<A>>>
12+
fileprivate let readEnd : MVar<MVar<ChItem<A>>>
13+
fileprivate let writeEnd : MVar<MVar<ChItem<A>>>
1414

1515
private init(read : MVar<MVar<ChItem<A>>>, write: MVar<MVar<ChItem<A>>>) {
1616
self.readEnd = read
@@ -91,7 +91,7 @@ public struct Chan<A> {
9191
}
9292
}
9393

94-
internal struct ChItem<A> {
94+
private struct ChItem<A> {
9595
let val : () -> A
9696
let stream : () -> MVar<ChItem<A>>
9797

0 commit comments

Comments
 (0)