diff --git a/Podfile b/Podfile index 90195414340..1a95bc3627b 100644 --- a/Podfile +++ b/Podfile @@ -44,11 +44,6 @@ target 'WooCommerce' do pod 'WPMediaPicker', '~> 1.8' # pod 'WPMediaPicker', git: 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', commit: '' - # External Libraries - # ================== - # - pod 'Wormholy', '~> 1.6.6', configurations: ['Debug'] - # Unit Tests # ========== # diff --git a/Podfile.lock b/Podfile.lock index 808598363d6..d588908e905 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,24 +1,20 @@ PODS: - WordPressShared (2.1.0) - - Wormholy (1.6.6) - WPMediaPicker (1.8.12) DEPENDENCIES: - WordPressShared (~> 2.1-beta) - - Wormholy (~> 1.6.6) - WPMediaPicker (~> 1.8) SPEC REPOS: trunk: - WordPressShared - - Wormholy - WPMediaPicker SPEC CHECKSUMS: WordPressShared: 0aa459e5257a77184db87805a998f447443c9706 - Wormholy: 09da0b876f9276031fd47383627cb75e194fc068 WPMediaPicker: e9eaa804e1b0288d7969776608053ae0ea2941f2 -PODFILE CHECKSUM: dc92ad9048fcc52de0e242c76e3cf53e735aa975 +PODFILE CHECKSUM: 3cdc2cfeea28093a0febd43eee21482afb084eeb COCOAPODS: 1.16.2 diff --git a/WooCommerce/Classes/AppDelegate.swift b/WooCommerce/Classes/AppDelegate.swift index ac7adb38dad..693298dace2 100644 --- a/WooCommerce/Classes/AppDelegate.swift +++ b/WooCommerce/Classes/AppDelegate.swift @@ -19,11 +19,6 @@ import class Yosemite.ScreenshotStoresManager // In that way, Inject will be available in the entire target. @_exported import Inject -#if DEBUG -import Wormholy -#endif - - // MARK: - Woo's App Delegate! // class AppDelegate: UIResponder, UIApplicationDelegate { @@ -82,7 +77,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate { setupLogLevel(.verbose) setupPushNotificationsManagerIfPossible(pushNotesManager, stores: stores) setupAppRatingManager() - setupWormholy() setupKeyboardStateProvider() handleLaunchArguments() setupUserNotificationCenter() @@ -413,15 +407,6 @@ private extension AppDelegate { appRating.setVersion(version) } - /// Set up Wormholy only in Debug build configuration - /// - func setupWormholy() { - #if DEBUG - /// We want to activate it programmatically, not using the shake. - Wormholy.shakeEnabled = false - #endif - } - /// Set up `KeyboardStateProvider` /// func setupKeyboardStateProvider() { diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewController.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewController.swift index b5c5dc04844..824ec2eae73 100644 --- a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewController.swift +++ b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewController.swift @@ -168,8 +168,6 @@ private extension SettingsViewController { configureWhatsNew(cell: cell) case let cell as BasicTableViewCell where row == .deviceSettings: configureAppSettings(cell: cell) - case let cell as BasicTableViewCell where row == .wormholy: - configureWormholy(cell: cell) case let cell as BasicTableViewCell where row == .accountSettings: configureAccountSettings(cell: cell) case let cell as BasicTableViewCell where row == .logout: @@ -276,12 +274,6 @@ private extension SettingsViewController { cell.textLabel?.text = Localization.openDeviceSettings } - func configureWormholy(cell: BasicTableViewCell) { - cell.accessoryType = .disclosureIndicator - cell.selectionStyle = .default - cell.textLabel?.text = Localization.launchWormHolyDebug - } - func configureWhatsNew(cell: BasicTableViewCell) { cell.accessoryType = .disclosureIndicator cell.selectionStyle = .default @@ -511,11 +503,6 @@ private extension SettingsViewController { UIApplication.shared.open(targetURL) } - func wormholyWasPressed() { - // Fire a local notification, which fires Wormholy if enabled. - NotificationCenter.default.post(name: NSNotification.Name(rawValue: "wormholy_fire"), object: nil) - } - func whatsNewWasPressed() { ServiceLocator.analytics.track(event: .featureAnnouncementShown(source: .appSettings)) guard let announcement = viewModel.announcement else { return } @@ -671,8 +658,6 @@ extension SettingsViewController: UITableViewDelegate { aboutWasPressed() case .deviceSettings: deviceSettingsWasPressed() - case .wormholy: - wormholyWasPressed() case .whatsNew: whatsNewWasPressed() case .accountSettings: @@ -761,7 +746,6 @@ extension SettingsViewController { // Other case deviceSettings - case wormholy // Account settings case accountSettings @@ -806,8 +790,6 @@ extension SettingsViewController { return BasicTableViewCell.self case .deviceSettings: return BasicTableViewCell.self - case .wormholy: - return BasicTableViewCell.self case .whatsNew: return BasicTableViewCell.self case .storeName: @@ -919,11 +901,6 @@ private extension SettingsViewController { comment: "Opens iOS's Device Settings for the app" ) - static let launchWormHolyDebug = NSLocalizedString( - "Launch Wormholy Debug", - comment: "Opens an internal library called Wormholy. Not visible to users." - ) - static let whatsNew = NSLocalizedString( "What's New in WooCommerce", comment: "Navigates to screen containing the latest WooCommerce Features" diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewModel.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewModel.swift index 06bb651bbf9..56362bf38ed 100644 --- a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewModel.swift +++ b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewModel.swift @@ -320,14 +320,8 @@ private extension SettingsViewModel { // Other let otherSection: Section = { - let rows: [Row] - #if DEBUG - rows = [.deviceSettings, .wormholy] - #else - rows = [.deviceSettings] - #endif return Section(title: Localization.otherTitle, - rows: rows, + rows: [.deviceSettings], footerHeight: UITableView.automaticDimension) }()