From badba5490096fe258f0913e735bd9ee73055d5b8 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 15 Jun 2021 11:09:01 -0700 Subject: [PATCH] Migrate spirv to nnbd (flutter/engine#26765) --- engine/src/flutter/lib/spirv/lib/spirv.dart | 1 - engine/src/flutter/lib/spirv/lib/src/constants.dart | 1 - engine/src/flutter/lib/spirv/lib/src/transpiler.dart | 1 - engine/src/flutter/lib/spirv/lib/src/types.dart | 1 - engine/src/flutter/lib/spirv/pubspec.yaml | 2 +- .../flutter/lib/spirv/test/exception_shaders/assemble.py | 1 - engine/src/flutter/testing/dart/spirv_exception_test.dart | 6 ++---- 7 files changed, 3 insertions(+), 10 deletions(-) diff --git a/engine/src/flutter/lib/spirv/lib/spirv.dart b/engine/src/flutter/lib/spirv/lib/spirv.dart index 898e2fb81a1..7034c284b86 100644 --- a/engine/src/flutter/lib/spirv/lib/spirv.dart +++ b/engine/src/flutter/lib/spirv/lib/spirv.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. /// This library defines a transpiler for converting SPIR-V into SkSL or GLSL. -// @dart = 2.12 library spirv; import 'dart:convert'; diff --git a/engine/src/flutter/lib/spirv/lib/src/constants.dart b/engine/src/flutter/lib/spirv/lib/src/constants.dart index 0b3ec2d801c..0cae6c58c1a 100644 --- a/engine/src/flutter/lib/spirv/lib/src/constants.dart +++ b/engine/src/flutter/lib/spirv/lib/src/constants.dart @@ -1,7 +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. -// @dart = 2.12 part of spirv; diff --git a/engine/src/flutter/lib/spirv/lib/src/transpiler.dart b/engine/src/flutter/lib/spirv/lib/src/transpiler.dart index d256366a800..2ad5d9a8880 100644 --- a/engine/src/flutter/lib/spirv/lib/src/transpiler.dart +++ b/engine/src/flutter/lib/spirv/lib/src/transpiler.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.12 part of spirv; /// The name of the fragment-coordinate parameter when generating SkSL. diff --git a/engine/src/flutter/lib/spirv/lib/src/types.dart b/engine/src/flutter/lib/spirv/lib/src/types.dart index e951ca0ef9c..3fd3dde5c28 100644 --- a/engine/src/flutter/lib/spirv/lib/src/types.dart +++ b/engine/src/flutter/lib/spirv/lib/src/types.dart @@ -1,7 +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. -// @dart = 2.12 part of spirv; diff --git a/engine/src/flutter/lib/spirv/pubspec.yaml b/engine/src/flutter/lib/spirv/pubspec.yaml index 763c976f5e7..a27ca2941ab 100644 --- a/engine/src/flutter/lib/spirv/pubspec.yaml +++ b/engine/src/flutter/lib/spirv/pubspec.yaml @@ -6,4 +6,4 @@ name: spirv publish_to: none environment: - sdk: '>=2.11.0 <3.0.0' + sdk: '>=2.12.0 <3.0.0' diff --git a/engine/src/flutter/lib/spirv/test/exception_shaders/assemble.py b/engine/src/flutter/lib/spirv/test/exception_shaders/assemble.py index 80b4092a65e..283058db86c 100644 --- a/engine/src/flutter/lib/spirv/test/exception_shaders/assemble.py +++ b/engine/src/flutter/lib/spirv/test/exception_shaders/assemble.py @@ -28,4 +28,3 @@ def main(): if __name__ == '__main__': main() - diff --git a/engine/src/flutter/testing/dart/spirv_exception_test.dart b/engine/src/flutter/testing/dart/spirv_exception_test.dart index 7f6823386b1..c33d451941f 100644 --- a/engine/src/flutter/testing/dart/spirv_exception_test.dart +++ b/engine/src/flutter/testing/dart/spirv_exception_test.dart @@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.6 import 'dart:io'; import 'dart:typed_data'; -import 'package:spirv/spirv.dart' as spirv; -import 'package:path/path.dart' as path; import 'package:litetest/litetest.dart'; +import 'package:path/path.dart' as path; +import 'package:spirv/spirv.dart' as spirv; const List targets = [ spirv.TargetLanguage.sksl, @@ -53,4 +52,3 @@ Stream exceptionShaders() async* { yield file.readAsBytesSync(); } } -