New 'AppRouter/Route' subspec.

'AppRouter/RxSwift' methods uses Signal's instead of Observables. Presenter methods (push, present, setAsRoot) becomes throwable instead of returning optionals. New presenter configurable action called 'show'. Presenter supports multiple configurations (by providing different labels alongside configuration block)
MLSDev · Jul 27, 2018 · 70f6f4c · 70f6f4c
1 parent 407d2b5
commit 70f6f4c
Show file tree

Hide file tree

Showing 37 changed files with 1,341 additions and 769 deletions.
diff --git a/.gitignore b/.gitignore
@@ -51,6 +51,7 @@ playground.xcworkspace
 # Carthage/Checkouts
 
 Carthage/Build
+Carthage/Checkouts
 
 # fastlane
 #

diff --git a/.gitmodules b/.gitmodules
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,18 @@
+language: objective-c
+osx_image: xcode9.3
+cache:
+  directories:
+  - Carthage
 matrix:
   include:
-    - os: osx
-      env: ACTION=iOS
-
-language: objective-c
-osx_image: xcode9.1
-
+  - os: osx
+    env: ACTION=iOS
+before_script:
+- brew update
+- brew outdated carthage || brew upgrade carthage
+- carthage bootstrap --cache-builds
 script:
-  - git submodule update --init --recursive
-  - make install-$ACTION && make test-$ACTION
+- make install-$ACTION && make test-$ACTION
+env:
+  global:
+    secure: GeiEk7uS5SHr0owH5Oqfn0s46ar8UA9aKVq9g/MMrotvY5MIEPMwrpvZ5PI9nlPk9h3n5pAsKImMgkZsfQH9H1JqYB5AapVwcGtTi0QmJDm2oonq06N4Z45d3kFunlSqZFSD/H2bM/ZA0mj7zgMg1cKBM5tAaWLQyobguFQVJ0uCWpfX4+EUxxw57tcrUmJBj9poxR23bujuN87m23VsvWCDKewDxcfMtc01uxfOXSwLbJYPMuIdcOrs0CYQCyNjOp5ULUoUnpREBA/hNXOnRwjuBlJ6ZTIvnLsjsm9zxCwF8XCKQWBxbEzDW+un6/WsZjTGWBINaILhA5ivfpX+JulVMXP2wLUQojYXtxKtOBSd4Muwm9OVCX5gYP8FywuEAIsI5+Urz2aIJnJzvH5NTIqscJ3esrzND/P3vareDomeyqh0XC1IOwonYxZyWQVs/8jPlhmPtcnhMaUsV1hYZuWjvtRbnGx7dB87yrKLhDXwHpOZEsxYgyUfdPnf2EUY/nDBeiutE/uFNqT9fefpcwy4P5GNmRrDg/CBC0whYVinmfGhaXXzjbJCEc122/U/ZuDLsSPQs4kPlJRBFfxRKaeeWD36aGMD3uhgJOJEcEOy25C82JffXkkbBPlOrhvvGSoDTxbUItUi4yBjO+T9NTkjBFg6CNJn0Ap2l8mUYN4=
diff --git a/AppRouter.podspec b/AppRouter.podspec
@@ -1,15 +1,15 @@
 
 Pod::Spec.new do |s|
   s.name         = "AppRouter"
-  s.version      = "4.1.2"
+  s.version      = "5.0.0"
   s.summary      = "UIViewController creation, navigation, utility methods for easy routing"
 
   s.homepage     = "https://github.com/MLSDev/AppRouter"
   s.license      = "MIT"
   s.author       = { "Artem Antihevich" => "[email protected]" }
   s.social_media_url = 'https://twitter.com/sinarionn'
 
-  s.ios.deployment_target = "8.0"
+  s.ios.deployment_target = "9.0"
   s.source       = { :git => "https://github.com/MLSDev/AppRouter.git", :tag => s.version.to_s }
   s.requires_arc = true
 
@@ -18,12 +18,28 @@ Pod::Spec.new do |s|
 
   s.subspec 'Core' do |core|
       core.source_files = 'Sources/Core/*.swift'
+      core.ios.deployment_target = "9.0"
+  end
+
+  s.subspec 'Route' do |route|
+      route.source_files = 'Sources/Route/AppRouter+route.swift'
+      route.dependency 'AppRouter/Core'
+      route.dependency 'RxCocoa', '~> 4.0'
+      route.dependency 'ReusableView', '~> 2.0'
+      route.ios.deployment_target = "9.0"
+
+      route.subspec 'Dip' do |dip|
+          dip.source_files = 'Sources/Route/*.swift'
+          dip.dependency 'Dip', '~> 6.0'
+          dip.ios.deployment_target = "9.0"
+      end
   end
 
   s.subspec 'RxSwift' do |rxswift|
-      rxswift.ios.deployment_target = "8.0"
+      rxswift.ios.deployment_target = "9.0"
       rxswift.osx.deployment_target = "10.10"
-      rxswift.dependency 'RxSwift', '~> 4.0'
+      rxswift.dependency 'RxCocoa', '~> 4.0'
       rxswift.source_files = 'Sources/RxSwift/*.swift'
   end
+
 end
diff --git a/AppRouter.xcodeproj/project.pbxproj b/AppRouter.xcodeproj/project.pbxproj
diff --git a/AppRouter.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/AppRouter.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/AppRouter.xcodeproj/xcshareddata/xcschemes/AppRouter.xcscheme b/AppRouter.xcodeproj/xcshareddata/xcschemes/AppRouter.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -22,7 +22,7 @@
          </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
-            buildForRunning = "YES"
+            buildForRunning = "NO"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
             buildForAnalyzing = "NO">
@@ -36,13 +36,13 @@
          </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
