Skip to content

Commit 0fd6c4c

Browse files
ishkawaishkawa
committed
Merge branch 'reorganize-project-layout' into swift-3
2 parents fdd5e7d + 1c9d3e8 commit 0fd6c4c

File tree

30 files changed

+461
-1534
lines changed

30 files changed

+461
-1534
lines changed

‎.gitmodules‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[submodule "Carthage/Checkouts/RxSwift"]
2+
path = Carthage/Checkouts/RxSwift
3+
url = https://github.com/ReactiveX/RxSwift.git
4+
[submodule "Carthage/Checkouts/Quick"]
5+
path = Carthage/Checkouts/Quick
6+
url = https://github.com/Quick/Quick.git
7+
[submodule "Carthage/Checkouts/Nimble"]
8+
path = Carthage/Checkouts/Nimble
9+
url = https://github.com/Quick/Nimble.git

‎.travis.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
osx_image: xcode7.3
1+
os: osx
22
language: objective-c
3-
podfile: Demo/Podfile
4-
cache: cocoapods
3+
osx_image: xcode8
4+
5+
script:
6+
- set -o pipefail
7+
- xcodebuild build-for-testing test-without-building -workspace Action.xcworkspace -scheme Action -sdk iphonesimulator -destination "name=iPhone SE" | xcpretty -c
58

6-
script: cd Demo ; set -o pipefail && xcodebuild -workspace 'Demo.xcworkspace' -scheme 'Demo' -configuration 'Debug' -sdk iphonesimulator -destination platform='iOS Simulator',OS='9.1',name='iPhone 6s' build test | xcpretty -c --test

‎Action.xcodeproj/project.pbxproj‎

Lines changed: 347 additions & 30 deletions
Large diffs are not rendered by default.

‎Action.xcodeproj/xcshareddata/xcschemes/Action.xcscheme‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,26 @@
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "7F5E6A661D7F08D2000B6076"
36+
BuildableName = "Tests.xctest"
37+
BlueprintName = "Tests"
38+
ReferencedContainer = "container:Action.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
3141
</Testables>
42+
<MacroExpansion>
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "BE73AD1F1CDCD101006F8B98"
46+
BuildableName = "Action.framework"
47+
BlueprintName = "Action"
48+
ReferencedContainer = "container:Action.xcodeproj">
49+
</BuildableReference>
50+
</MacroExpansion>
3251
<AdditionalOptions>
3352
</AdditionalOptions>
3453
</TestAction>

‎Action.xcworkspace/contents.xcworkspacedata‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Action.xcworkspace/xcshareddata/Action.xcscmblueprint‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "EE83DA14852173089C59631969EDB7A9A8713EC2",
3+
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
4+
5+
},
6+
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
7+
"95438028B10BBB846574013D29F154A00556A9D1" : 9223372036854775807,
8+
"8B123162C394A0A0A138779108E4C59DD771865A" : 0,
9+
"D0725CAC6FF2D66F2C83C2C48DC12106D42DAA64" : 9223372036854775807,
10+
"EE83DA14852173089C59631969EDB7A9A8713EC2" : 0
11+
},
12+
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "26078A82-DCD2-4B72-8C8E-CBFF0FFF9C36",
13+
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
14+
"95438028B10BBB846574013D29F154A00556A9D1" : "Action\/Carthage\/Checkouts\/Nimble\/",
15+
"8B123162C394A0A0A138779108E4C59DD771865A" : "Action\/Carthage\/Checkouts\/RxSwift\/",
16+
"D0725CAC6FF2D66F2C83C2C48DC12106D42DAA64" : "Action\/Carthage\/Checkouts\/Quick\/",
17+
"EE83DA14852173089C59631969EDB7A9A8713EC2" : "Action\/"
18+
},
19+
"DVTSourceControlWorkspaceBlueprintNameKey" : "Action",
20+
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
21+
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Action.xcworkspace",
22+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
23+
{
24+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/ReactiveX\/RxSwift.git",
25+
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
26+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "8B123162C394A0A0A138779108E4C59DD771865A"
27+
},
28+
{
29+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Quick\/Nimble.git",
30+
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
31+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "95438028B10BBB846574013D29F154A00556A9D1"
32+
},
33+
{
34+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Quick\/Quick.git",
35+
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
36+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D0725CAC6FF2D66F2C83C2C48DC12106D42DAA64"
37+
},
38+
{
39+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/RxSwiftCommunity\/Action.git",
40+
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
41+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "EE83DA14852173089C59631969EDB7A9A8713EC2"
42+
}
43+
]
44+
}

‎Cartfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" "develop"
1+
github "ReactiveX/RxSwift" "3.0.0-beta.1"

‎Cartfile.private‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github "Quick/Quick" "swift-3.0"
2+
github "Quick/Nimble" "master"

‎Cartfile.resolved‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
github "ReactiveX/RxSwift" "c99a49aa66ea830780bd3be1f11b3bac2b690c90"
1+
github "Quick/Nimble" "db706fc1d7130f6ac96c56aaf0e635fa3217fe57"
2+
github "Quick/Quick" "1503fb019d72417d5d6e4fbebdbaa03c9e4a125f"
3+
github "ReactiveX/RxSwift" "3.0.0-beta.1"

‎Carthage/Checkouts/Nimble‎

Submodule Nimble added at db706fc

0 commit comments

Comments
 (0)