Merge pull request #94 from uber/sample-prepare_extension_merge-master

Move existing Sample into MVC folder
uber · Jun 15, 2018 · ade51db · ade51db
2 parents d78305e + 6b50ce0
commit ade51db
Show file tree

Hide file tree

Showing 30 changed files with 11 additions and 5 deletions.
diff --git a/Sample/Cartfile.resolved b/Sample/Cartfile.resolved
diff --git a/Sample/.gitignore → Sample/MVC/.gitignore b/Sample/.gitignore → Sample/MVC/.gitignore
diff --git a/Sample/Cartfile → Sample/MVC/Cartfile b/Sample/Cartfile → Sample/MVC/Cartfile
@@ -1,3 +1,3 @@
-github "https://github.com/uber/needle.git" ~> 0.4
+github "https://github.com/uber/needle.git" ~> 0.5
 github "https://github.com/ReactiveX/RxSwift.git" ~> 4.0
 github "https://github.com/SnapKit/SnapKit.git" ~> 4.0
diff --git a/Sample/MVC/Cartfile.resolved b/Sample/MVC/Cartfile.resolved
@@ -0,0 +1,3 @@
+github "ReactiveX/RxSwift" "4.2.0"
+github "SnapKit/SnapKit" "4.0.0"
+github "uber/needle" "v0.5.2"
diff --git a/Sample/TicTacToe/Sources/AppDelegate.swift → ...e/MVC/TicTacToe/Sources/AppDelegate.swift b/Sample/TicTacToe/Sources/AppDelegate.swift → ...e/MVC/TicTacToe/Sources/AppDelegate.swift
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...Toe/Sources/Assets.xcassets/Contents.json → ...Toe/Sources/Assets.xcassets/Contents.json b/...Toe/Sources/Assets.xcassets/Contents.json → ...Toe/Sources/Assets.xcassets/Contents.json
diff --git a/...ources/Base.lproj/LaunchScreen.storyboard → ...ources/Base.lproj/LaunchScreen.storyboard b/...ources/Base.lproj/LaunchScreen.storyboard → ...ources/Base.lproj/LaunchScreen.storyboard
diff --git a/...icTacToe/Sources/Game/GameComponent.swift → ...icTacToe/Sources/Game/GameComponent.swift b/...icTacToe/Sources/Game/GameComponent.swift → ...icTacToe/Sources/Game/GameComponent.swift
diff --git a/...Toe/Sources/Game/GameViewController.swift → ...Toe/Sources/Game/GameViewController.swift b/...Toe/Sources/Game/GameViewController.swift → ...Toe/Sources/Game/GameViewController.swift
diff --git a/Sample/TicTacToe/Sources/Info.plist → Sample/MVC/TicTacToe/Sources/Info.plist b/Sample/TicTacToe/Sources/Info.plist → Sample/MVC/TicTacToe/Sources/Info.plist
diff --git a/.../Sources/LoggedIn/LoggedInComponent.swift → .../Sources/LoggedIn/LoggedInComponent.swift b/.../Sources/LoggedIn/LoggedInComponent.swift → .../Sources/LoggedIn/LoggedInComponent.swift
diff --git a/...ces/LoggedIn/LoggedInViewController.swift → ...ces/LoggedIn/LoggedInViewController.swift b/...ces/LoggedIn/LoggedInViewController.swift → ...ces/LoggedIn/LoggedInViewController.swift
diff --git a/...TacToe/Sources/LoggedIn/ScoreStream.swift → ...TacToe/Sources/LoggedIn/ScoreStream.swift b/...TacToe/Sources/LoggedIn/ScoreStream.swift → ...TacToe/Sources/LoggedIn/ScoreStream.swift
diff --git a/...ources/LoggedOut/LoggedOutComponent.swift → ...ources/LoggedOut/LoggedOutComponent.swift b/...ources/LoggedOut/LoggedOutComponent.swift → ...ources/LoggedOut/LoggedOutComponent.swift
diff --git a/...s/LoggedOut/LoggedOutViewController.swift → ...s/LoggedOut/LoggedOutViewController.swift b/...s/LoggedOut/LoggedOutViewController.swift → ...s/LoggedOut/LoggedOutViewController.swift
diff --git a/...e/TicTacToe/Sources/NeedleGenerated.swift → ...C/TicTacToe/Sources/NeedleGenerated.swift b/...e/TicTacToe/Sources/NeedleGenerated.swift → ...C/TicTacToe/Sources/NeedleGenerated.swift
diff --git a/...icTacToe/Sources/Root/PlayersStream.swift → ...icTacToe/Sources/Root/PlayersStream.swift b/...icTacToe/Sources/Root/PlayersStream.swift → ...icTacToe/Sources/Root/PlayersStream.swift
diff --git a/...icTacToe/Sources/Root/RootComponent.swift → ...icTacToe/Sources/Root/RootComponent.swift b/...icTacToe/Sources/Root/RootComponent.swift → ...icTacToe/Sources/Root/RootComponent.swift
diff --git a/...Toe/Sources/Root/RootViewController.swift → ...Toe/Sources/Root/RootViewController.swift b/...Toe/Sources/Root/RootViewController.swift → ...Toe/Sources/Root/RootViewController.swift
diff --git a/...rces/ScoreSheet/ScoreSheetComponent.swift → ...rces/ScoreSheet/ScoreSheetComponent.swift b/...rces/ScoreSheet/ScoreSheetComponent.swift → ...rces/ScoreSheet/ScoreSheetComponent.swift
diff --git a/...ScoreSheet/ScoreSheetViewController.swift → ...ScoreSheet/ScoreSheetViewController.swift b/...ScoreSheet/ScoreSheetViewController.swift → ...ScoreSheet/ScoreSheetViewController.swift
diff --git a/Sample/TicTacToe/Tests/Info.plist → Sample/MVC/TicTacToe/Tests/Info.plist b/Sample/TicTacToe/Tests/Info.plist → Sample/MVC/TicTacToe/Tests/Info.plist
diff --git a/...acToe/Tests/RootViewControllerTests.swift → ...acToe/Tests/RootViewControllerTests.swift b/...acToe/Tests/RootViewControllerTests.swift → ...acToe/Tests/RootViewControllerTests.swift
diff --git a/...acToe/TicTacToe.xcodeproj/project.pbxproj → ...acToe/TicTacToe.xcodeproj/project.pbxproj b/...acToe/TicTacToe.xcodeproj/project.pbxproj → ...acToe/TicTacToe.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/...xcshareddata/WorkspaceSettings.xcsettings → ...xcshareddata/WorkspaceSettings.xcsettings b/...xcshareddata/WorkspaceSettings.xcsettings → ...xcshareddata/WorkspaceSettings.xcsettings
diff --git a/Sample/Pluginized/.gitignore b/Sample/Pluginized/.gitignore
@@ -0,0 +1,4 @@
+.DS_Store
+/.build
+/Packages
+/Carthage
diff --git a/Sample/README.md b/Sample/README.md
@@ -1,11 +1,13 @@
 # Sample App Using Needle
 
+The folder "MVC" contains the simple MVC architecture based TicTacToe app. The folder "Pluginized" contains the same TicTacToe app but built with a pluginized DI structure where the dependencies are divided into separate core and non-core trees.
+
 ## Build & Run TicTacToe
 
 Make sure [Carthage](https://github.com/Carthage/Carthage) is installed.
 
 ```
-$ carthage bootstrap --platform ios
+$ carthage update --platform ios
 ```
 
 Open the TicTacToe.xcodeproj to build and run the game.