Merge pull request #36 from RxSwiftCommunity/fix/restructureProject

Restructures the project.

Author: esttorhe

.gitignore

@@ -30,6 +30,8 @@ DerivedData
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
 # Carthage/Checkouts
 
-Carthage
+Carthage/Build
+Demo/Pods
+Build
 vendor
 .vendor

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Carthage/Checkouts/RxSwift"]
+	path = Carthage/Checkouts/RxSwift
+	url = https://github.com/ReactiveX/RxSwift.git

.swiftlint.yml

@@ -10,10 +10,12 @@ opt_in_rules:
   - force_unwrapping
 
 included:
-  - Pod/Classes
+  - "Source"
 
 excluded:
-  - Example
+  - Demo
+  - Pods
+  - Carthage
 
 function_body_length:
   warning: 50

.travis.yml

@@ -1,45 +1,28 @@
 language: objective-c
 osx_image: xcode7.3
-cache: 
-  directories:
-  - $HOME/.cocoapods/repos
 rvm:
   - "2.3.1"
 
-before_install:
-  - brew install swiftlint
-
-install:
-  - make bootstrap
-
 env:
   global:
     - LC_CTYPE=en_US.UTF-8
     - LANG=en_US.UTF-8
-    - IOS_SDK=iphonesimulator9.3
-    - SCHEME="RxViewModel_Tests"
   matrix:
-    - DESTINATION="OS=9.3,name=iPhone 6"     SCHEME="$SCHEME"     SDK="$IOS_SDK"     ACTION="test"
+    - OS=ios
+    - OS=macos
+    - OS=tvos
+
+before_install:
+  - brew install swiftlint
+
+install:
+  - gem install bundler --no-doc --no-ri
+  - bundle install --path="./.vendor/bundle"
+  - rake bootstrap
 
 script:
-  - set -o pipefail
-  - xcodebuild -version
-  - xcodebuild -showsdks
-  - xcodebuild
-   -sdk iphonesimulator
-   -destination "platform=iOS Simulator,OS=9.3,name=iPhone 6"
-   -workspace Example/RxViewModel.xcworkspace
-   -scheme "$SCHEME"
-   -enableCodeCoverage YES
-   clean test
-   CODE_SIGNING_REQUIRED=NO
-   CODE_SIGN_IDENTITY=
-   PROVISIONING_PROFILE=
-   ONLY_ACTIVE_ARCH=YES
-   GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES
-   GCC_GENERATE_TEST_COVERAGE_FILES=YES |
-      bundle exec xcpretty --color --report junit
-  - bundle exec danger
+  - bundle exec rake test[$OS]
 
 after_success:
+  - bundle exec danger
   - bash <(curl -s https://codecov.io/bash)

Cartfile

@@ -0,0 +1 @@
+github "ReactiveX/RxSwift" ~> 2.5

Cartfile.resolved

@@ -0,0 +1 @@
+github "ReactiveX/RxSwift" "2.6.0"

Carthage/Checkouts/RxSwift

@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9DA6EC88A6C7765E3C372247E92BD44A"
-               BuildableName = "RxViewModel.framework"
-               BlueprintName = "RxViewModel"
-               ReferencedContainer = "container:Pods.xcodeproj">
+               BlueprintIdentifier = "1168B9761D2DFF2A00784841"
+               BuildableName = "Demo.app"
+               BlueprintName = "Demo"
+               ReferencedContainer = "container:Demo.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -34,19 +34,19 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "607FACE41AFB9204008FA782"
-               BuildableName = "RxViewModel_Tests.xctest"
-               BlueprintName = "RxViewModel_Tests"
-               ReferencedContainer = "container:../RxViewModel.xcodeproj">
+               BuildableName = "RxViewModelTests-iOS.xctest"
+               BlueprintName = "RxViewModelTests-iOS"
+               ReferencedContainer = "container:Demo.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "9DA6EC88A6C7765E3C372247E92BD44A"
-            BuildableName = "RxViewModel.framework"
-            BlueprintName = "RxViewModel"
-            ReferencedContainer = "container:Pods.xcodeproj">
+            BlueprintIdentifier = "1168B9761D2DFF2A00784841"
+            BuildableName = "Demo.app"
+            BlueprintName = "Demo"
+            ReferencedContainer = "container:Demo.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -62,15 +62,16 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "9DA6EC88A6C7765E3C372247E92BD44A"
-            BuildableName = "RxViewModel.framework"
-            BlueprintName = "RxViewModel"
-            ReferencedContainer = "container:Pods.xcodeproj">
+            BlueprintIdentifier = "1168B9761D2DFF2A00784841"
+            BuildableName = "Demo.app"
+            BlueprintName = "Demo"
+            ReferencedContainer = "container:Demo.xcodeproj">
          </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
@@ -80,15 +81,16 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "9DA6EC88A6C7765E3C372247E92BD44A"
-            BuildableName = "RxViewModel.framework"
-            BlueprintName = "RxViewModel"
-            ReferencedContainer = "container:Pods.xcodeproj">
+            BlueprintIdentifier = "1168B9761D2DFF2A00784841"
+            BuildableName = "Demo.app"
+            BlueprintName = "Demo"
+            ReferencedContainer = "container:Demo.xcodeproj">
          </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">