Skip to content

Commit 6d8d3f8

Browse files
andersioandersio
committed
Merge branch 'master' into property-lifetime
# Conflicts: # ReactiveCocoa/Swift/Property.swift
2 parents e23ce05 + b711611 commit 6d8d3f8

40 files changed

+427
-401
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@ profile
1515
*.moved-aside
1616
PlaygroundUtility.remap
1717

18+
# SwiftPM
19+
.build
20+
21+
# Carthage
1822
Carthage/Build

‎.gitmodules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[submodule "Carthage/Checkouts/Nimble"]
22
path = Carthage/Checkouts/Nimble
3-
url = https://github.com/andersio/Nimble.git
3+
url = https://github.com/ikesyo/Nimble.git
44
[submodule "Carthage/Checkouts/Quick"]
55
path = Carthage/Checkouts/Quick
6-
url = https://github.com/norio-nomura/Quick.git
6+
url = https://github.com/ikesyo/Quick.git
77
[submodule "Carthage/Checkouts/xcconfigs"]
88
path = Carthage/Checkouts/xcconfigs
99
url = https://github.com/jspahrsummers/xcconfigs.git

‎.swift-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0-PREVIEW-4

‎.travis.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ matrix:
3838
- carthage build --no-skip-current
3939
env:
4040
- JOB=CARTHAGE
41+
- os: osx
42+
language: generic
43+
script: swift build
44+
env:
45+
- JOB=SWIFTPM_DARWIN
4146
notifications:
4247
email: false
4348
slack:

‎Cartfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "antitypical/Result" "3.0.0-alpha.2"
1+
github "antitypical/Result" "3.0.0-alpha.3"

‎Cartfile.private‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "jspahrsummers/xcconfigs" "1ef9763"
2-
github "norio-nomura/Quick" "nn-swift-3-compatibility"
3-
github "andersio/Nimble" "swift3-beta-4"
2+
github "ikesyo/Quick" "xcode8-beta6"
3+
github "ikesyo/Nimble" "swift3-beta-6"

‎Cartfile.resolved‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "andersio/Nimble" "7c0762319cd5c902a85b92722a0659cc33cd6338"
2-
github "norio-nomura/Quick" "eaf60d980d88ffefd8c3a7515f53547453d5938b"
3-
github "antitypical/Result" "3.0.0-alpha.2"
1+
github "ikesyo/Nimble" "4f38620db52b81eef4298492fed057247308b5d6"
2+
github "ikesyo/Quick" "e14bf151a4c864e6f144559e7b7c09bca0fd38c1"
3+
github "antitypical/Result" "3.0.0-alpha.3"
44
github "jspahrsummers/xcconfigs" "1ef97639ffbe041da0b1392b2114fa19b922a7a1"

‎Carthage/Checkouts/Nimble‎

Submodule Nimble updated 102 files

‎Carthage/Checkouts/Quick‎

Submodule Quick updated 56 files

‎Carthage/Checkouts/Result‎

0 commit comments

Comments
 (0)