[ci] Run analysis with older versions of Flutter (#1152)

stuartmorgan-g · web-flow · commit 017d64da8ed3 · 2022-03-17T16:00:22.000-07:00
diff --git a/.ci/scripts/prepare_tool.sh b/.ci/scripts/prepare_tool.sh
@@ -8,4 +8,4 @@ git fetch origin master
 
 # Pinned version of the plugin tools, to avoid breakage in this repository
 # when pushing updates from flutter/plugins.
-dart pub global activate flutter_plugin_tools 0.7.3
+dart pub global activate flutter_plugin_tools 0.8.1
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -29,10 +29,10 @@ flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
     - git fetch origin
     # Switch to the requested channel.
     - git checkout $TARGET_TREEISH
-    # When using a branch rather than a hash, reset to the upstream branch
-    # rather than using pull, since the base image can sometimes be in a state
-    # where it has diverged from upstream (!).
-    - if [[ "$TARGET_TREEISH" == "$CHANNEL" ]]; then
+    # When using a branch rather than a hash or version tag, reset to the
+    # upstream branch rather than using pull, since the base image can sometimes
+    # be in a state where it has diverged from upstream (!).
+    - if [[ "$TARGET_TREEISH" == "$CHANNEL" ]] && [[ "$CHANNEL" != *"."* ]]; then
     -   git reset --hard @{u}
     - fi
     # Run doctor to allow auditing of what version of Flutter the run is using.
@@ -55,8 +55,23 @@ task:
       always:
         format_script: ./script/tool_runner.sh format --fail-on-change
         license_script: dart pub global run flutter_plugin_tools license-check
-        analyze_script: ./script/tool_runner.sh analyze --custom-analysis=web_benchmarks/testing/test_app,flutter_lints/example,rfw/example,metrics_center
+        analyze_script: ./script/tool_runner.sh analyze --custom-analysis=script/configs/custom_analysis.yaml
         pubspec_script: ./script/tool_runner.sh pubspec-check
+    # Does a sanity check that packages at least pass analysis on the N-1 and N-2
+    # versions of Flutter stable if the package claims to support that version.
+    # This is to minimize accidentally making changes that break old versions
+    # (which we don't commit to supporting, but don't want to actively break)
+    # without updating the constraints.
+    # Note: The versions below should be manually updated after a new stable
+    # version comes out.
+    - name: legacy-version-analyze
+      depends_on: format+analyze
+      env:
+        matrix:
+          CHANNEL: "2.5.3"
+          CHANNEL: "2.8.1"
+      analyze_script:
+        - ./script/tool_runner.sh analyze --skip-if-not-supporting-flutter-version="$CHANNEL" --custom-analysis=script/configs/custom_analysis.yaml
     - name: publishable
       env:
         # TODO(stuartmorgan): Remove once the fix for https://github.com/dart-lang/pub/issues/3152
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,9 @@
+BasedOnStyle: Google
+---
+Language: Cpp
+DerivePointerAlignment: false
+PointerAlignment: Left
+---
+Language: ObjC
+DerivePointerAlignment: false
+PointerAlignment: Right
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
       with:
         fetch-depth: 0 # Fetch all history so the tool can get all the tags to determine version.
     - name: Set up tools
-      run: dart pub global activate flutter_plugin_tools 0.7.3
+      run: dart pub global activate flutter_plugin_tools 0.8.1
 
     # # This workflow should be the last to run. So wait for all the other tests to succeed.
     - name: Wait on all tests
diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner/main.m b/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner/main.m
@@ -6,7 +6,7 @@
 #import <UIKit/UIKit.h>
 #import "AppDelegate.h"
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
   @autoreleasepool {
     return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
   }
diff --git a/packages/flutter_markdown/example/windows/runner/main.cpp b/packages/flutter_markdown/example/windows/runner/main.cpp
@@ -11,7 +11,7 @@
 #include "utils.h"
 
 int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
-                      _In_ wchar_t *command_line, _In_ int show_command) {
+                      _In_ wchar_t* command_line, _In_ int show_command) {
   // Attach to console when present (e.g., 'flutter run') or create a
   // new console when running with a debugger.
   if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) {
diff --git a/packages/imitation_game/imitation_tests/smiley/uikit/smiley/smiley/SceneDelegate.h b/packages/imitation_game/imitation_tests/smiley/uikit/smiley/smiley/SceneDelegate.h
@@ -6,6 +6,6 @@
 
 @interface SceneDelegate : UIResponder <UIWindowSceneDelegate>
 
-@property(strong, nonatomic) UIWindow* window;
+@property(strong, nonatomic) UIWindow *window;
 
 @end
diff --git a/packages/imitation_game/imitation_tests/smiley/uikit/smiley/smiley/ViewController.h b/packages/imitation_game/imitation_tests/smiley/uikit/smiley/smiley/ViewController.h
@@ -5,6 +5,6 @@
 #import <UIKit/UIKit.h>
 
 @interface ViewController : UIViewController
-@property(nonatomic, strong) IBOutlet UIImageView* imageView;
+@property(nonatomic, strong) IBOutlet UIImageView *imageView;
 
 @end
diff --git a/packages/imitation_game/imitation_tests/smiley/uikit/smiley/smiley/main.m b/packages/imitation_game/imitation_tests/smiley/uikit/smiley/smiley/main.m
@@ -5,8 +5,8 @@
 #import <UIKit/UIKit.h>
 #import "AppDelegate.h"
 
-int main(int argc, char* argv[]) {
-  NSString* appDelegateClassName;
+int main(int argc, char *argv[]) {
+  NSString *appDelegateClassName;
   @autoreleasepool {
     // Setup code that might create autoreleased objects goes here.
     appDelegateClassName = NSStringFromClass([AppDelegate class]);
diff --git a/packages/palette_generator/example/ios/Runner/main.m b/packages/palette_generator/example/ios/Runner/main.m
@@ -6,7 +6,7 @@
 #import <UIKit/UIKit.h>
 #import "AppDelegate.h"
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
   @autoreleasepool {
     return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
   }
diff --git a/packages/pigeon/e2e_tests/test_objc/ios/Runner/main.m b/packages/pigeon/e2e_tests/test_objc/ios/Runner/main.m
@@ -6,7 +6,7 @@
 #import <UIKit/UIKit.h>
 #import "AppDelegate.h"
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
   @autoreleasepool {
     return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
   }
diff --git a/packages/pigeon/platform_tests/ios_unit_tests/ios/Runner/main.m b/packages/pigeon/platform_tests/ios_unit_tests/ios/Runner/main.m
@@ -6,7 +6,7 @@
 #import <UIKit/UIKit.h>
 #import "AppDelegate.h"
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
   @autoreleasepool {
     return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
   }
diff --git a/packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/AllDatatypesTest.m b/packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/AllDatatypesTest.m
@@ -15,13 +15,13 @@ @interface AllDatatypesTest : XCTestCase
 @implementation AllDatatypesTest
 
 - (void)testAllNull {
-  Everything* everything = [[Everything alloc] init];
-  EchoBinaryMessenger* binaryMessenger =
+  Everything *everything = [[Everything alloc] init];
+  EchoBinaryMessenger *binaryMessenger =
       [[EchoBinaryMessenger alloc] initWithCodec:FlutterEverythingGetCodec()];
-  FlutterEverything* api = [[FlutterEverything alloc] initWithBinaryMessenger:binaryMessenger];
-  XCTestExpectation* expectation = [self expectationWithDescription:@"callback"];
+  FlutterEverything *api = [[FlutterEverything alloc] initWithBinaryMessenger:binaryMessenger];
+  XCTestExpectation *expectation = [self expectationWithDescription:@"callback"];
   [api echoEverything:everything
-           completion:^(Everything* _Nonnull result, NSError* _Nullable error) {
+           completion:^(Everything *_Nonnull result, NSError *_Nullable error) {
              XCTAssertNil(result.aBool);
              XCTAssertNil(result.anInt);
              XCTAssertNil(result.aDouble);
@@ -38,7 +38,7 @@ - (void)testAllNull {
 }
 
 - (void)testAllEquals {
-  Everything* everything = [[Everything alloc] init];
+  Everything *everything = [[Everything alloc] init];
   everything.aBool = @NO;
   everything.anInt = @(1);
   everything.aDouble = @(2.0);
@@ -54,12 +54,12 @@ - (void)testAllEquals {
   everything.aList = @[ @(1), @(2) ];
   everything.aMap = @{@"hello" : @(1234)};
   everything.mapWithObject = @{@"hello" : @(1234), @"goodbye" : @"world"};
-  EchoBinaryMessenger* binaryMessenger =
+  EchoBinaryMessenger *binaryMessenger =
       [[EchoBinaryMessenger alloc] initWithCodec:FlutterEverythingGetCodec()];
-  FlutterEverything* api = [[FlutterEverything alloc] initWithBinaryMessenger:binaryMessenger];
-  XCTestExpectation* expectation = [self expectationWithDescription:@"callback"];
+  FlutterEverything *api = [[FlutterEverything alloc] initWithBinaryMessenger:binaryMessenger];
+  XCTestExpectation *expectation = [self expectationWithDescription:@"callback"];
   [api echoEverything:everything
-           completion:^(Everything* _Nonnull result, NSError* _Nullable error) {
+           completion:^(Everything *_Nonnull result, NSError *_Nullable error) {
              XCTAssertEqual(result.aBool, everything.aBool);
              XCTAssertEqual(result.anInt, everything.anInt);
              XCTAssertEqual(result.aDouble, everything.aDouble);
diff --git a/packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/EchoMessenger.h b/packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/EchoMessenger.h
@@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// A FlutterBinaryMessenger who replies with the first argument sent to it.
 @interface EchoBinaryMessenger : NSObject <FlutterBinaryMessenger>
 - (instancetype)init NS_UNAVAILABLE;
-- (instancetype)initWithCodec:(NSObject<FlutterMessageCodec>*)codec;
+- (instancetype)initWithCodec:(NSObject<FlutterMessageCodec> *)codec;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/EnumTest.m b/packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/EnumTest.m
@@ -15,14 +15,14 @@ @interface EnumTest : XCTestCase
 @implementation EnumTest
 
 - (void)testEcho {
-  ACData* data = [[ACData alloc] init];
+  ACData *data = [[ACData alloc] init];
   data.state = ACStateError;
-  EchoBinaryMessenger* binaryMessenger =
+  EchoBinaryMessenger *binaryMessenger =
       [[EchoBinaryMessenger alloc] initWithCodec:ACEnumApi2HostGetCodec()];
-  ACEnumApi2Flutter* api = [[ACEnumApi2Flutter alloc] initWithBinaryMessenger:binaryMessenger];
-  XCTestExpectation* expectation = [self expectationWithDescription:@"callback"];
+  ACEnumApi2Flutter *api = [[ACEnumApi2Flutter alloc] initWithBinaryMessenger:binaryMessenger];
+  XCTestExpectation *expectation = [self expectationWithDescription:@"callback"];
   [api echoData:data
-      completion:^(ACData* _Nonnull result, NSError* _Nullable error) {
+      completion:^(ACData *_Nonnull result, NSError *_Nullable error) {
         XCTAssertEqual(data.state, result.state);
         [expectation fulfill];
       }];
diff --git a/packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/ListTest.m b/packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/ListTest.m
@@ -15,16 +15,16 @@ @interface ListTest : XCTestCase
 @implementation ListTest
 
 - (void)testListInList {
-  LSTTestMessage* top = [[LSTTestMessage alloc] init];
-  LSTTestMessage* inside = [[LSTTestMessage alloc] init];
+  LSTTestMessage *top = [[LSTTestMessage alloc] init];
+  LSTTestMessage *inside = [[LSTTestMessage alloc] init];
   inside.testList = @[ @1, @2, @3 ];
   top.testList = @[ inside ];
-  EchoBinaryMessenger* binaryMessenger =
+  EchoBinaryMessenger *binaryMessenger =
       [[EchoBinaryMessenger alloc] initWithCodec:LSTEchoApiGetCodec()];
-  LSTEchoApi* api = [[LSTEchoApi alloc] initWithBinaryMessenger:binaryMessenger];
-  XCTestExpectation* expectation = [self expectationWithDescription:@"callback"];
+  LSTEchoApi *api = [[LSTEchoApi alloc] initWithBinaryMessenger:binaryMessenger];
+  XCTestExpectation *expectation = [self expectationWithDescription:@"callback"];
   [api echoMsg:top
-      completion:^(LSTTestMessage* _Nonnull result, NSError* _Nullable err) {
+      completion:^(LSTTestMessage *_Nonnull result, NSError *_Nullable err) {
         XCTAssertEqual(1u, result.testList.count);
         XCTAssertTrue([result.testList[0] isKindOfClass:[LSTTestMessage class]]);
         XCTAssertEqualObjects(inside.testList, [result.testList[0] testList]);
diff --git a/packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/NonNullFieldsTest.m b/packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/NonNullFieldsTest.m
@@ -16,7 +16,7 @@ @interface NonNullFieldsTest : XCTestCase
 @implementation NonNullFieldsTest
 
 - (void)testMake {
-  NNFSearchRequest* request = [NNFSearchRequest makeWithQuery:@"hello"];
+  NNFSearchRequest *request = [NNFSearchRequest makeWithQuery:@"hello"];
   XCTAssertEqualObjects(@"hello", request.query);
 }
 
diff --git a/packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/NullableReturnsTest.m b/packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/NullableReturnsTest.m
@@ -10,13 +10,13 @@
 ///////////////////////////////////////////////////////////////////////////////////////////
 @interface MockNullableArgHostApi : NSObject <NRNullableArgHostApi>
 @property(nonatomic, assign) BOOL didCall;
-@property(nonatomic, copy) NSNumber* x;
+@property(nonatomic, copy) NSNumber *x;
 @end
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 @implementation MockNullableArgHostApi
-- (nullable NSNumber*)doitX:(NSNumber* _Nullable)x
-                      error:(FlutterError* _Nullable __autoreleasing* _Nonnull)error {
+- (nullable NSNumber *)doitX:(NSNumber *_Nullable)x
+                       error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
   _didCall = YES;
   self.x = x;
   return x;
@@ -32,29 +32,29 @@ @interface NullableReturnsTest : XCTestCase
 @implementation NullableReturnsTest
 
 - (void)testNullableParameterWithFlutterApi {
-  EchoBinaryMessenger* binaryMessenger =
+  EchoBinaryMessenger *binaryMessenger =
       [[EchoBinaryMessenger alloc] initWithCodec:NRNullableArgFlutterApiGetCodec()];
-  NRNullableArgFlutterApi* api =
+  NRNullableArgFlutterApi *api =
       [[NRNullableArgFlutterApi alloc] initWithBinaryMessenger:binaryMessenger];
-  XCTestExpectation* expectation = [self expectationWithDescription:@"callback"];
+  XCTestExpectation *expectation = [self expectationWithDescription:@"callback"];
   [api doitX:nil
-      completion:^(NSNumber* _Nonnull result, NSError* _Nullable error) {
+      completion:^(NSNumber *_Nonnull result, NSError *_Nullable error) {
         XCTAssertNil(result);
         [expectation fulfill];
       }];
   [self waitForExpectations:@[ expectation ] timeout:1.0];
 }
 
 - (void)testNullableParameterWithHostApi {
-  MockNullableArgHostApi* api = [[MockNullableArgHostApi alloc] init];
-  MockBinaryMessenger* binaryMessenger =
+  MockNullableArgHostApi *api = [[MockNullableArgHostApi alloc] init];
+  MockBinaryMessenger *binaryMessenger =
       [[MockBinaryMessenger alloc] initWithCodec:NRNullableArgHostApiGetCodec()];
-  NSString* channel = @"dev.flutter.pigeon.NullableArgHostApi.doit";
+  NSString *channel = @"dev.flutter.pigeon.NullableArgHostApi.doit";
   NRNullableArgHostApiSetup(binaryMessenger, api);
   XCTAssertNotNil(binaryMessenger.handlers[channel]);
-  XCTestExpectation* expectation = [self expectationWithDescription:@"callback"];
-  NSData* arguments = [NRNullableArgHostApiGetCodec() encode:@[ [NSNull null] ]];
-  binaryMessenger.handlers[channel](arguments, ^(NSData* data) {
+  XCTestExpectation *expectation = [self expectationWithDescription:@"callback"];
+  NSData *arguments = [NRNullableArgHostApiGetCodec() encode:@[ [NSNull null] ]];
+  binaryMessenger.handlers[channel](arguments, ^(NSData *data) {
     [expectation fulfill];
   });
   XCTAssertTrue(api.didCall);
diff --git a/packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/PrimitiveTest.m b/packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/PrimitiveTest.m
diff --git a/packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/RunnerTests.m b/packages/pigeon/platform_tests/ios_unit_tests/ios/RunnerTests/RunnerTests.m
diff --git a/packages/pigeon/run_tests.sh b/packages/pigeon/run_tests.sh
diff --git a/packages/rfw/example/hello/windows/runner/main.cpp b/packages/rfw/example/hello/windows/runner/main.cpp
diff --git a/packages/rfw/example/local/windows/runner/main.cpp b/packages/rfw/example/local/windows/runner/main.cpp
diff --git a/packages/rfw/example/remote/windows/runner/main.cpp b/packages/rfw/example/remote/windows/runner/main.cpp
diff --git a/packages/rfw/example/wasm/windows/runner/main.cpp b/packages/rfw/example/wasm/windows/runner/main.cpp
diff --git a/script/configs/custom_analysis.yaml b/script/configs/custom_analysis.yaml

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#import <UIKit/UIKit.h>`
`7`	`7`	`#import "AppDelegate.h"`
`8`	`8`
`9`		`-int main(int argc, char* argv[]) {`
	`9`	`+int main(int argc, char *argv[]) {`
`10`	`10`	`@autoreleasepool {`
`11`	`11`	`return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ @interface NonNullFieldsTest : XCTestCase`
`16`	`16`	`@implementation NonNullFieldsTest`
`17`	`17`
`18`	`18`	`- (void)testMake {`
`19`		`- NNFSearchRequest* request = [NNFSearchRequest makeWithQuery:@"hello"];`
	`19`	`+ NNFSearchRequest *request = [NNFSearchRequest makeWithQuery:@"hello"];`
`20`	`20`	`XCTAssertEqualObjects(@"hello", request.query);`
`21`	`21`	`}`
`22`	`22`