Skip to content

Commit

Permalink
Swift 3.2 migration.
Browse files Browse the repository at this point in the history
  • Loading branch information
sinarionn committed Sep 21, 2017
1 parent 3e04379 commit 7d2d164
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1
3.2
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ matrix:
env: ACTION=iOS

language: objective-c
osx_image: xcode8.3
osx_image: xcode9

script:
- git submodule update --init --recursive
Expand Down
2 changes: 1 addition & 1 deletion AppRouter.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Pod::Spec.new do |s|
s.name = "AppRouter"
s.version = "4.0.1"
s.version = "4.0.2"
s.summary = "UIViewController creation, navigation, utility methods for easy routing"

s.homepage = "https://github.com/MLSDev/AppRouter"
Expand Down
18 changes: 17 additions & 1 deletion AppRouter.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
C045B9ED1F73DB0C0012170E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C0A127C31D59C0440057F9E8 /* Rx.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = C8E8BA551E2C181A00A4AC2C;
remoteInfo = Benchmarks;
};
C089D3291D54A3BF00599DD7 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 9AC8C9E71969BBB5006F1EAC /* Project object */;
Expand Down Expand Up @@ -417,6 +424,7 @@
C0A127FD1D59C0440057F9E8 /* AllTests-tvOS.xctest */,
C0A127FF1D59C0440057F9E8 /* AllTests-macOS.xctest */,
C0A128011D59C0440057F9E8 /* PerformanceTests.app */,
C045B9EE1F73DB0C0012170E /* Benchmarks.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -618,6 +626,13 @@
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
C045B9EE1F73DB0C0012170E /* Benchmarks.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = Benchmarks.xctest;
remoteRef = C045B9ED1F73DB0C0012170E /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
C0A127DB1D59C0440057F9E8 /* RxSwift.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
Expand Down Expand Up @@ -754,7 +769,8 @@
C0A128011D59C0440057F9E8 /* PerformanceTests.app */ = {
isa = PBXReferenceProxy;
fileType = wrapper.application;
path = PerformanceTests.app;
name = PerformanceTests.app;
path = Microoptimizations.app;
remoteRef = C0A128001D59C0440057F9E8 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

All notable changes to this project will be documented in this file.

## [4.0.2](https://github.com/MLSDev/AppRouter/releases/tag/4.0.2)

Swift 3.2 migration.


## [4.0.1](https://github.com/MLSDev/AppRouter/releases/tag/4.0.1)

Presenter namespace-enum changed into open class to prevent weird bug with overrides.
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift"
github "ReactiveX/RxSwift" "rxswift4.0-swift4.0"
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" "3.0.0"
github "ReactiveX/RxSwift" "a0bf386834ca09e0438e2edf03d740eac3c4a6ce"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/RxSwift
Submodule RxSwift updated 909 files
2 changes: 1 addition & 1 deletion Plists/AppRouter.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>4.0.1</string>
<string>4.0.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Extremely easy way to handle controller creation / presentation / navigation and
## Requirements

- iOS 8.0+
- Xcode 8+
- Swift 3
- Xcode 9+
- Swift 3.2

## Installation

Expand Down
2 changes: 1 addition & 1 deletion Sources/Core/AppRouter+presenter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ extension AppRouter.Presenter {
case customXib(String)
case preconstructed(UIViewController)
case anonymous(() throws -> UIViewController)
public func provideController<T: UIViewController>() throws -> T where T : BundleForClassInstantiable {
public func provideController<T: UIViewController>() throws -> T {
switch self {
case .storyboard(let initial):
return try T.instantiate(initial: initial) ?? Errors.failedToConstructSourceController.rethrow()
Expand Down

0 comments on commit 7d2d164

Please sign in to comment.