From 83fc8a9b4d5207dbfa7fe1d8a84a19628c02a906 Mon Sep 17 00:00:00 2001 From: Vijay Menon Date: Thu, 19 Nov 2020 05:43:37 -0800 Subject: [PATCH 1/3] Remove opt outs for dart:ui --- lib/ui/annotations.dart | 1 - lib/ui/channel_buffers.dart | 1 - lib/ui/compositing.dart | 1 - lib/ui/fixtures/ui_test.dart | 1 - lib/ui/geometry.dart | 1 - lib/ui/hash_codes.dart | 1 - lib/ui/hooks.dart | 1 - lib/ui/isolate_name_server.dart | 1 - lib/ui/lerp.dart | 1 - lib/ui/natives.dart | 1 - lib/ui/painting.dart | 1 - lib/ui/platform_dispatcher.dart | 1 - lib/ui/plugins.dart | 1 - lib/ui/pointer.dart | 1 - lib/ui/semantics.dart | 1 - lib/ui/text.dart | 1 - lib/ui/ui.dart | 1 - lib/ui/window.dart | 1 - 18 files changed, 18 deletions(-) diff --git a/lib/ui/annotations.dart b/lib/ui/annotations.dart index b300af073e3be..a77fabee535f7 100644 --- a/lib/ui/annotations.dart +++ b/lib/ui/annotations.dart @@ -4,7 +4,6 @@ // TODO(dnfield): Remove unused_import ignores when https://github.com/dart-lang/sdk/issues/35164 is resolved. -// @dart = 2.10 part of dart.ui; diff --git a/lib/ui/channel_buffers.dart b/lib/ui/channel_buffers.dart index f2a3ddc75d4f7..ceb3f9f2f4136 100644 --- a/lib/ui/channel_buffers.dart +++ b/lib/ui/channel_buffers.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.10 // KEEP THIS SYNCHRONIZED WITH ../web_ui/lib/src/ui/channel_buffers.dart diff --git a/lib/ui/compositing.dart b/lib/ui/compositing.dart index 324520b9a1154..a76a46b55658c 100644 --- a/lib/ui/compositing.dart +++ b/lib/ui/compositing.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.10 part of dart.ui; diff --git a/lib/ui/fixtures/ui_test.dart b/lib/ui/fixtures/ui_test.dart index 87effaad4f5c7..37ff83f871238 100644 --- a/lib/ui/fixtures/ui_test.dart +++ b/lib/ui/fixtures/ui_test.dart @@ -1,4 +1,3 @@ -// @dart = 2.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. diff --git a/lib/ui/geometry.dart b/lib/ui/geometry.dart index 6d3b1ac5b5936..a39700a907591 100644 --- a/lib/ui/geometry.dart +++ b/lib/ui/geometry.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.10 part of dart.ui; diff --git a/lib/ui/hash_codes.dart b/lib/ui/hash_codes.dart index 7da175a27312f..f64cbd807c537 100644 --- a/lib/ui/hash_codes.dart +++ b/lib/ui/hash_codes.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.10 part of dart.ui; diff --git a/lib/ui/hooks.dart b/lib/ui/hooks.dart index 386aee3c5e781..427a7721d1646 100644 --- a/lib/ui/hooks.dart +++ b/lib/ui/hooks.dart @@ -4,7 +4,6 @@ // TODO(dnfield): Remove unused_import ignores when https://github.com/dart-lang/sdk/issues/35164 is resolved. -// @dart = 2.10 part of dart.ui; diff --git a/lib/ui/isolate_name_server.dart b/lib/ui/isolate_name_server.dart index 4b5c2c84d016c..6dfd615f33168 100644 --- a/lib/ui/isolate_name_server.dart +++ b/lib/ui/isolate_name_server.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.10 part of dart.ui; diff --git a/lib/ui/lerp.dart b/lib/ui/lerp.dart index 77e4a830b301e..5ec09bff48ab6 100644 --- a/lib/ui/lerp.dart +++ b/lib/ui/lerp.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.10 part of dart.ui; diff --git a/lib/ui/natives.dart b/lib/ui/natives.dart index 13838cb1a512b..904f708f08928 100644 --- a/lib/ui/natives.dart +++ b/lib/ui/natives.dart @@ -4,7 +4,6 @@ // TODO(dnfield): remove unused_element ignores when https://github.com/dart-lang/sdk/issues/35164 is resolved. -// @dart = 2.10 part of dart.ui; diff --git a/lib/ui/painting.dart b/lib/ui/painting.dart index 7b63b50e01218..82df8c095480b 100644 --- a/lib/ui/painting.dart +++ b/lib/ui/painting.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.10 part of dart.ui; diff --git a/lib/ui/platform_dispatcher.dart b/lib/ui/platform_dispatcher.dart index 091ef928c8484..1b6c83c0255e3 100644 --- a/lib/ui/platform_dispatcher.dart +++ b/lib/ui/platform_dispatcher.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.10 part of dart.ui; /// Signature of callbacks that have no arguments and return no data. diff --git a/lib/ui/plugins.dart b/lib/ui/plugins.dart index 9622852fd7566..20a3c21f7600a 100644 --- a/lib/ui/plugins.dart +++ b/lib/ui/plugins.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.10 part of dart.ui; diff --git a/lib/ui/pointer.dart b/lib/ui/pointer.dart index 551763f9d03f4..1129b373cf0f1 100644 --- a/lib/ui/pointer.dart +++ b/lib/ui/pointer.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.10 part of dart.ui; diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart index 5769905628fdf..6fab26f3470cd 100644 --- a/lib/ui/semantics.dart +++ b/lib/ui/semantics.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.10 part of dart.ui; diff --git a/lib/ui/text.dart b/lib/ui/text.dart index d7f9a328fc3f8..fb258c774cfed 100644 --- a/lib/ui/text.dart +++ b/lib/ui/text.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.10 part of dart.ui; diff --git a/lib/ui/ui.dart b/lib/ui/ui.dart index 4603fb3ce7774..d01b968d3b99c 100644 --- a/lib/ui/ui.dart +++ b/lib/ui/ui.dart @@ -9,7 +9,6 @@ /// This library exposes the lowest-level services that Flutter frameworks use /// to bootstrap applications, such as classes for driving the input, graphics /// text, layout, and rendering subsystems. -// @dart = 2.10 library dart.ui; import 'dart:_internal' hide Symbol; // ignore: unused_import diff --git a/lib/ui/window.dart b/lib/ui/window.dart index f4795b057cf59..bf1a50fb0ca80 100644 --- a/lib/ui/window.dart +++ b/lib/ui/window.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.10 part of dart.ui; /// A view into which a Flutter [Scene] is drawn. From 74c19c3cf493905ec17d2224785ec7c4c4791ca0 Mon Sep 17 00:00:00 2001 From: Vijay Menon Date: Thu, 19 Nov 2020 05:56:34 -0800 Subject: [PATCH 2/3] Undo for test --- lib/ui/fixtures/ui_test.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/ui/fixtures/ui_test.dart b/lib/ui/fixtures/ui_test.dart index 37ff83f871238..87effaad4f5c7 100644 --- a/lib/ui/fixtures/ui_test.dart +++ b/lib/ui/fixtures/ui_test.dart @@ -1,3 +1,4 @@ +// @dart = 2.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. From ff04ceb1e125a220f9f7846db252e1d8c8b06dd2 Mon Sep 17 00:00:00 2001 From: Vijay Menon Date: Thu, 19 Nov 2020 13:07:07 -0800 Subject: [PATCH 3/3] Update explicit version to 2.12 --- lib/ui/annotations.dart | 1 + lib/ui/channel_buffers.dart | 1 + lib/ui/compositing.dart | 1 + lib/ui/geometry.dart | 1 + lib/ui/hash_codes.dart | 1 + lib/ui/hooks.dart | 1 + lib/ui/isolate_name_server.dart | 1 + lib/ui/lerp.dart | 1 + lib/ui/natives.dart | 1 + lib/ui/painting.dart | 1 + lib/ui/platform_dispatcher.dart | 1 + lib/ui/plugins.dart | 1 + lib/ui/pointer.dart | 1 + lib/ui/semantics.dart | 1 + lib/ui/text.dart | 1 + lib/ui/ui.dart | 1 + lib/ui/window.dart | 1 + testing/dart/window_hooks_integration_test.dart | 2 +- 18 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/ui/annotations.dart b/lib/ui/annotations.dart index a77fabee535f7..e3ebf2379d68d 100644 --- a/lib/ui/annotations.dart +++ b/lib/ui/annotations.dart @@ -5,6 +5,7 @@ // TODO(dnfield): Remove unused_import ignores when https://github.com/dart-lang/sdk/issues/35164 is resolved. +// @dart = 2.12 part of dart.ui; // TODO(dnfield): Update this if/when we default this to on in the tool, diff --git a/lib/ui/channel_buffers.dart b/lib/ui/channel_buffers.dart index ceb3f9f2f4136..afffab19e496b 100644 --- a/lib/ui/channel_buffers.dart +++ b/lib/ui/channel_buffers.dart @@ -5,6 +5,7 @@ // KEEP THIS SYNCHRONIZED WITH ../web_ui/lib/src/ui/channel_buffers.dart +// @dart = 2.12 part of dart.ui; /// Signature for [ChannelBuffers.drain]'s `callback` argument. diff --git a/lib/ui/compositing.dart b/lib/ui/compositing.dart index a76a46b55658c..626e61ef4f6cc 100644 --- a/lib/ui/compositing.dart +++ b/lib/ui/compositing.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. +// @dart = 2.12 part of dart.ui; /// An opaque object representing a composited scene. diff --git a/lib/ui/geometry.dart b/lib/ui/geometry.dart index a39700a907591..527b6db0f646f 100644 --- a/lib/ui/geometry.dart +++ b/lib/ui/geometry.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. +// @dart = 2.12 part of dart.ui; /// Base class for [Size] and [Offset], which are both ways to describe diff --git a/lib/ui/hash_codes.dart b/lib/ui/hash_codes.dart index f64cbd807c537..db133d22c188f 100644 --- a/lib/ui/hash_codes.dart +++ b/lib/ui/hash_codes.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. +// @dart = 2.12 part of dart.ui; class _HashEnd { const _HashEnd(); } diff --git a/lib/ui/hooks.dart b/lib/ui/hooks.dart index 427a7721d1646..6ffcea0f93d72 100644 --- a/lib/ui/hooks.dart +++ b/lib/ui/hooks.dart @@ -5,6 +5,7 @@ // TODO(dnfield): Remove unused_import ignores when https://github.com/dart-lang/sdk/issues/35164 is resolved. +// @dart = 2.12 part of dart.ui; @pragma('vm:entry-point') diff --git a/lib/ui/isolate_name_server.dart b/lib/ui/isolate_name_server.dart index 6dfd615f33168..55c6a481eb3fd 100644 --- a/lib/ui/isolate_name_server.dart +++ b/lib/ui/isolate_name_server.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. +// @dart = 2.12 part of dart.ui; /// Static methods to allow for simple sharing of [SendPort]s across [Isolate]s. diff --git a/lib/ui/lerp.dart b/lib/ui/lerp.dart index 5ec09bff48ab6..917252ce25359 100644 --- a/lib/ui/lerp.dart +++ b/lib/ui/lerp.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. +// @dart = 2.12 part of dart.ui; /// Linearly interpolate between two numbers, `a` and `b`, by an extrapolation diff --git a/lib/ui/natives.dart b/lib/ui/natives.dart index 904f708f08928..72137544fa4e6 100644 --- a/lib/ui/natives.dart +++ b/lib/ui/natives.dart @@ -5,6 +5,7 @@ // TODO(dnfield): remove unused_element ignores when https://github.com/dart-lang/sdk/issues/35164 is resolved. +// @dart = 2.12 part of dart.ui; // Corelib 'print' implementation. diff --git a/lib/ui/painting.dart b/lib/ui/painting.dart index 82df8c095480b..a1fd6584a6f44 100644 --- a/lib/ui/painting.dart +++ b/lib/ui/painting.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. +// @dart = 2.12 part of dart.ui; // Some methods in this file assert that their arguments are not null. These diff --git a/lib/ui/platform_dispatcher.dart b/lib/ui/platform_dispatcher.dart index 1b6c83c0255e3..3911695eec52c 100644 --- a/lib/ui/platform_dispatcher.dart +++ b/lib/ui/platform_dispatcher.dart @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// @dart = 2.12 part of dart.ui; /// Signature of callbacks that have no arguments and return no data. diff --git a/lib/ui/plugins.dart b/lib/ui/plugins.dart index 20a3c21f7600a..4e9cb7e1442d7 100644 --- a/lib/ui/plugins.dart +++ b/lib/ui/plugins.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. +// @dart = 2.12 part of dart.ui; /// A wrapper for a raw callback handle. diff --git a/lib/ui/pointer.dart b/lib/ui/pointer.dart index 1129b373cf0f1..1da22c0b6c3b4 100644 --- a/lib/ui/pointer.dart +++ b/lib/ui/pointer.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. +// @dart = 2.12 part of dart.ui; /// How the pointer has changed since the last report. diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart index 6fab26f3470cd..02bb585d5313a 100644 --- a/lib/ui/semantics.dart +++ b/lib/ui/semantics.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. +// @dart = 2.12 part of dart.ui; /// The possible actions that can be conveyed from the operating system diff --git a/lib/ui/text.dart b/lib/ui/text.dart index fb258c774cfed..b3d3b58347802 100644 --- a/lib/ui/text.dart +++ b/lib/ui/text.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. +// @dart = 2.12 part of dart.ui; /// Whether to slant the glyphs in the font diff --git a/lib/ui/ui.dart b/lib/ui/ui.dart index d01b968d3b99c..ea966c88cd43a 100644 --- a/lib/ui/ui.dart +++ b/lib/ui/ui.dart @@ -9,6 +9,7 @@ /// This library exposes the lowest-level services that Flutter frameworks use /// to bootstrap applications, such as classes for driving the input, graphics /// text, layout, and rendering subsystems. +// @dart = 2.12 library dart.ui; import 'dart:_internal' hide Symbol; // ignore: unused_import diff --git a/lib/ui/window.dart b/lib/ui/window.dart index bf1a50fb0ca80..ac984a2a6581c 100644 --- a/lib/ui/window.dart +++ b/lib/ui/window.dart @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// @dart = 2.12 part of dart.ui; /// A view into which a Flutter [Scene] is drawn. diff --git a/testing/dart/window_hooks_integration_test.dart b/testing/dart/window_hooks_integration_test.dart index ab87370927149..27b2da80d8e9a 100644 --- a/testing/dart/window_hooks_integration_test.dart +++ b/testing/dart/window_hooks_integration_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.10 +// @dart = 2.12 // HACK: pretend to be dart.ui in order to access its internals library dart.ui;