Merge branch 'master' into add_zoom_to_android_webview

* master:
  [image_picker] use LocalizedString to fix lint error. (flutter#3349)
  Upgrade CocoaPods in Cirrus (flutter#3347)

Author: NickalasB

.cirrus.yml

@@ -132,6 +132,7 @@ task:
   osx_instance:
     image: catalina-xcode-11.3.1-flutter
   upgrade_script:
+    - sudo gem install cocoapods
     - flutter channel stable
     - flutter upgrade
     - flutter channel master
@@ -190,6 +191,7 @@ task:
   setup_script:
     - flutter config --enable-macos-desktop
   upgrade_script:
+    - sudo gem install cocoapods
     - flutter channel master
     - flutter upgrade
     - git fetch origin master

packages/image_picker/image_picker/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.7+17
+
+* iOS: fix `User-facing text should use localized string macro` warning.
+
 ## 0.6.7+16
 
 * Update Flutter SDK constraint.

packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m

@@ -146,10 +146,10 @@ - (void)showCamera {
                                                       animated:YES
                                                     completion:nil];
   } else {
-    [[[UIAlertView alloc] initWithTitle:@"Error"
-                                message:@"Camera not available."
+    [[[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Error", nil)
+                                message:NSLocalizedString(@"Camera not available.", nil)
                                delegate:nil
-                      cancelButtonTitle:@"OK"
+                      cancelButtonTitle:NSLocalizedString(@"OK", nil)
                       otherButtonTitles:nil] show];
     self.result(nil);
     self.result = nil;

packages/image_picker/image_picker/pubspec.yaml

@@ -2,7 +2,7 @@ name: image_picker
 description: Flutter plugin for selecting images from the Android and iOS image
   library, and taking new pictures with the camera.
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker
-version: 0.6.7+16
+version: 0.6.7+17
 
 flutter:
   plugin: