Merge NNBD branch into master

.github/workflows/nnbd-test.yaml

@@ -0,0 +1,70 @@
+name: Test
+
+on:
+  # Run CI on pushes to the main branch, and on PRs against main.
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  schedule:
+    - cron: 0 15 * * *
+
+env:
+  PUB_ENVIRONMENT: bot.github
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        sdk: [dev, stable]
+        job: [main, flutter, sdk-analyzer, packages, sdk-docs]
+        include:
+          - os: macos-latest
+            sdk: dev
+            job: main
+          - os: windows-latest
+            sdk: dev
+            job: main
+        exclude:
+            # Do not try to run flutter against the "stable" sdk,
+            # it is unlikely to work and produces uninteresting
+            # results.
+          - sdk: stable
+            job: flutter
+          - sdk: stable
+            job: sdk-analyzer
+
+    steps:
+      - name: Configure git
+        if: runner.os == 'Windows'
+        run: git config --global core.autocrlf input
+      - uses: actions/checkout@v2
+      - uses: dart-lang/[email protected]
+        with:
+          sdk: ${{ matrix.sdk }}
+      - name: Install dependencies
+        run: dart pub get
+      - name: ${{ matrix.job }}
+        if: runner.os != 'Windows'
+        run: ./tool/travis.sh
+        env:
+          DARTDOC_BOT: ${{ matrix.job }}
+          #COVERAGE_TOKEN: true # this needs to be set to enable coverage
+      - name: ${{ matrix.job }}
+        if: runner.os == 'Windows' && matrix.job == 'main'
+        run: dart run grinder buildbot
+        env:
+          DARTDOC_BOT: ${{ matrix.job }}
+     # - id: coverage
+     #   name: Upload coverage
+     #   if: runner.os == 'Linux' && matrix.job == 'main' && matrix.sdk == 'dev'
+     #   uses: coverallsapp/[email protected]
+     #   with:
+     #     github-token: ${{ secrets.GITHUB_TOKEN }}
+     #     path-to-lcov: lcov.info
+     # - name: Echo coveralls api result
+     #   if: runner.os == 'Linux' && matrix.job == 'main' && matrix.sdk == 'dev'
+     #   run: echo ${{ steps.coverage.outputs['coveralls-api-result'] }}

.github/workflows/test.yaml

@@ -1,11 +1,11 @@
-name: Test
+name: Test - NNBD branch
 
 on:
   # Run CI on pushes to the main branch, and on PRs against main.
   push:
-    branches: [ master ]
+    branches: [ nnbd ]
   pull_request:
-    branches: [ master ]
+    branches: [ nnbd ]
   schedule:
     - cron: 0 15 * * *
 
@@ -20,14 +20,14 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         sdk: [dev, stable]
-        job: [main, flutter, sdk-analyzer, packages, sdk-docs]
+        job: [nnbd, flutter, sdk-analyzer, packages, sdk-docs]
         include:
           - os: macos-latest
             sdk: dev
-            job: main
+            job: nnbd
           - os: windows-latest
             sdk: dev
-            job: main
+            job: nnbd
         exclude:
             # Do not try to run flutter against the "stable" sdk,
             # it is unlikely to work and produces uninteresting
@@ -76,8 +76,8 @@ jobs:
           DARTDOC_BOT: ${{ matrix.job }}
           #COVERAGE_TOKEN: true # this needs to be set to enable coverage
       - name: ${{ matrix.job }}
-        if: runner.os == 'Windows' && matrix.job == 'main'
-        run: dart run grinder buildbot
+        if: runner.os == 'Windows' && matrix.job == 'nnbd'
+        run: dart run grinder buildbot-no-publish
         env:
           DARTDOC_BOT: ${{ matrix.job }}
      # - id: coverage

analysis_options.yaml

@@ -14,12 +14,27 @@ analyzer:
     - 'lib/src/third_party/pkg/**'
     - 'lib/templates/*.html'
     - 'pub.dartlang.org/**'
-    - 'testing/**'
+    # These have a lot of lint.
+    - 'testing/test_package/**'
+    - 'testing/test_package_custom_templates/**'
+    - 'testing/test_package_experiments/**'
+    - 'testing/test_package_export_error/**'
+    - 'testing/test_package_extensions/**'
+    - 'testing/test_package_import_export_error/**'
+    - 'testing/test_package_imported/**'
+    - 'testing/test_package_options/**'
+    # This package imports flutter, which is perhaps not found by the base `dart analyze` tool.
     - 'testing/flutter_packages/test_package_flutter_plugin/**'
+    # This package is meant to mock the sky_engine package.
+    - 'testing/sky_engine/**'
+    # These packages have compile-time errors.
+    - 'testing/test_package_bad/**'
     - 'testing/test_package_export_error/**'
 linter:
   rules:
     always_declare_return_types: true
+    always_put_required_named_parameters_first: true
+    avoid_bool_literals_in_conditional_expressions: true
     avoid_dynamic_calls: true
     avoid_single_cascade_in_expression_statements: true
     avoid_unused_constructor_parameters: true
@@ -29,8 +44,10 @@ linter:
     package_api_docs: true
     prefer_final_fields: true
     prefer_initializing_formals: true
+    prefer_single_quotes: true
     prefer_void_to_null: true
     slash_for_doc_comments: true
     type_annotate_public_apis: true
     # Work in progress canonical score lints
     unawaited_futures: true
+    unnecessary_null_aware_assignments: true

analysis_options_presubmit.yaml

@@ -10,19 +10,35 @@ analyzer:
     ### Extra ignores for presubmit
     deprecated_member_use: ignore
     deprecated_member_use_from_same_package: ignore
+    ### Temporary presubmit ignore for NNBD migration
+    import_of_legacy_library_into_null_safe: ignore
   language:
     strict-raw-types: true
   exclude:
     - 'doc/**'
     - 'lib/src/third_party/pkg/**'
     - 'lib/templates/*.html'
     - 'pub.dartlang.org/**'
-    - 'testing/**'
-    - 'testing/flutter_packages/test_package_flutter_plugin/**'
+    # These have a lot of lint.
+    - 'testing/test_package/**'
+    - 'testing/test_package_custom_templates/**'
+    - 'testing/test_package_experiments/**'
     - 'testing/test_package_export_error/**'
+    - 'testing/test_package_extensions/**'
+    - 'testing/test_package_import_export_error/**'
+    - 'testing/test_package_imported/**'
+    - 'testing/test_package_options/**'
+    # This package imports flutter, which is perhaps not found by the base `dart analyze` tool.
+    - 'testing/flutter_packages/test_package_flutter_plugin/**'
+    # This package is meant to mock the sky_engine package.
+    - 'testing/sky_engine/**'
+    # These packages have compile-time errors.
+    - 'testing/test_package_bad/**'
 linter:
   rules:
     always_declare_return_types: true
+    always_put_required_named_parameters_first: true
+    avoid_bool_literals_in_conditional_expressions: true
     avoid_dynamic_calls: true
     avoid_single_cascade_in_expression_statements: true
     avoid_unused_constructor_parameters: true
@@ -32,8 +48,10 @@ linter:
     package_api_docs: true
     prefer_final_fields: true
     prefer_initializing_formals: true
+    prefer_single_quotes: true
     prefer_void_to_null: true
     slash_for_doc_comments: true
     type_annotate_public_apis: true
     # Work in progress canonical score lints
     unawaited_futures: true
+    unnecessary_null_aware_assignments: true