From f850e38672c9466772ee00c640826828679cf4b4 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Thu, 2 Dec 2021 15:01:20 -0500 Subject: [PATCH] [ci] Roll repo tooling to 0.7.3 (#520) Updates tool pin to 0.7.3 - Enables versiond and CHANGELOG update checks. - Enables timing logging. Changes to allow the roll to pass: - Adds missing licenses to Kotlin files (which were not previously checked). - Adds missing AUTHORS files. - Adjusts package descriptions to meet pub.dev length guidelines, which the tooling now enforces. --- .ci/scripts/build_examples_win32.sh | 2 +- .ci/scripts/native_test_win32.sh | 2 +- .ci/scripts/prepare_tool.sh | 2 +- .cirrus.yml | 15 ++++++++++++++- .github/workflows/release.yml | 2 +- .../packages/animations/example/MainActivity.kt | 3 +++ packages/css_colors/CHANGELOG.md | 4 ++++ packages/css_colors/pubspec.yaml | 2 +- packages/flutter_image/CHANGELOG.md | 4 ++++ packages/flutter_image/pubspec.yaml | 2 +- packages/flutter_lints/AUTHORS | 6 ++++++ .../flutter_markdown_example/MainActivity.kt | 3 +++ packages/flutter_template_images/CHANGELOG.md | 4 ++++ packages/flutter_template_images/pubspec.yaml | 2 +- .../smiley/ExampleInstrumentedTest.kt | 3 +++ .../flutter/imitation_game/smiley/MainActivity.kt | 3 +++ .../kotlin/com/example/smiley/MainActivity.kt | 3 +++ packages/multicast_dns/CHANGELOG.md | 4 ++++ packages/multicast_dns/pubspec.yaml | 2 +- .../palettegenerator/example/MainActivity.kt | 3 +++ .../kotlin/com/example/test_objc/MainActivity.kt | 3 +++ .../example/android_unit_tests/MainActivity.kt | 3 +++ packages/rfw/AUTHORS | 6 ++++++ .../flutter/rfw/examples/hello/MainActivity.kt | 3 +++ .../flutter/rfw/examples/local/MainActivity.kt | 3 +++ .../flutter/rfw/examples/remote/MainActivity.kt | 3 +++ .../dev/flutter/rfw/examples/wasm/MainActivity.kt | 3 +++ script/tool_runner.sh | 3 ++- 28 files changed, 88 insertions(+), 10 deletions(-) create mode 100644 packages/flutter_lints/AUTHORS create mode 100644 packages/rfw/AUTHORS diff --git a/.ci/scripts/build_examples_win32.sh b/.ci/scripts/build_examples_win32.sh index d4614a6947..ff30ca93ee 100755 --- a/.ci/scripts/build_examples_win32.sh +++ b/.ci/scripts/build_examples_win32.sh @@ -4,4 +4,4 @@ # found in the LICENSE file. dart pub global run flutter_plugin_tools build-examples --windows \ - --packages-for-branch + --packages-for-branch --log-timing diff --git a/.ci/scripts/native_test_win32.sh b/.ci/scripts/native_test_win32.sh index 20b92d0c08..7bfe840224 100755 --- a/.ci/scripts/native_test_win32.sh +++ b/.ci/scripts/native_test_win32.sh @@ -4,4 +4,4 @@ # found in the LICENSE file. dart pub global run flutter_plugin_tools native-test --windows \ - --no-integration --packages-for-branch + --no-integration --packages-for-branch --log-timing diff --git a/.ci/scripts/prepare_tool.sh b/.ci/scripts/prepare_tool.sh index b18bbb1dba..30ca9a77b4 100755 --- 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.1 +dart pub global activate flutter_plugin_tools 0.7.3 diff --git a/.cirrus.yml b/.cirrus.yml index 2343ef9f3c..4ed047add3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -45,7 +45,20 @@ task: # TODO(stuartmorgan): Remove once the fix for https://github.com/dart-lang/pub/issues/3152 # rolls into Flutter master. CHANNEL: stable - version_script: ./script/tool_runner.sh version-check + CHANGE_DESC: "/tmp/change-description.txt" + version_script: + # For pre-submit, pass the PR description to the script to allow for + # version check overrides. + # For post-submit, ignore missing version/CHANGELOG detection; the PR + # description isn't reliably part of the commit message, so using the + # same flags as for presubmit would likely result in false-positive + # post-submit failures. + - if [[ $CIRRUS_PR == "" ]]; then + - ./script/tool_runner.sh version-check + - else + - echo "$CIRRUS_CHANGE_MESSAGE" > "$CHANGE_DESC" + - ./script/tool_runner.sh version-check --check-for-missing-changes --change-description-file="$CHANGE_DESC" + - fi publishable_script: ./script/tool_runner.sh publish-check depends_on: - format+analyze diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2bf82d4cb9..4e11463e18 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,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.6.0+1 + run: dart pub global activate flutter_plugin_tools 0.7.3 # # 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/animations/example/android/app/src/main/kotlin/dev/flutter/packages/animations/example/MainActivity.kt b/packages/animations/example/android/app/src/main/kotlin/dev/flutter/packages/animations/example/MainActivity.kt index 643179c75b..a1f83b44dd 100644 --- a/packages/animations/example/android/app/src/main/kotlin/dev/flutter/packages/animations/example/MainActivity.kt +++ b/packages/animations/example/android/app/src/main/kotlin/dev/flutter/packages/animations/example/MainActivity.kt @@ -1,3 +1,6 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. package dev.flutter.packages.animations.example import io.flutter.embedding.android.FlutterActivity diff --git a/packages/css_colors/CHANGELOG.md b/packages/css_colors/CHANGELOG.md index 705ae8593a..70ed13e154 100644 --- a/packages/css_colors/CHANGELOG.md +++ b/packages/css_colors/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +- Updates package description. + ## 1.1.1 - Moved source to flutter/packages diff --git a/packages/css_colors/pubspec.yaml b/packages/css_colors/pubspec.yaml index 7c241fd05a..bb0ff10625 100644 --- a/packages/css_colors/pubspec.yaml +++ b/packages/css_colors/pubspec.yaml @@ -1,5 +1,5 @@ name: css_colors -description: Defines constants for the CSS Colors +description: Defines constant dart:ui Color objects for CSS colors (for use in Flutter code). repository: https://github.com/flutter/packages/tree/master/packages/css_colors issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+css_colors%22 version: 1.1.1 diff --git a/packages/flutter_image/CHANGELOG.md b/packages/flutter_image/CHANGELOG.md index 9317484c31..a485636666 100644 --- a/packages/flutter_image/CHANGELOG.md +++ b/packages/flutter_image/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +- Updates package description. + ## 4.1.0 - Added custom header support. diff --git a/packages/flutter_image/pubspec.yaml b/packages/flutter_image/pubspec.yaml index 2c8a0dab1c..6b33051797 100644 --- a/packages/flutter_image/pubspec.yaml +++ b/packages/flutter_image/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_image description: > - Image utilities for Flutter: providers, effects, etc + Image utilities for Flutter: improved network providers, effects, etc. repository: https://github.com/flutter/packages/tree/master/packages/flutter_image issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_image%22 version: 4.1.0 diff --git a/packages/flutter_lints/AUTHORS b/packages/flutter_lints/AUTHORS new file mode 100644 index 0000000000..557dff9793 --- /dev/null +++ b/packages/flutter_lints/AUTHORS @@ -0,0 +1,6 @@ +# Below is a list of people and organizations that have contributed +# to the Flutter project. Names should be added to the list like so: +# +# Name/Organization + +Google Inc. diff --git a/packages/flutter_markdown/example/android/app/src/main/kotlin/io/flutter/packages/flutter_markdown_example/MainActivity.kt b/packages/flutter_markdown/example/android/app/src/main/kotlin/io/flutter/packages/flutter_markdown_example/MainActivity.kt index d55943d22c..8ca0f14fa3 100644 --- a/packages/flutter_markdown/example/android/app/src/main/kotlin/io/flutter/packages/flutter_markdown_example/MainActivity.kt +++ b/packages/flutter_markdown/example/android/app/src/main/kotlin/io/flutter/packages/flutter_markdown_example/MainActivity.kt @@ -1,3 +1,6 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. package io.flutter.packages.flutter_markdown_example import io.flutter.embedding.android.FlutterActivity diff --git a/packages/flutter_template_images/CHANGELOG.md b/packages/flutter_template_images/CHANGELOG.md index 3e75207c45..4d074817b2 100644 --- a/packages/flutter_template_images/CHANGELOG.md +++ b/packages/flutter_template_images/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Updates package description. + ## 4.0.0 * Move assets common to all app templates to a new `app_shared` directory diff --git a/packages/flutter_template_images/pubspec.yaml b/packages/flutter_template_images/pubspec.yaml index 1c224a12ad..9e732694bf 100644 --- a/packages/flutter_template_images/pubspec.yaml +++ b/packages/flutter_template_images/pubspec.yaml @@ -1,5 +1,5 @@ name: flutter_template_images -description: Image files for use in flutter_tools templates. +description: Image files for use in flutter_tools templates without adding binary files to flutter/flutter. repository: https://github.com/flutter/packages/tree/master/packages/flutter_template_images issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_template_images%22 version: 4.0.0 diff --git a/packages/imitation_game/imitation_tests/smiley/android/app/src/androidTest/java/dev/flutter/imitation_game/smiley/ExampleInstrumentedTest.kt b/packages/imitation_game/imitation_tests/smiley/android/app/src/androidTest/java/dev/flutter/imitation_game/smiley/ExampleInstrumentedTest.kt index f276ddb757..94b92850de 100644 --- a/packages/imitation_game/imitation_tests/smiley/android/app/src/androidTest/java/dev/flutter/imitation_game/smiley/ExampleInstrumentedTest.kt +++ b/packages/imitation_game/imitation_tests/smiley/android/app/src/androidTest/java/dev/flutter/imitation_game/smiley/ExampleInstrumentedTest.kt @@ -1,3 +1,6 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. package dev.flutter.imitation_game.smiley import androidx.test.platform.app.InstrumentationRegistry diff --git a/packages/imitation_game/imitation_tests/smiley/android/app/src/main/java/dev/flutter/imitation_game/smiley/MainActivity.kt b/packages/imitation_game/imitation_tests/smiley/android/app/src/main/java/dev/flutter/imitation_game/smiley/MainActivity.kt index 7d4ef8ae41..b2f1b75bbd 100644 --- a/packages/imitation_game/imitation_tests/smiley/android/app/src/main/java/dev/flutter/imitation_game/smiley/MainActivity.kt +++ b/packages/imitation_game/imitation_tests/smiley/android/app/src/main/java/dev/flutter/imitation_game/smiley/MainActivity.kt @@ -1,3 +1,6 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. package dev.flutter.imitation_game.smiley import androidx.appcompat.app.AppCompatActivity diff --git a/packages/imitation_game/imitation_tests/smiley/flutter/smiley/android/app/src/main/kotlin/com/example/smiley/MainActivity.kt b/packages/imitation_game/imitation_tests/smiley/flutter/smiley/android/app/src/main/kotlin/com/example/smiley/MainActivity.kt index ccd14efb01..188d994db5 100644 --- a/packages/imitation_game/imitation_tests/smiley/flutter/smiley/android/app/src/main/kotlin/com/example/smiley/MainActivity.kt +++ b/packages/imitation_game/imitation_tests/smiley/flutter/smiley/android/app/src/main/kotlin/com/example/smiley/MainActivity.kt @@ -1,3 +1,6 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. package com.example.smiley import io.flutter.embedding.android.FlutterActivity diff --git a/packages/multicast_dns/CHANGELOG.md b/packages/multicast_dns/CHANGELOG.md index 426f0b078e..9380f88eb5 100644 --- a/packages/multicast_dns/CHANGELOG.md +++ b/packages/multicast_dns/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Updates package description. + ## 0.3.1 * Close IPv6 sockets on [MDnsClient.stop]. diff --git a/packages/multicast_dns/pubspec.yaml b/packages/multicast_dns/pubspec.yaml index 2d24824f0c..c0ce58f2dd 100644 --- a/packages/multicast_dns/pubspec.yaml +++ b/packages/multicast_dns/pubspec.yaml @@ -1,5 +1,5 @@ name: multicast_dns -description: Dart package for mDNS queries (e.g. Bonjour, Avahi). +description: Dart package for performing mDNS queries (e.g. Bonjour, Avahi). repository: https://github.com/flutter/packages/tree/master/packages/multicast_dns issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+multicast_dns%22 version: 0.3.1 diff --git a/packages/palette_generator/example/android/app/src/main/kotlin/io/flutter/packages/palettegenerator/example/MainActivity.kt b/packages/palette_generator/example/android/app/src/main/kotlin/io/flutter/packages/palettegenerator/example/MainActivity.kt index af4031a5f2..3dc39da44c 100644 --- a/packages/palette_generator/example/android/app/src/main/kotlin/io/flutter/packages/palettegenerator/example/MainActivity.kt +++ b/packages/palette_generator/example/android/app/src/main/kotlin/io/flutter/packages/palettegenerator/example/MainActivity.kt @@ -1,3 +1,6 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. package io.flutter.packages.palettegenerator.imagecolors import io.flutter.embedding.android.FlutterActivity diff --git a/packages/pigeon/e2e_tests/test_objc/android/app/src/main/kotlin/com/example/test_objc/MainActivity.kt b/packages/pigeon/e2e_tests/test_objc/android/app/src/main/kotlin/com/example/test_objc/MainActivity.kt index 2907dd88eb..c860c3d2e2 100644 --- a/packages/pigeon/e2e_tests/test_objc/android/app/src/main/kotlin/com/example/test_objc/MainActivity.kt +++ b/packages/pigeon/e2e_tests/test_objc/android/app/src/main/kotlin/com/example/test_objc/MainActivity.kt @@ -1,3 +1,6 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. package com.example.test_objc import androidx.annotation.NonNull; diff --git a/packages/pigeon/platform_tests/android_unit_tests/android/app/src/main/kotlin/com/example/android_unit_tests/MainActivity.kt b/packages/pigeon/platform_tests/android_unit_tests/android/app/src/main/kotlin/com/example/android_unit_tests/MainActivity.kt index eb1afffd23..4faeabd09e 100644 --- a/packages/pigeon/platform_tests/android_unit_tests/android/app/src/main/kotlin/com/example/android_unit_tests/MainActivity.kt +++ b/packages/pigeon/platform_tests/android_unit_tests/android/app/src/main/kotlin/com/example/android_unit_tests/MainActivity.kt @@ -1,3 +1,6 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. package com.example.android_unit_tests import io.flutter.embedding.android.FlutterActivity diff --git a/packages/rfw/AUTHORS b/packages/rfw/AUTHORS new file mode 100644 index 0000000000..557dff9793 --- /dev/null +++ b/packages/rfw/AUTHORS @@ -0,0 +1,6 @@ +# Below is a list of people and organizations that have contributed +# to the Flutter project. Names should be added to the list like so: +# +# Name/Organization + +Google Inc. diff --git a/packages/rfw/example/hello/android/app/src/main/kotlin/dev/flutter/rfw/examples/hello/MainActivity.kt b/packages/rfw/example/hello/android/app/src/main/kotlin/dev/flutter/rfw/examples/hello/MainActivity.kt index 7f9aee8dd6..3154f4692c 100644 --- a/packages/rfw/example/hello/android/app/src/main/kotlin/dev/flutter/rfw/examples/hello/MainActivity.kt +++ b/packages/rfw/example/hello/android/app/src/main/kotlin/dev/flutter/rfw/examples/hello/MainActivity.kt @@ -1,3 +1,6 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. package dev.flutter.rfw.examples.hello import io.flutter.embedding.android.FlutterActivity diff --git a/packages/rfw/example/local/android/app/src/main/kotlin/dev/flutter/rfw/examples/local/MainActivity.kt b/packages/rfw/example/local/android/app/src/main/kotlin/dev/flutter/rfw/examples/local/MainActivity.kt index 2eb31b4d2e..9ec9ef59fd 100644 --- a/packages/rfw/example/local/android/app/src/main/kotlin/dev/flutter/rfw/examples/local/MainActivity.kt +++ b/packages/rfw/example/local/android/app/src/main/kotlin/dev/flutter/rfw/examples/local/MainActivity.kt @@ -1,3 +1,6 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. package dev.flutter.rfw.examples.local import io.flutter.embedding.android.FlutterActivity diff --git a/packages/rfw/example/remote/android/app/src/main/kotlin/dev/flutter/rfw/examples/remote/MainActivity.kt b/packages/rfw/example/remote/android/app/src/main/kotlin/dev/flutter/rfw/examples/remote/MainActivity.kt index 7eb9506ad9..e75fe88af3 100644 --- a/packages/rfw/example/remote/android/app/src/main/kotlin/dev/flutter/rfw/examples/remote/MainActivity.kt +++ b/packages/rfw/example/remote/android/app/src/main/kotlin/dev/flutter/rfw/examples/remote/MainActivity.kt @@ -1,3 +1,6 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. package dev.flutter.rfw.examples.remote import io.flutter.embedding.android.FlutterActivity diff --git a/packages/rfw/example/wasm/android/app/src/main/kotlin/dev/flutter/rfw/examples/wasm/MainActivity.kt b/packages/rfw/example/wasm/android/app/src/main/kotlin/dev/flutter/rfw/examples/wasm/MainActivity.kt index 1cd18a6424..247a6baebc 100644 --- a/packages/rfw/example/wasm/android/app/src/main/kotlin/dev/flutter/rfw/examples/wasm/MainActivity.kt +++ b/packages/rfw/example/wasm/android/app/src/main/kotlin/dev/flutter/rfw/examples/wasm/MainActivity.kt @@ -1,3 +1,6 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. package dev.flutter.rfw.examples.wasm import io.flutter.embedding.android.FlutterActivity diff --git a/script/tool_runner.sh b/script/tool_runner.sh index dc9a52f774..7029a53c80 100755 --- a/script/tool_runner.sh +++ b/script/tool_runner.sh @@ -9,4 +9,5 @@ REPO_DIR="$(dirname "$SCRIPT_DIR")" # The tool expects to be run from the repo root. cd "$REPO_DIR" -dart pub global run flutter_plugin_tools "$@" --packages-for-branch $BUILD_SHARDING +dart pub global run flutter_plugin_tools "$@" --packages-for-branch \ + --log-timing $BUILD_SHARDING