From f67f7bbec2e3e86ca91a5a1f6d2e13f0b5106916 Mon Sep 17 00:00:00 2001 From: jcesarmobile Date: Mon, 24 Feb 2020 14:18:21 +0100 Subject: [PATCH] chore(ios): drop Xcode 10 support --- ios-template/App/Podfile | 2 +- ios/Capacitor/Capacitor/CAPBridgeViewController.swift | 5 +++-- ios/Capacitor/Capacitor/Plugins/StatusBar.swift | 3 +-- site/docs-md/basics/opening-native-projects.md | 2 +- site/docs-md/getting-started/dependencies.md | 2 +- site/docs-md/guides/push-notifications-firebase.md | 2 +- site/docs-md/ios/index.md | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ios-template/App/Podfile b/ios-template/App/Podfile index e9760417ee..2d0f42d683 100644 --- a/ios-template/App/Podfile +++ b/ios-template/App/Podfile @@ -1,7 +1,7 @@ platform :ios, '11.0' use_frameworks! -# workaround to avoid Xcode 10 caching of Pods that requires +# workaround to avoid Xcode caching of Pods that requires # Product -> Clean Build Folder after new Cordova plugins installed # Requires CocoaPods 1.6 or newer install! 'cocoapods', :disable_input_output_paths => true diff --git a/ios/Capacitor/Capacitor/CAPBridgeViewController.swift b/ios/Capacitor/Capacitor/CAPBridgeViewController.swift index 85fce61486..50bb6399c9 100644 --- a/ios/Capacitor/Capacitor/CAPBridgeViewController.swift +++ b/ios/Capacitor/Capacitor/CAPBridgeViewController.swift @@ -201,8 +201,9 @@ public class CAPBridgeViewController: UIViewController, CAPBridgeDelegate, WKScr if let statusBarStyle = plist["UIStatusBarStyle"] as? String { if (statusBarStyle == "UIStatusBarStyleDarkContent") { if #available(iOS 13.0, *) { - // TODO - use .darkContent instead of rawValue once Xcode 10 support is dropped - self.statusBarStyle = UIStatusBarStyle.init(rawValue: 3) ?? .default + self.statusBarStyle = .darkContent + } else { + self.statusBarStyle = .default } } else if (statusBarStyle != "UIStatusBarStyleDefault") { self.statusBarStyle = .lightContent diff --git a/ios/Capacitor/Capacitor/Plugins/StatusBar.swift b/ios/Capacitor/Capacitor/Plugins/StatusBar.swift index 4b60bdbafc..f13fb98c2e 100644 --- a/ios/Capacitor/Capacitor/Plugins/StatusBar.swift +++ b/ios/Capacitor/Capacitor/Plugins/StatusBar.swift @@ -21,8 +21,7 @@ public class CAPStatusBarPlugin: CAPPlugin { bridge.setStatusBarStyle(.lightContent) } else if style == "LIGHT" { if #available(iOS 13.0, *) { - // TODO - use .darkContent instead of rawValue once Xcode 10 support is dropped - bridge.setStatusBarStyle(UIStatusBarStyle.init(rawValue: 3) ?? .default) + bridge.setStatusBarStyle(.darkContent) } else { bridge.setStatusBarStyle(.default) } diff --git a/site/docs-md/basics/opening-native-projects.md b/site/docs-md/basics/opening-native-projects.md index 57245e03d8..bfc8f300ac 100644 --- a/site/docs-md/basics/opening-native-projects.md +++ b/site/docs-md/basics/opening-native-projects.md @@ -11,7 +11,7 @@ contributors:

Capacitor uses the native IDE for each platform in order to provide required configuration, and to build, test, and deploy apps.

-

For iOS development, that means you must have Xcode 10 or above installed. For Android, Android Studio 3 or above.

+

For iOS development, that means you must have Xcode 11 or above installed. For Android, Android Studio 3 or above.

Both IDEs can be opened manually or using the npx cap open command:

diff --git a/site/docs-md/getting-started/dependencies.md b/site/docs-md/getting-started/dependencies.md index 44e4751a3d..93efec0e86 100644 --- a/site/docs-md/getting-started/dependencies.md +++ b/site/docs-md/getting-started/dependencies.md @@ -21,7 +21,7 @@ For specific platforms, follow each guide below to ensure you have the correct d ## iOS Development -For building iOS apps, Capacitor requires a **Mac with Xcode 10 or above**. Soon, you'll be able to use [Ionic Appflow](http://ionicframework.com/appflow) to build for iOS even if you're on Windows. +For building iOS apps, Capacitor requires a **Mac with Xcode 11 or above**. Soon, you'll be able to use [Ionic Appflow](http://ionicframework.com/appflow) to build for iOS even if you're on Windows. Additionally, you'll need to install **[CocoaPods](https://cocoapods.org/)** (`sudo gem install cocoapods`), and install the **Xcode Command Line tools** (either from Xcode, or running `xcode-select --install`). diff --git a/site/docs-md/guides/push-notifications-firebase.md b/site/docs-md/guides/push-notifications-firebase.md index b74a7745bb..10307f4f82 100644 --- a/site/docs-md/guides/push-notifications-firebase.md +++ b/site/docs-md/guides/push-notifications-firebase.md @@ -284,7 +284,7 @@ Your `Podfile` should look something like this: platform :ios, '11.0' use_frameworks! -# workaround to avoid Xcode 10 caching of Pods that requires +# workaround to avoid Xcode caching of Pods that requires # Product -> Clean Build Folder after new Cordova plugins installed # Requires CocoaPods 1.6 or newer install! 'cocoapods', :disable_input_output_paths => true diff --git a/site/docs-md/ios/index.md b/site/docs-md/ios/index.md index 3c7fb30362..23d4ea68c5 100644 --- a/site/docs-md/ios/index.md +++ b/site/docs-md/ios/index.md @@ -15,7 +15,7 @@ contributors: ## Getting Started -Building iOS apps requires some iOS development dependencies to be installed, including Xcode 10 and the Xcode command line tools. +Building iOS apps requires some iOS development dependencies to be installed, including Xcode 11 and the Xcode command line tools. Note: It's possible to develop and build iOS apps without a mac, such as by using Ionic Appflow's Package service. Consult your service of choice for more information.