be able to build Swift4.1

marty-suzuki · Oct 1, 2018 · 4200e3e · 4200e3e
1 parent a2b1737
commit 4200e3e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/Example/PrexSample.xcodeproj/project.pbxproj b/Example/PrexSample.xcodeproj/project.pbxproj
@@ -511,6 +511,7 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = PrexSample/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -530,6 +531,7 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = PrexSample/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -550,6 +552,7 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = PrexSampleTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -572,6 +575,7 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = PrexSampleTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

diff --git a/Example/PrexSample/AppDelegate.swift b/Example/PrexSample/AppDelegate.swift
@@ -13,8 +13,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+    #if swift(>=4.2)
+    typealias UIApplicationLaunchOptionsKey = UIApplication.LaunchOptionsKey
+    #endif
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
 
         guard let navigationController = window?.rootViewController as? UINavigationController else {
             return false

diff --git a/Example/PrexSample/View/Detail/DetailViewController.Prex.swift b/Example/PrexSample/View/Detail/DetailViewController.Prex.swift
@@ -43,8 +43,8 @@ struct DetailMutation: Mutation {
 
 final class DetailPresenter: Presenter<DetailAction, DetailState> {
 
-    convenience init<View: Prex.View>(view: View) where View.State == DetailState {
-        self.init(view: view, state: .init(), mutation: DetailMutation())
+    init<View: Prex.View>(view: View, dispatcher: Dispatcher<DetailAction> = .init()) where View.State == DetailState {
+        super.init(view: view, state: DetailState(), mutation: DetailMutation(), dispatcher: dispatcher)
     }
 
     func progressUpdateParams(from progress: Double) -> ProgressUpdateParams {

diff --git a/Example/PrexSample/View/Search/SearchViewController.Prex.swift b/Example/PrexSample/View/Search/SearchViewController.Prex.swift
@@ -98,8 +98,8 @@ extension Presenter where Action == SearchAction, State == SearchState {
         fetchRepositories(query: query, page: next, session: session)
     }
 
-    func selectedIndexPath(_ indexPath: IndexPath) {
-        let repository = state.repositories[indexPath.row]
+    func selectedIndexPath(_ indexPath: IndexPath?) {
+        let repository = indexPath.map { state.repositories[$0.row] }
         dispatch(.setSelectedRepository(repository))
     }
 

diff --git a/Example/PrexSample/View/Search/SearchViewController.swift b/Example/PrexSample/View/Search/SearchViewController.swift
@@ -43,6 +43,12 @@ final class SearchViewController: UIViewController {
         navigationItem.titleView = searchBar
     }
 
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+
+        presenter.selectedIndexPath(nil)
+    }
+
     private func refrectEditing() {
         UIView.animate(withDuration: 0.3) {
             if self.presenter.state.isEditing {