Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Commit

Permalink
[ci] Manually roll Flutter master (#5765)
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartmorgan authored May 16, 2022
1 parent 4b1d47e commit 49a0d36
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .ci/flutter_master.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2b2cda15293d86d5c27d345505cde25b9efcb153
036cae36697a6c078fe28ac6088a2a493d0e7958
4 changes: 4 additions & 0 deletions packages/camera/camera/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.9.5+1

* Suppresses warnings for pre-iOS-11 codepaths.

## 0.9.5

* Adds camera access permission handling logic on iOS to fix a related crash when using the camera for the first time.
Expand Down
4 changes: 4 additions & 0 deletions packages/camera/camera/ios/Classes/FLTSavePhotoDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ - (void)handlePhotoCaptureResultWithError:(NSError *)error
});
}

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#pragma clang diagnostic ignored "-Wdeprecated-implementations"
- (void)captureOutput:(AVCapturePhotoOutput *)output
didFinishProcessingPhotoSampleBuffer:(CMSampleBufferRef)photoSampleBuffer
previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
Expand All @@ -56,6 +59,7 @@ - (void)captureOutput:(AVCapturePhotoOutput *)output
previewPhotoSampleBuffer];
}];
}
#pragma clang diagnostic pop

- (void)captureOutput:(AVCapturePhotoOutput *)output
didFinishProcessingPhoto:(AVCapturePhoto *)photo
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: A Flutter plugin for controlling the camera. Supports previewing
Dart.
repository: https://github.com/flutter/plugins/tree/main/packages/camera/camera
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
version: 0.9.5
version: 0.9.5+1

environment:
sdk: ">=2.14.0 <3.0.0"
Expand Down
4 changes: 4 additions & 0 deletions packages/image_picker/image_picker_ios/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.8.5+4

* Suppresses warnings for pre-iOS-11 codepaths.

## 0.8.5+3

* Fixes 'messages.g.h' file not found.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@ + (PHAsset *)getAssetFromImagePickerInfo:(NSDictionary *)info {
if (@available(iOS 11, *)) {
return [info objectForKey:UIImagePickerControllerPHAsset];
}
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
NSURL *referenceURL = [info objectForKey:UIImagePickerControllerReferenceURL];
if (!referenceURL) {
return nil;
}
PHFetchResult<PHAsset *> *result = [PHAsset fetchAssetsWithALAssetURLs:@[ referenceURL ]
options:nil];
return result.firstObject;
#pragma clang diagnostic pop
}

+ (PHAsset *)getAssetFromPHPickerResult:(PHPickerResult *)result API_AVAILABLE(ios(14)) {
Expand Down
2 changes: 1 addition & 1 deletion packages/image_picker/image_picker_ios/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: image_picker_ios
description: iOS implementation of the video_picker plugin.
repository: https://github.com/flutter/plugins/tree/main/packages/image_picker/image_picker_ios
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
version: 0.8.5+3
version: 0.8.5+4

environment:
sdk: ">=2.14.0 <3.0.0"
Expand Down
6 changes: 5 additions & 1 deletion packages/local_auth/local_auth_ios/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.0.6

* Suppresses warnings for pre-iOS-11 codepaths.

## 1.0.5

* Removes unnecessary imports.
Expand All @@ -6,7 +10,7 @@

## 1.0.4

* Fixes `deviceSupportsBiometrics` to return true when biometric hardware
* Fixes `deviceSupportsBiometrics` to return true when biometric hardware
is available but not enrolled.

## 1.0.3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,16 @@ - (void)alertMessage:(NSString *)message
handler:^(UIAlertAction *action) {
if (UIApplicationOpenSettingsURLString != NULL) {
NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
[[UIApplication sharedApplication] openURL:url];
if (@available(iOS 10, *)) {
[[UIApplication sharedApplication] openURL:url
options:@{}
completionHandler:NULL];
} else {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[[UIApplication sharedApplication] openURL:url];
#pragma clang diagnostic pop
}
result(@NO);
}
}];
Expand Down Expand Up @@ -113,9 +122,12 @@ - (void)deviceSupportsBiometrics:(FlutterResult)result {
result(@YES);
return;
}
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
} else if (authError.code == LAErrorTouchIDNotEnrolled) {
result(@YES);
return;
#pragma clang diagnostic pop
}
}

Expand Down Expand Up @@ -205,9 +217,14 @@ - (void)handleAuthReplyWithSuccess:(BOOL)success
} else {
switch (error.code) {
case LAErrorPasscodeNotSet:
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
// TODO(stuartmorgan): Remove the pragma and s/TouchID/Biometry/ in these constants when
// iOS 10 support is dropped. The values are the same, only the names have changed.
case LAErrorTouchIDNotAvailable:
case LAErrorTouchIDNotEnrolled:
case LAErrorTouchIDLockout:
#pragma clang diagnostic pop
case LAErrorUserFallback:
[self handleErrors:error flutterArguments:arguments withFlutterResult:result];
return;
Expand All @@ -228,7 +245,12 @@ - (void)handleErrors:(NSError *)authError
NSString *errorCode = @"NotAvailable";
switch (authError.code) {
case LAErrorPasscodeNotSet:
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
// TODO(stuartmorgan): Remove the pragma and s/TouchID/Biometry/ in this constant when
// iOS 10 support is dropped. The values are the same, only the names have changed.
case LAErrorTouchIDNotEnrolled:
#pragma clang diagnostic pop
if ([arguments[@"useErrorDialogs"] boolValue]) {
[self alertMessage:arguments[@"goToSettingDescriptionIOS"]
firstButton:arguments[@"okButton"]
Expand All @@ -238,7 +260,12 @@ - (void)handleErrors:(NSError *)authError
}
errorCode = authError.code == LAErrorPasscodeNotSet ? @"PasscodeNotSet" : @"NotEnrolled";
break;
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
// TODO(stuartmorgan): Remove the pragma and s/TouchID/Biometry/ in this constant when
// iOS 10 support is dropped. The values are the same, only the names have changed.
case LAErrorTouchIDLockout:
#pragma clang diagnostic pop
[self alertMessage:arguments[@"lockOut"]
firstButton:arguments[@"okButton"]
flutterResult:result
Expand Down
2 changes: 1 addition & 1 deletion packages/local_auth/local_auth_ios/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: local_auth_ios
description: iOS implementation of the local_auth plugin.
repository: https://github.com/flutter/plugins/tree/master/packages/local_auth/local_auth_ios
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+local_auth%22
version: 1.0.5
version: 1.0.6

environment:
sdk: ">=2.14.0 <3.0.0"
Expand Down

0 comments on commit 49a0d36

Please sign in to comment.