Version 2.13.0-16.0.dev
Merge commit 'fd2a520f8ed0011c6bbe019d4f642a139b9a5db2' into 'dev'
diff --git a/DEPS b/DEPS
index e112f19..301e6de 100644
--- a/DEPS
+++ b/DEPS
@@ -147,7 +147,7 @@
"source_maps-0.9.4_rev": "38524",
"source_maps_rev": "53eb92ccfe6e64924054f83038a534b959b12b3e",
"source_span_rev": "aecb614eac3caa333658493b31a32b4e904cb0a4",
- "sse_tag": "e93a783755b9b048b9156f795461d17a5ece9ce8",
+ "sse_tag": "17b52bbdeee53fc54e5bdf9b80934460a9d63ba6",
"stack_trace_tag": "6788afc61875079b71b3d1c3e65aeaa6a25cbc2f",
"stagehand_rev": "e64ac90cac508981011299c4ceb819149e71f1bd",
"stream_channel_tag": "d7251e61253ec389ee6e045ee1042311bced8f1d",
diff --git a/pkg/_fe_analyzer_shared/pubspec.yaml b/pkg/_fe_analyzer_shared/pubspec.yaml
index 4252300..1064785 100644
--- a/pkg/_fe_analyzer_shared/pubspec.yaml
+++ b/pkg/_fe_analyzer_shared/pubspec.yaml
@@ -1,5 +1,5 @@
name: _fe_analyzer_shared
-version: 14.0.0
+version: 15.0.0
description: Logic that is shared between the front_end and analyzer packages.
homepage: https://github.com/dart-lang/sdk/tree/master/pkg/_fe_analyzer_shared
diff --git a/pkg/analyzer/CHANGELOG.md b/pkg/analyzer/CHANGELOG.md
index 8c95cab..f98aff1 100644
--- a/pkg/analyzer/CHANGELOG.md
+++ b/pkg/analyzer/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.42.0
+## 0.42.0-nullsafety.0
* Migrated to null safety, min SDK is `2.12.0`.
* Deprecated `FunctionTypeAliasElement.function`.
Use `TypeAliasElement.aliasedElement` instead.
diff --git a/pkg/analyzer/pubspec.yaml b/pkg/analyzer/pubspec.yaml
index a559a08..4237ca1 100644
--- a/pkg/analyzer/pubspec.yaml
+++ b/pkg/analyzer/pubspec.yaml
@@ -1,5 +1,5 @@
name: analyzer
-version: 0.42.0
+version: 0.42.0-nullsafety.0
description: This package provides a library that performs static analysis of Dart code.
homepage: https://github.com/dart-lang/sdk/tree/master/pkg/analyzer
@@ -7,7 +7,7 @@
sdk: '>=2.12.0-0 <3.0.0'
dependencies:
- _fe_analyzer_shared: ^14.0.0
+ _fe_analyzer_shared: ^15.0.0
args: ^2.0.0-nullsafety.0
cli_util: ^0.3.0-nullsafety.0
collection: ^1.15.0-nullsafety.5
diff --git a/pkg/dev_compiler/test/testing.dart b/pkg/dev_compiler/test/testing.dart
deleted file mode 100644
index 136b993..0000000
--- a/pkg/dev_compiler/test/testing.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// @dart = 2.9
-
-library dev_compiler.src.testing;
-
-import 'dart:mirrors';
-import 'package:analyzer/file_system/file_system.dart';
-import 'package:analyzer/file_system/memory_file_system.dart';
-import 'package:analyzer/src/generated/source.dart';
-import 'package:path/path.dart' as p;
-
-final String testingPath =
- p.fromUri((reflectClass(_TestUtils).owner as LibraryMirror).uri);
-final String testDirectory = p.dirname(testingPath);
-
-/// The local path to the root directory of the dev_compiler repo.
-final String repoDirectory = p.dirname(testDirectory);
-
-class _TestUtils {}
-
-class TestUriResolver extends ResourceUriResolver {
- @override
- final MemoryResourceProvider provider;
- TestUriResolver(this.provider) : super(provider);
-
- @override
- Source resolveAbsolute(Uri uri, [Uri actualUri]) {
- if (uri.scheme == 'package') {
- return (provider.getResource('/packages/' + uri.path) as File)
- .createSource(uri);
- }
- return super.resolveAbsolute(uri, actualUri);
- }
-}
diff --git a/tools/VERSION b/tools/VERSION
index f4b0d11..edab86b 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 13
PATCH 0
-PRERELEASE 15
+PRERELEASE 16
PRERELEASE_PATCH 0
\ No newline at end of file
