Merge remote-tracking branch 'upstream/master' into bugfix/camera-threading

Author: mvanbeusekom

packages/camera/camera/android/build.gradle

@@ -1,6 +1,6 @@
 group 'io.flutter.plugins.camera'
 version '1.0-SNAPSHOT'
-def args = ["-Xlint:deprecation","-Xlint:unchecked","-Werror"]
+def args = ["-Xlint:deprecation","-Xlint:unchecked"]
 
 buildscript {
     repositories {

packages/camera/camera/example/ios/RunnerTests/CameraMethodChannelTests.m

@@ -16,7 +16,7 @@ @implementation CameraMethodChannelTests
 
 - (void)testCreate_ShouldCallResultOnMainThread {
   CameraPlugin *camera = [[CameraPlugin alloc] initWithRegistry:nil messenger:nil];
-  
+
   XCTestExpectation *expectation =
       [[XCTestExpectation alloc] initWithDescription:@"Result finished"];
 
@@ -29,8 +29,9 @@ - (void)testCreate_ShouldCallResultOnMainThread {
   OCMStub([avCaptureSessionMock alloc]).andReturn(avCaptureSessionMock);
   OCMStub([avCaptureSessionMock canSetSessionPreset:[OCMArg any]]).andReturn(YES);
 
-  MockFLTThreadSafeFlutterResult *resultObject = [[MockFLTThreadSafeFlutterResult alloc] initWithExpectation:expectation];
-  
+  MockFLTThreadSafeFlutterResult *resultObject =
+      [[MockFLTThreadSafeFlutterResult alloc] initWithExpectation:expectation];
+
   // Set up method call
   FlutterMethodCall *call = [FlutterMethodCall
       methodCallWithMethodName:@"create"

packages/camera/camera/example/ios/RunnerTests/CameraOrientationTests.m

@@ -17,13 +17,25 @@ @implementation CameraOrientationTests
 - (void)testOrientationNotifications {
   id mockMessenger = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   CameraPlugin *cameraPlugin = [[CameraPlugin alloc] initWithRegistry:nil messenger:mockMessenger];
-  
+
   [mockMessenger setExpectationOrderMatters:YES];
 
-  [self rotate:UIDeviceOrientationPortraitUpsideDown expectedChannelOrientation:@"portraitDown" cameraPlugin:cameraPlugin messenger: mockMessenger];
-  [self rotate:UIDeviceOrientationPortrait expectedChannelOrientation:@"portraitUp" cameraPlugin:cameraPlugin messenger: mockMessenger];
-  [self rotate:UIDeviceOrientationLandscapeRight expectedChannelOrientation:@"landscapeLeft" cameraPlugin:cameraPlugin messenger: mockMessenger];
-  [self rotate:UIDeviceOrientationLandscapeLeft expectedChannelOrientation:@"landscapeRight" cameraPlugin:cameraPlugin messenger: mockMessenger];
+  [self rotate:UIDeviceOrientationPortraitUpsideDown
+      expectedChannelOrientation:@"portraitDown"
+                    cameraPlugin:cameraPlugin
+                       messenger:mockMessenger];
+  [self rotate:UIDeviceOrientationPortrait
+      expectedChannelOrientation:@"portraitUp"
+                    cameraPlugin:cameraPlugin
+                       messenger:mockMessenger];
+  [self rotate:UIDeviceOrientationLandscapeRight
+      expectedChannelOrientation:@"landscapeLeft"
+                    cameraPlugin:cameraPlugin
+                       messenger:mockMessenger];
+  [self rotate:UIDeviceOrientationLandscapeLeft
+      expectedChannelOrientation:@"landscapeRight"
+                    cameraPlugin:cameraPlugin
+                       messenger:mockMessenger];
 
   OCMReject([mockMessenger sendOnChannel:[OCMArg any] message:[OCMArg any]]);
 
@@ -39,9 +51,8 @@ - (void)testOrientationNotifications {
 
 - (void)rotate:(UIDeviceOrientation)deviceOrientation
     expectedChannelOrientation:(NSString *)channelOrientation
-        cameraPlugin: (CameraPlugin *)cameraPlugin
-     messenger: (NSObject<FlutterBinaryMessenger> *) messenger {
-  
+                  cameraPlugin:(CameraPlugin *)cameraPlugin
+                     messenger:(NSObject<FlutterBinaryMessenger> *)messenger {
   XCTestExpectation *orientationExpectation = [self expectationWithDescription:channelOrientation];
 
   OCMExpect([messenger
@@ -55,8 +66,7 @@ - (void)rotate:(UIDeviceOrientation)deviceOrientation
                   [methodCall.arguments isEqualToDictionary:@{@"orientation" : channelOrientation}];
             }]]);
 
-  [cameraPlugin
-      orientationChanged:[self createMockNotificationForOrientation:deviceOrientation]];
+  [cameraPlugin orientationChanged:[self createMockNotificationForOrientation:deviceOrientation]];
   [self waitForExpectationsWithTimeout:30.0 handler:nil];
 }
 

packages/camera/camera/example/ios/RunnerTests/CameraPreviewPauseTests.m

@@ -34,7 +34,7 @@ - (void)testPausePreviewWithResult_shouldPausePreview {
 - (void)testResumePreviewWithResult_shouldResumePreview {
   FLTCam *camera = [[FLTCam alloc] init];
   MockFLTThreadSafeFlutterResult *resultObject = [[MockFLTThreadSafeFlutterResult alloc] init];
-  
+
   [camera resumePreviewWithResult:resultObject];
   XCTAssertFalse(camera.isPreviewPaused);
 }

packages/camera/camera/example/ios/RunnerTests/MockFLTThreadSafeFlutterResult.h

@@ -16,9 +16,10 @@
 /**
  * Initializes the MockFLTThreadSafeFlutterResult with an expectation.
  *
- * The expectation is fullfilled when a result is called allowing tests to await the result in an asynchronous manner.
+ * The expectation is fullfilled when a result is called allowing tests to await the result in an
+ * asynchronous manner.
  */
-- (instancetype _Nonnull) initWithExpectation:(nonnull XCTestExpectation *)expectation;
+- (instancetype _Nonnull)initWithExpectation:(nonnull XCTestExpectation *)expectation;
 @end
 
 #endif /* MockFLTThreadSafeFlutterResult_h */

packages/camera/camera/ios/Classes/CameraPlugin_Test.h

@@ -21,7 +21,7 @@
 /// Exposes the [CameraPlugin handleMethodCallAsync:result:] method for unit testing.
 ///
 /// This method should always be dispatched on a background queue to prevent deadlocks.
- 
+
 - (void)handleMethodCallAsync:(FlutterMethodCall *)call result:(FLTThreadSafeFlutterResult *)result;
 
 /// Exposes the [CameraPlugin orientationChanged:] method for unit testing.

script/tool/lib/src/create_all_plugins_app_command.dart

@@ -93,10 +93,13 @@ class CreateAllPluginsAppCommand extends PluginCommand {
 
     final StringBuffer newGradle = StringBuffer();
     for (final String line in gradleFile.readAsLinesSync()) {
-      if (line.contains('minSdkVersion 16')) {
-        // Android SDK 20 is required by Google maps.
-        // Android SDK 19 is required by WebView.
+      if (line.contains('minSdkVersion')) {
+        // minSdkVersion 20 is required by Google maps.
+        // minSdkVersion 19 is required by WebView.
         newGradle.writeln('minSdkVersion 20');
+      } else if (line.contains('compileSdkVersion')) {
+        // compileSdkVersion 31 is required by Camera.
+        newGradle.writeln('compileSdkVersion 31');
       } else {
         newGradle.writeln(line);
       }