-            buildForRunning = "YES"
+            buildForRunning = "NO"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
             buildForAnalyzing = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C089D3581D54AC1200599DD7"
+               BlueprintIdentifier = "C0388C6E2109CA3F00E42364"
                BuildableName = "TestApp.app"
                BlueprintName = "TestApp"
                ReferencedContainer = "container:AppRouter.xcodeproj">
@@ -54,8 +54,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">

diff --git a/...roj/xcshareddata/xcschemes/Tests.xcscheme → ...reddata/xcschemes/AppRouterRoute.xcscheme b/...roj/xcshareddata/xcschemes/Tests.xcscheme → ...reddata/xcschemes/AppRouterRoute.xcscheme
@@ -1,27 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C0BD354C2102507A00513C86"
+               BuildableName = "AppRouterRoute.framework"
+               BlueprintName = "AppRouterRoute"
+               ReferencedContainer = "container:AppRouter.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C089D3261D54A3BF00599DD7"
-               BuildableName = "Tests.xctest"
-               BlueprintName = "Tests"
-               ReferencedContainer = "container:AppRouter.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
       <AdditionalOptions>
       </AdditionalOptions>
@@ -36,6 +42,15 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C0BD354C2102507A00513C86"
+            BuildableName = "AppRouterRoute.framework"
+            BlueprintName = "AppRouterRoute"
+            ReferencedContainer = "container:AppRouter.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
@@ -45,6 +60,15 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C0BD354C2102507A00513C86"
+            BuildableName = "AppRouterRoute.framework"
+            BlueprintName = "AppRouterRoute"
+            ReferencedContainer = "container:AppRouter.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/AppRouter.xcodeproj/xcshareddata/xcschemes/AppRouterRx.xcscheme b/AppRouter.xcodeproj/xcshareddata/xcschemes/AppRouterRx.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0910"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -37,7 +36,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/AppRouter.xcodeproj/xcshareddata/xcschemes/TestApp.xcscheme b/AppRouter.xcodeproj/xcshareddata/xcschemes/TestApp.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,25 +14,50 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C089D3581D54AC1200599DD7"
+               BlueprintIdentifier = "C0388C6E2109CA3F00E42364"
                BuildableName = "TestApp.app"
                BlueprintName = "TestApp"
                ReferencedContainer = "container:AppRouter.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C089D3261D54A3BF00599DD7"
+               BuildableName = "Tests.xctest"
+               BlueprintName = "Tests"
+               ReferencedContainer = "container:AppRouter.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      codeCoverageEnabled = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C089D3261D54A3BF00599DD7"
+               BuildableName = "Tests.xctest"
+               BlueprintName = "Tests"
+               ReferencedContainer = "container:AppRouter.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "C089D3581D54AC1200599DD7"
+            BlueprintIdentifier = "C0388C6E2109CA3F00E42364"
             BuildableName = "TestApp.app"
             BlueprintName = "TestApp"
             ReferencedContainer = "container:AppRouter.xcodeproj">
@@ -55,7 +80,7 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "C089D3581D54AC1200599DD7"
+            BlueprintIdentifier = "C0388C6E2109CA3F00E42364"
             BuildableName = "TestApp.app"
             BlueprintName = "TestApp"
             ReferencedContainer = "container:AppRouter.xcodeproj">
@@ -74,7 +99,7 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "C089D3581D54AC1200599DD7"
+            BlueprintIdentifier = "C0388C6E2109CA3F00E42364"
             BuildableName = "TestApp.app"
             BlueprintName = "TestApp"
             ReferencedContainer = "container:AppRouter.xcodeproj">

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
+## [5.0.0](https://github.com/MLSDev/AppRouter/releases/tag/5.0.0)
+
+New 'AppRouter/Route' subspec.
+'AppRouter/RxSwift' methods uses Signal's instead of Observables.
+Presenter methods (push, present, setAsRoot) becomes throwable instead of returning optionals.
+New presenter configurable action called 'show'.
+Presenter supports multiple configurations (by providing different labels alongside configuration block)
+
+
 ## [4.1.0](https://github.com/MLSDev/AppRouter/releases/tag/4.1.0)
 
 Swift 4 migration.

diff --git a/Cartfile b/Cartfile
@@ -1 +1,3 @@
 github "ReactiveX/RxSwift"
+github "sinarionn/ReusableView"
+github "AliSoftware/Dip"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1,3 @@
-github "ReactiveX/RxSwift" "a0bf386834ca09e0438e2edf03d740eac3c4a6ce"
+github "AliSoftware/Dip" "6.1"
+github "ReactiveX/RxSwift" "4.2.0"
+github "sinarionn/ReusableView" "2.0.1"
diff --git a/Carthage/Checkouts/RxSwift b/Carthage/Checkouts/RxSwift
diff --git a/Makefile b/Makefile
@@ -1,8 +1,9 @@
 SHELL := /bin/bash
 # Install Tasks
 
+
 install-iOS:
-	xcrun instruments -w "iPhone 6s (10.0)" || true
+	xcrun instruments -w "iPhone SE" || true
 
 install-carthage:
 	brew remove carthage --force || true
@@ -13,7 +14,7 @@ install-cocoapods:
 
 
 test-iOS:
-	set -o pipefail && xcodebuild -project AppRouter.xcodeproj -scheme AppRouter -destination 'name=iPhone 6s' -enableCodeCoverage YES test -configuration "Release" | xcpretty -ct
+	set -o pipefail && xcodebuild -project AppRouter.xcodeproj -scheme TestApp -destination "name=iPhone SE" -enableCodeCoverage YES test -configuration "Debug" | xcpretty -ct
 	bash <(curl -s https://codecov.io/bash)
 
 test-carthage:

diff --git a/Plists/AppRouter.plist b/Plists/AppRouter.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1.2</string>
+	<string>5.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>