From 0f030e6f06968f2b07244a36ea4ede7a8cc6aa86 Mon Sep 17 00:00:00 2001 From: Xaofly Sho Date: Wed, 13 Mar 2019 14:04:58 +0800 Subject: [PATCH] Update pods, swift 4.0 -> 4.2 --- Podfile | 6 ++-- Podfile.lock | 28 +++++++++++-------- Pods Updater.xcodeproj/project.pbxproj | 15 ++++++---- Pods Updater/Extensions.swift | 2 +- Pods Updater/Info.plist | 4 +-- .../UI/Command/CommandViewController.swift | 2 +- Pods Updater/UI/Home/HomeViewController.swift | 10 +++++-- Pods Updater/UI/NSStoryboardExtensions.swift | 6 ++-- 8 files changed, 43 insertions(+), 30 deletions(-) diff --git a/Podfile b/Podfile index 2ac0b12..553e924 100644 --- a/Podfile +++ b/Podfile @@ -2,7 +2,7 @@ platform :osx, '10.11' target 'Pods Updater' do use_frameworks! - pod 'RxSwift', '4.1.2' - pod 'RxCocoa', '4.1.2' - pod 'Highlightr', '2.0.1' + pod 'RxSwift', '4.4.2' + pod 'RxCocoa', '4.4.2' + pod 'Highlightr', '2.1.0' end diff --git a/Podfile.lock b/Podfile.lock index 9d9deff..a18ebd8 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,25 +1,29 @@ PODS: - - Highlightr (2.0.1) - - RxCocoa (4.1.2): - - RxSwift (~> 4.0) - - RxSwift (4.1.2) + - Highlightr (2.1.0) + - RxAtomic (4.4.2) + - RxCocoa (4.4.2): + - RxSwift (>= 4.4.2, ~> 4.4) + - RxSwift (4.4.2): + - RxAtomic (>= 4.4.2, ~> 4.4) DEPENDENCIES: - - Highlightr (= 2.0.1) - - RxCocoa (= 4.1.2) - - RxSwift (= 4.1.2) + - Highlightr (= 2.1.0) + - RxCocoa (= 4.4.2) + - RxSwift (= 4.4.2) SPEC REPOS: https://github.com/cocoapods/specs.git: - Highlightr + - RxAtomic - RxCocoa - RxSwift SPEC CHECKSUMS: - Highlightr: 65655134dd0d5e1320afdd8a9d880c9e9dc0b437 - RxCocoa: d88ba0f1f6abf040011a9eb4b539324fc426843a - RxSwift: e49536837d9901277638493ea537394d4b55f570 + Highlightr: 595f3e100737c8de41113385da8bd0b5b65212c6 + RxAtomic: d00e97c10db88c6f08540e0bf2752fc5a2404167 + RxCocoa: 477990dc3b4c3ff55fb0ac77e1cc06244e0aaec8 + RxSwift: 74c29b693c8e42b0f64400e8b06564575742d649 -PODFILE CHECKSUM: 854db6e809c8b5fdb69683c2f2273956d36cb72a +PODFILE CHECKSUM: f9e4eaf4965ce600516e9b1dd618fb323a7e1bf0 -COCOAPODS: 1.5.2 +COCOAPODS: 1.7.0.beta.2 diff --git a/Pods Updater.xcodeproj/project.pbxproj b/Pods Updater.xcodeproj/project.pbxproj index f096fca..60da41a 100644 --- a/Pods Updater.xcodeproj/project.pbxproj +++ b/Pods Updater.xcodeproj/project.pbxproj @@ -238,6 +238,7 @@ TargetAttributes = { 50C0652A201F7B4400D7B8D3 = { CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1010; ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.Sandbox = { @@ -287,20 +288,22 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-Pods Updater/Pods-Pods Updater-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-Pods Updater/Pods-Pods Updater-frameworks.sh", "${BUILT_PRODUCTS_DIR}/Highlightr/Highlightr.framework", + "${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework", "${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Highlightr.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Pods Updater/Pods-Pods Updater-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Pods Updater/Pods-Pods Updater-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 6CCF8D0DC9E47F931A852CC0 /* [CP] Check Pods Manifest.lock */ = { @@ -484,13 +487,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = K3JWY7DT4K; + DEVELOPMENT_TEAM = TRWGY7P83F; INFOPLIST_FILE = "Pods Updater/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; PRODUCT_BUNDLE_IDENTIFIER = com.kizitonwose.podsupdater; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -501,13 +504,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = K3JWY7DT4K; + DEVELOPMENT_TEAM = TRWGY7P83F; INFOPLIST_FILE = "Pods Updater/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; PRODUCT_BUNDLE_IDENTIFIER = com.kizitonwose.podsupdater; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/Pods Updater/Extensions.swift b/Pods Updater/Extensions.swift index b0b0b1b..513aa7a 100644 --- a/Pods Updater/Extensions.swift +++ b/Pods Updater/Extensions.swift @@ -13,7 +13,7 @@ import Cocoa extension NSTableView { func registerCellNib(_ cellClass: AnyClass, forIdentifier identifier: NSUserInterfaceItemIdentifier) { let nibName = String.className(cellClass) - let nib = NSNib(nibNamed: NSNib.Name(rawValue: nibName), bundle: nil) + let nib = NSNib(nibNamed: nibName, bundle: nil) self.register(nib, forIdentifier: identifier) } } diff --git a/Pods Updater/Info.plist b/Pods Updater/Info.plist index 6edabeb..a92f754 100644 --- a/Pods Updater/Info.plist +++ b/Pods Updater/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.2 + 1.0.3 CFBundleVersion - 3 + 4 LSApplicationCategoryType public.app-category.developer-tools LSMinimumSystemVersion diff --git a/Pods Updater/UI/Command/CommandViewController.swift b/Pods Updater/UI/Command/CommandViewController.swift index a15d21d..6dd0e73 100644 --- a/Pods Updater/UI/Command/CommandViewController.swift +++ b/Pods Updater/UI/Command/CommandViewController.swift @@ -40,7 +40,7 @@ extension CommandViewController: CommandContract.View { switch command { case .updateRepo: successHandler?() - presenting?.dismissViewController(self) + presentingViewController?.dismiss(self) default: break } diff --git a/Pods Updater/UI/Home/HomeViewController.swift b/Pods Updater/UI/Home/HomeViewController.swift index 07ad4b3..863a837 100644 --- a/Pods Updater/UI/Home/HomeViewController.swift +++ b/Pods Updater/UI/Home/HomeViewController.swift @@ -120,7 +120,7 @@ extension HomeViewController: HomeContract.View { func showPodCleanUpResult(_ result: PodFileCleanResult) { let podfileVC = storyboard!.instantiatePodfileViewController(with: result) - presentViewControllerAsModalWindow(podfileVC) + presentAsModalWindow(podfileVC) } func showPodCleanUpError(_ reason: String?) { @@ -138,7 +138,7 @@ extension HomeViewController: HomeContract.View { fileprivate func runCommand(_ command: Command, successHandler: (() -> Void)? = nil) { let vc = self.storyboard!.instantiateCommandViewController(with: command, successHandler: successHandler) - self.presentViewControllerAsModalWindow(vc) + self.presentAsModalWindow(vc) } } @@ -195,6 +195,12 @@ extension HomeViewController { alert.addButton(withTitle: "Close") alert.beginSheetModal(for: self.view.window!) }).disposed(by: disposeBag) + + // Filter Button + filterButton.rx.tap.asDriver() + .drive(onNext: { [unowned self] _ in + + }).disposed(by: disposeBag) } fileprivate func setupTableView() { diff --git a/Pods Updater/UI/NSStoryboardExtensions.swift b/Pods Updater/UI/NSStoryboardExtensions.swift index 4bbf10d..cd9c52d 100644 --- a/Pods Updater/UI/NSStoryboardExtensions.swift +++ b/Pods Updater/UI/NSStoryboardExtensions.swift @@ -24,10 +24,10 @@ extension NSStoryboard { } extension NSStoryboard.SceneIdentifier { - public static let podfileViewController = NSStoryboard.SceneIdentifier(rawValue: "PodfileViewController") - public static let commandViewController = NSStoryboard.SceneIdentifier(rawValue: "CommandViewController") + public static let podfileViewController = "PodfileViewController" + public static let commandViewController = "CommandViewController" } extension NSStoryboard.Name { - public static let main = NSStoryboard.Name(rawValue: "Main") + public static let main = "Main" }