[url_launcher] Bump minimum Flutter version and iOS deployment target (#4359)

jmagman · web-flow · commit c940b709b74a · 2021-09-17T15:23:06.000-07:00
diff --git a/packages/url_launcher/url_launcher/CHANGELOG.md b/packages/url_launcher/url_launcher/CHANGELOG.md
@@ -1,5 +1,6 @@
-## NEXT
+## 6.0.11
 
+* Update minimum Flutter SDK to 2.5 and iOS deployment target to 9.0.
 * Updated Android lint settings.
 
 ## 6.0.10
diff --git a/packages/url_launcher/url_launcher/example/ios/Flutter/AppFrameworkInfo.plist b/packages/url_launcher/url_launcher/example/ios/Flutter/AppFrameworkInfo.plist
@@ -25,6 +25,6 @@
     <string>arm64</string>
   </array>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>9.0</string>
 </dict>
 </plist>
diff --git a/packages/url_launcher/url_launcher/example/ios/Runner.xcodeproj/project.pbxproj b/packages/url_launcher/url_launcher/example/ios/Runner.xcodeproj/project.pbxproj
@@ -517,7 +517,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -567,7 +567,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
diff --git a/packages/url_launcher/url_launcher/example/pubspec.yaml b/packages/url_launcher/url_launcher/example/pubspec.yaml
@@ -3,8 +3,8 @@ description: Demonstrates how to use the url_launcher plugin.
 publish_to: none
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=1.12.13+hotfix.5"
+  sdk: ">=2.14.0 <3.0.0"
+  flutter: ">=2.5.0"
 
 dependencies:
   flutter:
diff --git a/packages/url_launcher/url_launcher/ios/Classes/FLTURLLauncherPlugin.m b/packages/url_launcher/url_launcher/ios/Classes/FLTURLLauncherPlugin.m
@@ -23,10 +23,8 @@ - (instancetype)initWithUrl:url withFlutterResult:result {
   if (self) {
     self.url = url;
     self.flutterResult = result;
-    if (@available(iOS 9.0, *)) {
-      self.safari = [[SFSafariViewController alloc] initWithURL:url];
-      self.safari.delegate = self;
-    }
+    self.safari = [[SFSafariViewController alloc] initWithURL:url];
+    self.safari.delegate = self;
   }
   return self;
 }
@@ -78,23 +76,12 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
   } else if ([@"launch" isEqualToString:call.method]) {
     NSNumber *useSafariVC = call.arguments[@"useSafariVC"];
     if (useSafariVC.boolValue) {
-      if (@available(iOS 9.0, *)) {
-        [self launchURLInVC:url result:result];
-      } else {
-        [self launchURL:url call:call result:result];
-      }
+      [self launchURLInVC:url result:result];
     } else {
       [self launchURL:url call:call result:result];
     }
   } else if ([@"closeWebView" isEqualToString:call.method]) {
-    if (@available(iOS 9.0, *)) {
-      [self closeWebViewWithResult:result];
-    } else {
-      result([FlutterError
-          errorWithCode:@"API_NOT_AVAILABLE"
-                message:@"SafariViewController related api is not availabe for version <= IOS9"
-                details:nil]);
-    }
+    [self closeWebViewWithResult:result];
   } else {
     result(FlutterMethodNotImplemented);
   }
diff --git a/packages/url_launcher/url_launcher/ios/url_launcher.podspec b/packages/url_launcher/url_launcher/ios/url_launcher.podspec
@@ -17,7 +17,7 @@ A Flutter plugin for making the underlying platform (Android or iOS) launch a UR
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
   
-  s.platform = :ios, '8.0'
-  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
+  s.platform = :ios, '9.0'
+  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
 end
 
diff --git a/packages/url_launcher/url_launcher/lib/url_launcher.dart b/packages/url_launcher/url_launcher/lib/url_launcher.dart
@@ -16,7 +16,7 @@ import 'package:url_launcher_platform_interface/url_launcher_platform_interface.
 /// schemes which cannot be handled, that is when [canLaunch] would complete
 /// with false.
 ///
-/// [forceSafariVC] is only used in iOS with iOS version >= 9.0. By default (when unset), the launcher
+/// By default when [forceSafariVC] is unset, the launcher
 /// opens web URLs in the Safari View Controller, anything else is opened
 /// using the default handler on the platform. If set to true, it opens the
 /// URL in the Safari View Controller. If false, the URL is opened in the
@@ -138,9 +138,6 @@ Future<bool> canLaunch(String urlString) async {
 /// Or on IOS systems, if [launch] was called without `forceSafariVC` being set to `true`,
 /// this call will not do anything either, simply because there is no
 /// WebView/SafariViewController available to be closed.
-///
-/// SafariViewController is only available on IOS version >= 9.0, this method does not do anything
-/// on IOS version below 9.0
 Future<void> closeWebView() async {
   return await UrlLauncherPlatform.instance.closeWebView();
 }
diff --git a/packages/url_launcher/url_launcher/pubspec.yaml b/packages/url_launcher/url_launcher/pubspec.yaml
@@ -3,11 +3,11 @@ description: Flutter plugin for launching a URL. Supports
   web, phone, SMS, and email schemes.
 repository: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22
-version: 6.0.10
+version: 6.0.11
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=2.0.0"
+  sdk: ">=2.14.0 <3.0.0"
+  flutter: ">=2.5.0"
 
 flutter:
   plugin:
