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

Commit 49a0d36

Browse files
[ci] Manually roll Flutter master (#5765)
1 parent 4b1d47e commit 49a0d36

File tree

10 files changed

+52
-6
lines changed

10 files changed

+52
-6
lines changed

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2b2cda15293d86d5c27d345505cde25b9efcb153
1+
036cae36697a6c078fe28ac6088a2a493d0e7958

packages/camera/camera/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.9.5+1
2+
3+
* Suppresses warnings for pre-iOS-11 codepaths.
4+
15
## 0.9.5
26

37
* Adds camera access permission handling logic on iOS to fix a related crash when using the camera for the first time.

packages/camera/camera/ios/Classes/FLTSavePhotoDelegate.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ - (void)handlePhotoCaptureResultWithError:(NSError *)error
4242
});
4343
}
4444

45+
#pragma clang diagnostic push
46+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
47+
#pragma clang diagnostic ignored "-Wdeprecated-implementations"
4548
- (void)captureOutput:(AVCapturePhotoOutput *)output
4649
didFinishProcessingPhotoSampleBuffer:(CMSampleBufferRef)photoSampleBuffer
4750
previewPhotoSampleBuffer:(CMSampleBufferRef)previewPhotoSampleBuffer
@@ -56,6 +59,7 @@ - (void)captureOutput:(AVCapturePhotoOutput *)output
5659
previewPhotoSampleBuffer];
5760
}];
5861
}
62+
#pragma clang diagnostic pop
5963

6064
- (void)captureOutput:(AVCapturePhotoOutput *)output
6165
didFinishProcessingPhoto:(AVCapturePhoto *)photo

packages/camera/camera/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: A Flutter plugin for controlling the camera. Supports previewing
44
Dart.
55
repository: https://github.com/flutter/plugins/tree/main/packages/camera/camera
66
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
7-
version: 0.9.5
7+
version: 0.9.5+1
88

99
environment:
1010
sdk: ">=2.14.0 <3.0.0"

packages/image_picker/image_picker_ios/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.8.5+4
2+
3+
* Suppresses warnings for pre-iOS-11 codepaths.
4+
15
## 0.8.5+3
26

37
* Fixes 'messages.g.h' file not found.

packages/image_picker/image_picker_ios/ios/Classes/FLTImagePickerPhotoAssetUtil.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,16 @@ + (PHAsset *)getAssetFromImagePickerInfo:(NSDictionary *)info {
1414
if (@available(iOS 11, *)) {
1515
return [info objectForKey:UIImagePickerControllerPHAsset];
1616
}
17+
#pragma clang diagnostic push
18+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1719
NSURL *referenceURL = [info objectForKey:UIImagePickerControllerReferenceURL];
1820
if (!referenceURL) {
1921
return nil;
2022
}
2123
PHFetchResult<PHAsset *> *result = [PHAsset fetchAssetsWithALAssetURLs:@[ referenceURL ]
2224
options:nil];
2325
return result.firstObject;
26+
#pragma clang diagnostic pop
2427
}
2528

2629
+ (PHAsset *)getAssetFromPHPickerResult:(PHPickerResult *)result API_AVAILABLE(ios(14)) {

packages/image_picker/image_picker_ios/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: image_picker_ios
22
description: iOS implementation of the video_picker plugin.
33
repository: https://github.com/flutter/plugins/tree/main/packages/image_picker/image_picker_ios
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
5-
version: 0.8.5+3
5+
version: 0.8.5+4
66

77
environment:
88
sdk: ">=2.14.0 <3.0.0"

packages/local_auth/local_auth_ios/CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.0.6
2+
3+
* Suppresses warnings for pre-iOS-11 codepaths.
4+
15
## 1.0.5
26

37
* Removes unnecessary imports.
@@ -6,7 +10,7 @@
610

711
## 1.0.4
812

9-
* Fixes `deviceSupportsBiometrics` to return true when biometric hardware
13+
* Fixes `deviceSupportsBiometrics` to return true when biometric hardware
1014
is available but not enrolled.
1115

1216
## 1.0.3

packages/local_auth/local_auth_ios/ios/Classes/FLTLocalAuthPlugin.m

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,16 @@ - (void)alertMessage:(NSString *)message
8484
handler:^(UIAlertAction *action) {
8585
if (UIApplicationOpenSettingsURLString != NULL) {
8686
NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
87-
[[UIApplication sharedApplication] openURL:url];
87+
if (@available(iOS 10, *)) {
88+
[[UIApplication sharedApplication] openURL:url
89+
options:@{}
90+
completionHandler:NULL];
91+
} else {
92+
#pragma clang diagnostic push
93+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
94+
[[UIApplication sharedApplication] openURL:url];
95+
#pragma clang diagnostic pop
96+
}
8897
result(@NO);
8998
}
9099
}];
@@ -113,9 +122,12 @@ - (void)deviceSupportsBiometrics:(FlutterResult)result {
113122
result(@YES);
114123
return;
115124
}
125+
#pragma clang diagnostic push
126+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
116127
} else if (authError.code == LAErrorTouchIDNotEnrolled) {
117128
result(@YES);
118129
return;
130+
#pragma clang diagnostic pop
119131
}
120132
}
121133

@@ -205,9 +217,14 @@ - (void)handleAuthReplyWithSuccess:(BOOL)success
205217
} else {
206218
switch (error.code) {
207219
case LAErrorPasscodeNotSet:
220+
#pragma clang diagnostic push
221+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
222+
// TODO(stuartmorgan): Remove the pragma and s/TouchID/Biometry/ in these constants when
223+
// iOS 10 support is dropped. The values are the same, only the names have changed.
208224
case LAErrorTouchIDNotAvailable:
209225
case LAErrorTouchIDNotEnrolled:
210226
case LAErrorTouchIDLockout:
227+
#pragma clang diagnostic pop
211228
case LAErrorUserFallback:
212229
[self handleErrors:error flutterArguments:arguments withFlutterResult:result];
213230
return;
@@ -228,7 +245,12 @@ - (void)handleErrors:(NSError *)authError
228245
NSString *errorCode = @"NotAvailable";
229246
switch (authError.code) {
230247
case LAErrorPasscodeNotSet:
248+
#pragma clang diagnostic push
249+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
250+
// TODO(stuartmorgan): Remove the pragma and s/TouchID/Biometry/ in this constant when
251+
// iOS 10 support is dropped. The values are the same, only the names have changed.
231252
case LAErrorTouchIDNotEnrolled:
253+
#pragma clang diagnostic pop
232254
if ([arguments[@"useErrorDialogs"] boolValue]) {
233255
[self alertMessage:arguments[@"goToSettingDescriptionIOS"]
234256
firstButton:arguments[@"okButton"]
@@ -238,7 +260,12 @@ - (void)handleErrors:(NSError *)authError
238260
}
239261
errorCode = authError.code == LAErrorPasscodeNotSet ? @"PasscodeNotSet" : @"NotEnrolled";
240262
break;
263+
#pragma clang diagnostic push
264+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
265+
// TODO(stuartmorgan): Remove the pragma and s/TouchID/Biometry/ in this constant when
266+
// iOS 10 support is dropped. The values are the same, only the names have changed.
241267
case LAErrorTouchIDLockout:
268+
#pragma clang diagnostic pop
242269
[self alertMessage:arguments[@"lockOut"]
243270
firstButton:arguments[@"okButton"]
244271
flutterResult:result

packages/local_auth/local_auth_ios/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: local_auth_ios
22
description: iOS implementation of the local_auth plugin.
33
repository: https://github.com/flutter/plugins/tree/master/packages/local_auth/local_auth_ios
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+local_auth%22
5-
version: 1.0.5
5+
version: 1.0.6
66

77
environment:
88
sdk: ">=2.14.0 <3.0.0"

0 commit comments

Comments
 (0)