Skip to content

Commit 7d2d164

Browse files
committed
Swift 3.2 migration.
1 parent 3e04379 commit 7d2d164

File tree

11 files changed

+32
-11
lines changed

11 files changed

+32
-11
lines changed

.swift-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1
1+
3.2

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ matrix:
44
env: ACTION=iOS
55

66
language: objective-c
7-
osx_image: xcode8.3
7+
osx_image: xcode9
88

99
script:
1010
- git submodule update --init --recursive

AppRouter.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Pod::Spec.new do |s|
33
s.name = "AppRouter"
4-
s.version = "4.0.1"
4+
s.version = "4.0.2"
55
s.summary = "UIViewController creation, navigation, utility methods for easy routing"
66

77
s.homepage = "https://github.com/MLSDev/AppRouter"

AppRouter.xcodeproj/project.pbxproj

+17-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,13 @@
5050
/* End PBXBuildFile section */
5151

5252
/* Begin PBXContainerItemProxy section */
53+
C045B9ED1F73DB0C0012170E /* PBXContainerItemProxy */ = {
54+
isa = PBXContainerItemProxy;
55+
containerPortal = C0A127C31D59C0440057F9E8 /* Rx.xcodeproj */;
56+
proxyType = 2;
57+
remoteGlobalIDString = C8E8BA551E2C181A00A4AC2C;
58+
remoteInfo = Benchmarks;
59+
};
5360
C089D3291D54A3BF00599DD7 /* PBXContainerItemProxy */ = {
5461
isa = PBXContainerItemProxy;
5562
containerPortal = 9AC8C9E71969BBB5006F1EAC /* Project object */;
@@ -417,6 +424,7 @@
417424
C0A127FD1D59C0440057F9E8 /* AllTests-tvOS.xctest */,
418425
C0A127FF1D59C0440057F9E8 /* AllTests-macOS.xctest */,
419426
C0A128011D59C0440057F9E8 /* PerformanceTests.app */,
427+
C045B9EE1F73DB0C0012170E /* Benchmarks.xctest */,
420428
);
421429
name = Products;
422430
sourceTree = "<group>";
@@ -618,6 +626,13 @@
618626
/* End PBXProject section */
619627

620628
/* Begin PBXReferenceProxy section */
629+
C045B9EE1F73DB0C0012170E /* Benchmarks.xctest */ = {
630+
isa = PBXReferenceProxy;
631+
fileType = wrapper.cfbundle;
632+
path = Benchmarks.xctest;
633+
remoteRef = C045B9ED1F73DB0C0012170E /* PBXContainerItemProxy */;
634+
sourceTree = BUILT_PRODUCTS_DIR;
635+
};
621636
C0A127DB1D59C0440057F9E8 /* RxSwift.framework */ = {
622637
isa = PBXReferenceProxy;
623638
fileType = wrapper.framework;
@@ -754,7 +769,8 @@
754769
C0A128011D59C0440057F9E8 /* PerformanceTests.app */ = {
755770
isa = PBXReferenceProxy;
756771
fileType = wrapper.application;
757-
path = PerformanceTests.app;
772+
name = PerformanceTests.app;
773+
path = Microoptimizations.app;
758774
remoteRef = C0A128001D59C0440057F9E8 /* PBXContainerItemProxy */;
759775
sourceTree = BUILT_PRODUCTS_DIR;
760776
};

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

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

5+
## [4.0.2](https://github.com/MLSDev/AppRouter/releases/tag/4.0.2)
6+
7+
Swift 3.2 migration.
8+
9+
510
## [4.0.1](https://github.com/MLSDev/AppRouter/releases/tag/4.0.1)
611

712
Presenter namespace-enum changed into open class to prevent weird bug with overrides.

Cartfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift"
1+
github "ReactiveX/RxSwift" "rxswift4.0-swift4.0"

Cartfile.resolved

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" "3.0.0"
1+
github "ReactiveX/RxSwift" "a0bf386834ca09e0438e2edf03d740eac3c4a6ce"

Carthage/Checkouts/RxSwift

Submodule RxSwift updated 909 files

Plists/AppRouter.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>4.0.1</string>
18+
<string>4.0.2</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Extremely easy way to handle controller creation / presentation / navigation and
1111
## Requirements
1212

1313
- iOS 8.0+
14-
- Xcode 8+
15-
- Swift 3
14+
- Xcode 9+
15+
- Swift 3.2
1616

1717
## Installation
1818

Sources/Core/AppRouter+presenter.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ extension AppRouter.Presenter {
309309
case customXib(String)
310310
case preconstructed(UIViewController)
311311
case anonymous(() throws -> UIViewController)
312-
public func provideController<T: UIViewController>() throws -> T where T : BundleForClassInstantiable {
312+
public func provideController<T: UIViewController>() throws -> T {
313313
switch self {
314314
case .storyboard(let initial):
315315
return try T.instantiate(initial: initial) ?? Errors.failedToConstructSourceController.rethrow()

0 commit comments

Comments
 (0)