Skip to content

Commit

Permalink
project: folders refactoring
Browse files Browse the repository at this point in the history
This commit moves the RxFlow project in the root folder to
make Carthage work.
  • Loading branch information
twittemb committed Jan 10, 2018
1 parent e7a77ac commit 604448b
Show file tree
Hide file tree
Showing 69 changed files with 660 additions and 178 deletions.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ before_install:
- brew update
- brew outdated carthage || brew upgrade carthage
- brew outdated swiftlint || brew upgrade swiftlint
- cd RxFlow
- carthage bootstrap --verbose --platform iOS --cache-builds
script:
- xcodebuild clean test -project RxFlow.xcodeproj -scheme RxFlow -destination "platform=iOS Simulator,name=iPhone 8,OS=11.0" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO -quiet | xcpretty -c
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions RxFlow/RxFlow.podspec → RxFlow.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "RxFlow"
s.version = "1.0.3"
s.version = "1.0.4"
s.summary = "RxFlow is a navigation framework for iOS applications, based on a Reactive Coordinator pattern."

s.description = <<-DESC
Expand All @@ -24,7 +24,7 @@ RxFlow aims to
s.platform = :ios
s.ios.deployment_target = "9.0"
s.source = { :git => "https://github.com/RxSwiftCommunity/RxFlow.git", :tag => s.version.to_s }
s.source_files = "RxFlow/RxFlow/**/*.swift"
s.source_files = "RxFlow/**/*.swift"
s.frameworks = 'UIKit'
s.requires_arc = true
s.dependency 'RxSwift', '>= 4.0.0'
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion RxFlow.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 8 additions & 8 deletions RxFlowDemo/RxFlowDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
1A7217901FFDAB4600163FA1 /* RxFlow.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A72178F1FFDAB4600163FA1 /* RxFlow.framework */; };
1A7217911FFDAB4600163FA1 /* RxFlow.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1A72178F1FFDAB4600163FA1 /* RxFlow.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1A8FBE101FF845EE00389464 /* Reusable.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A8FBE0D1FF845EE00389464 /* Reusable.framework */; };
1A8FBE111FF845EE00389464 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A8FBE0E1FF845EE00389464 /* RxSwift.framework */; };
1A8FBE121FF845EE00389464 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A8FBE0F1FF845EE00389464 /* RxCocoa.framework */; };
Expand Down Expand Up @@ -47,27 +45,28 @@
1A8FBE6E1FF84C2C00389464 /* WatchedViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1A8FBE6B1FF84C2B00389464 /* WatchedViewController.storyboard */; };
1A8FBE6F1FF84C2C00389464 /* WatchedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A8FBE6C1FF84C2B00389464 /* WatchedViewController.swift */; };
1A8FBE701FF84C2C00389464 /* WatchedViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A8FBE6D1FF84C2C00389464 /* WatchedViewModel.swift */; };
1A98BA4F2006702D008529C9 /* RxFlow.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A98BA4E2006702D008529C9 /* RxFlow.framework */; };
1A98BA502006702D008529C9 /* RxFlow.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1A98BA4E2006702D008529C9 /* RxFlow.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1AF854B31FF832AE00271B52 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AF854B21FF832AE00271B52 /* AppDelegate.swift */; };
1AF854BA1FF832AE00271B52 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1AF854B91FF832AE00271B52 /* Assets.xcassets */; };
1AF854BD1FF832AE00271B52 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1AF854BB1FF832AE00271B52 /* LaunchScreen.storyboard */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
1A7217921FFDAB4600163FA1 /* Embed Frameworks */ = {
1A98BA4D20067021008529C9 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
1A7217911FFDAB4600163FA1 /* RxFlow.framework in Embed Frameworks */,
1A98BA502006702D008529C9 /* RxFlow.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
1A72178F1FFDAB4600163FA1 /* RxFlow.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RxFlow.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1A8FBE0D1FF845EE00389464 /* Reusable.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Reusable.framework; path = Carthage/Build/iOS/Reusable.framework; sourceTree = "<group>"; };
1A8FBE0E1FF845EE00389464 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = "<group>"; };
1A8FBE0F1FF845EE00389464 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/iOS/RxCocoa.framework; sourceTree = "<group>"; };
Expand Down Expand Up @@ -106,6 +105,7 @@
1A8FBE6B1FF84C2B00389464 /* WatchedViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = WatchedViewController.storyboard; sourceTree = "<group>"; };
1A8FBE6C1FF84C2B00389464 /* WatchedViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WatchedViewController.swift; sourceTree = "<group>"; };
1A8FBE6D1FF84C2C00389464 /* WatchedViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WatchedViewModel.swift; sourceTree = "<group>"; };
1A98BA4E2006702D008529C9 /* RxFlow.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RxFlow.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1AF854AF1FF832AE00271B52 /* RxFlowDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RxFlowDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
1AF854B21FF832AE00271B52 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
1AF854B91FF832AE00271B52 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
Expand All @@ -120,7 +120,7 @@
files = (
1A8FBE101FF845EE00389464 /* Reusable.framework in Frameworks */,
1A8FBE111FF845EE00389464 /* RxSwift.framework in Frameworks */,
1A7217901FFDAB4600163FA1 /* RxFlow.framework in Frameworks */,
1A98BA4F2006702D008529C9 /* RxFlow.framework in Frameworks */,
1A8FBE121FF845EE00389464 /* RxCocoa.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -259,7 +259,7 @@
1AF854A61FF832AE00271B52 = {
isa = PBXGroup;
children = (
1A72178F1FFDAB4600163FA1 /* RxFlow.framework */,
1A98BA4E2006702D008529C9 /* RxFlow.framework */,
1AF854B11FF832AE00271B52 /* RxFlowDemo */,
1AF854B01FF832AE00271B52 /* Products */,
1A8FBE0C1FF845EE00389464 /* Frameworks */,
Expand Down Expand Up @@ -302,7 +302,7 @@
1AF854AB1FF832AE00271B52 /* Sources */,
1AF854AC1FF832AE00271B52 /* Frameworks */,
1AF854AD1FF832AE00271B52 /* Resources */,
1A7217921FFDAB4600163FA1 /* Embed Frameworks */,
1A98BA4D20067021008529C9 /* Embed Frameworks */,
);
buildRules = (
);
Expand Down

