diff --git a/.cirrus.yml b/.cirrus.yml index 90437979f599c..4ffcb70c8b256 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -12,9 +12,9 @@ task: CIRRUS_WORKING_DIR: "/tmp/github_repo" ENGINE_PATH: "/tmp/clean_engine" DEPOT_TOOLS: "/tmp/depot_tools" - PATH: "$DEPOT_TOOLS:$PATH" FLUTTER_ENGINE: "/tmp/clean_engine/src" FRAMEWORK_PATH: "/tmp/master_framework" + PATH: "$FLUTTER_ENGINE/third_party/dart/tools/sdks/dart-sdk/bin:$DEPOT_TOOLS:$PATH" depot_tools_script: git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git $DEPOT_TOOLS gclient_sync_script: | diff --git a/DEPS b/DEPS index ce78d48ab5769..c508b7f4475ba 100644 --- a/DEPS +++ b/DEPS @@ -446,6 +446,16 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/dart/tools/sdks': { + 'packages': [ + { + 'package': 'dart/dart-sdk/${{platform}}', + 'version': 'version:2.2.0' + } + ], + 'dep_type': 'cipd', + }, + # Get the SDK from https://chrome-infra-packages.appspot.com/p/fuchsia/sdk/core at the 'latest' tag # Get the toolchain from https://chrome-infra-packages.appspot.com/p/fuchsia/clang at the 'goma' tag @@ -510,12 +520,6 @@ hooks = [ 'pattern': '.', 'action': ['python', 'src/build/vs_toolchain.py', 'update'], }, - { - # Pull prebuilt dart sdk. - 'name': 'dart', - 'pattern': '.', - 'action': ['python', 'src/tools/dart/update.py'], - }, { 'name': 'download_android_support', 'pattern': '.', diff --git a/ci/docker/build/Dockerfile b/ci/docker/build/Dockerfile index 7307ac0a33470..890b65a588265 100644 --- a/ci/docker/build/Dockerfile +++ b/ci/docker/build/Dockerfile @@ -18,9 +18,3 @@ WORKDIR $ENGINE_PATH/src RUN ./build/install-build-deps.sh --no-prompt RUN ./build/install-build-deps-android.sh --no-prompt RUN ./flutter/build/install-build-deps-linux-desktop.sh - -WORKDIR $HOME/dart -RUN wget https://storage.googleapis.com/dart-archive/channels/dev/release/2.1.0-dev.7.1/sdk/dartsdk-linux-x64-release.zip -RUN unzip dartsdk-linux-x64-release.zip -ENV PATH $PATH:$HOME/dart/dart-sdk/bin - diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index 81c83ba91755c..7e4b4e355b6ca 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: c7cd915ea6867222fc2d444c9c692fdc +Signature: 6d315fb6c8e9e949011f57c32b16cb48 diff --git a/flutter_kernel_transformers/lib/track_widget_constructor_locations.dart b/flutter_kernel_transformers/lib/track_widget_constructor_locations.dart index 78c361e98f516..1cc63ceb1e8a8 100644 --- a/flutter_kernel_transformers/lib/track_widget_constructor_locations.dart +++ b/flutter_kernel_transformers/lib/track_widget_constructor_locations.dart @@ -419,7 +419,7 @@ class WidgetCreatorTracker implements ProgramTransformer { } Component _computeFullProgram(Component deltaProgram) { - final Set libraries = new Set(); + final Set libraries = {}; final List workList = []; for (Library library in deltaProgram.libraries) { if (libraries.add(library)) { diff --git a/tools/licenses/lib/licenses.dart b/tools/licenses/lib/licenses.dart index a4370a444eea4..64045f9699699 100644 --- a/tools/licenses/lib/licenses.dart +++ b/tools/licenses/lib/licenses.dart @@ -376,7 +376,7 @@ abstract class License implements Comparable { Iterable get licensees => _licensees; final List _licensees = []; - final Set _libraries = Set(); + final Set _libraries = {}; bool get isUsed => _licensees.isNotEmpty; diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart index 40b54dc94f4df..15eaed6def844 100644 --- a/tools/licenses/lib/main.dart +++ b/tools/licenses/lib/main.dart @@ -1172,7 +1172,7 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource { } Set getLicenses(_Progress progress) { - final Set result = Set(); + final Set result = {}; for (_RepositoryDirectory directory in _subdirectories) result.addAll(directory.getLicenses(progress)); for (_RepositoryLicensedFile file in _files) { @@ -1344,7 +1344,7 @@ class _RepositoryFreetypeDocsDirectory extends _RepositoryDirectory { // We don't ship anything in this directory so don't bother looking for licenses there. // However, there are licenses in this directory referenced from elsewhere, so we do // want to crawl it and expose them. - return Set(); + return {}; } } @@ -1631,7 +1631,7 @@ class _RepositorySkiaLibWebPDirectory extends _RepositoryDirectory { @override _RepositoryDirectory createSubdirectory(fs.Directory entry) { if (entry.name == 'webp') - return _RepositoryReachOutDirectory(this, entry, Set.from(const ['config.h']), 3); + return _RepositoryReachOutDirectory(this, entry, const {'config.h'}, 3); return super.createSubdirectory(entry); } } @@ -1662,9 +1662,9 @@ class _RepositorySkiaThirdPartyDirectory extends _RepositoryGenericThirdPartyDir @override _RepositoryDirectory createSubdirectory(fs.Directory entry) { if (entry.name == 'ktx') - return _RepositoryReachOutDirectory(this, entry, Set.from(const ['ktx.h', 'ktx.cpp']), 2); + return _RepositoryReachOutDirectory(this, entry, const {'ktx.h', 'ktx.cpp'}, 2); if (entry.name == 'libmicrohttpd') - return _RepositoryReachOutDirectory(this, entry, Set.from(const ['MHD_config.h']), 2); + return _RepositoryReachOutDirectory(this, entry, const {'MHD_config.h'}, 2); if (entry.name == 'libwebp') return _RepositorySkiaLibWebPDirectory(this, entry); if (entry.name == 'libsdl')