This file was deleted.

File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/Classes.html
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ <h4>Declaration</h4>
</section>
</section>
<section id="footer">
<p>&copy; 2017 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg</a>. All rights reserved. (Last updated: 2017-12-30)</p>
<p>&copy; 2018 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg and RxSwiftCommunity</a>. All rights reserved. (Last updated: 2018-01-10)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</article>
Expand Down
2 changes: 1 addition & 1 deletion docs/Classes/Coordinator.html
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ <h4>Declaration</h4>
</section>
</section>
<section id="footer">
<p>&copy; 2017 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg</a>. All rights reserved. (Last updated: 2017-12-30)</p>
<p>&copy; 2018 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg and RxSwiftCommunity</a>. All rights reserved. (Last updated: 2018-01-10)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</article>
Expand Down
2 changes: 1 addition & 1 deletion docs/Classes/Flows.html
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ <h4>Parameters</h4>
</section>
</section>
<section id="footer">
<p>&copy; 2017 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg</a>. All rights reserved. (Last updated: 2017-12-30)</p>
<p>&copy; 2018 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg and RxSwiftCommunity</a>. All rights reserved. (Last updated: 2018-01-10)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</article>
Expand Down
2 changes: 1 addition & 1 deletion docs/Classes/OneStepper.html
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ <h4>Parameters</h4>
</section>
</section>
<section id="footer">
<p>&copy; 2017 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg</a>. All rights reserved. (Last updated: 2017-12-30)</p>
<p>&copy; 2018 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg and RxSwiftCommunity</a>. All rights reserved. (Last updated: 2018-01-10)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</article>
Expand Down
2 changes: 1 addition & 1 deletion docs/Extensions.html
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ <h4>Declaration</h4>
</section>
</section>
<section id="footer">
<p>&copy; 2017 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg</a>. All rights reserved. (Last updated: 2017-12-30)</p>
<p>&copy; 2018 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg and RxSwiftCommunity</a>. All rights reserved. (Last updated: 2018-01-10)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</article>
Expand Down
2 changes: 1 addition & 1 deletion docs/Extensions/ObservableType.html
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ <h4>Return Value</h4>
</section>
</section>
<section id="footer">
<p>&copy; 2017 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg</a>. All rights reserved. (Last updated: 2017-12-30)</p>
<p>&copy; 2018 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg and RxSwiftCommunity</a>. All rights reserved. (Last updated: 2018-01-10)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</article>
Expand Down
2 changes: 1 addition & 1 deletion docs/Extensions/Reactive.html
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ <h4>Declaration</h4>
</section>
</section>
<section id="footer">
<p>&copy; 2017 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg</a>. All rights reserved. (Last updated: 2017-12-30)</p>
<p>&copy; 2018 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg and RxSwiftCommunity</a>. All rights reserved. (Last updated: 2018-01-10)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</article>
Expand Down
2 changes: 1 addition & 1 deletion docs/Extensions/UIViewController.html
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ <h4>Declaration</h4>
</section>
</section>
<section id="footer">
<p>&copy; 2017 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg</a>. All rights reserved. (Last updated: 2017-12-30)</p>
<p>&copy; 2018 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg and RxSwiftCommunity</a>. All rights reserved. (Last updated: 2018-01-10)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</article>
Expand Down
2 changes: 1 addition & 1 deletion docs/Extensions/UIWindow.html
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ <h4>Declaration</h4>
</section>
</section>
<section id="footer">
<p>&copy; 2017 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg</a>. All rights reserved. (Last updated: 2017-12-30)</p>
<p>&copy; 2018 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg and RxSwiftCommunity</a>. All rights reserved. (Last updated: 2018-01-10)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</article>
Expand Down
2 changes: 1 addition & 1 deletion docs/Protocols.html
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ <h4>Declaration</h4>
</section>
</section>
<section id="footer">
<p>&copy; 2017 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg</a>. All rights reserved. (Last updated: 2017-12-30)</p>
<p>&copy; 2018 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg and RxSwiftCommunity</a>. All rights reserved. (Last updated: 2018-01-10)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</article>
Expand Down
2 changes: 1 addition & 1 deletion docs/Protocols/Flow.html
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ <h4>Declaration</h4>
</section>
</section>
<section id="footer">
<p>&copy; 2017 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg</a>. All rights reserved. (Last updated: 2017-12-30)</p>
<p>&copy; 2018 <a class="link" href="https://github.com/RxSwiftCommunity/RxFlow" target="_blank" rel="external">Thibault Wittemberg and RxSwiftCommunity</a>. All rights reserved. (Last updated: 2018-01-10)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</article>
Expand Down
Loading

0 comments on commit 604448b

Please sign in to comment.