From 3d1d2b8dc1d67740d227a56ef2ec98594627b85f Mon Sep 17 00:00:00 2001
From: Jason Simmons <jsimmons@google.com>
Date: Fri, 14 Sep 2018 11:11:03 -0700
Subject: [PATCH] Update test and license scripts for Dart SDK 2.1.0

---
 testing/dart/canvas_test.dart | 24 ++++++++++++------------
 testing/dart/pubspec.yaml     |  4 ++--
 testing/run_tests.sh          |  2 +-
 tools/licenses/pubspec.yaml   |  4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/testing/dart/canvas_test.dart b/testing/dart/canvas_test.dart
index 714e3413cb09f..0bcdbccff9ea4 100644
--- a/testing/dart/canvas_test.dart
+++ b/testing/dart/canvas_test.dart
@@ -29,9 +29,9 @@ void main() {
     dynamic fake = new FakeEverything();
     dynamic no = new NegativeSpace();
     Paint paint = new Paint();
-    Rect rect = new Rect.fromLTRB(double.NAN, double.NAN, double.NAN, double.NAN);
+    Rect rect = new Rect.fromLTRB(double.nan, double.nan, double.nan, double.nan);
     List<dynamic> list = <dynamic>[fake, fake];
-    Offset offset = new Offset(double.NAN, double.NAN);
+    Offset offset = new Offset(double.nan, double.nan);
     Path path = new Path();
 
     try { new Canvas(null, null); } catch (error) { }
@@ -53,7 +53,7 @@ void main() {
     testCanvas((Canvas canvas) => canvas.drawArc(fake, 0.0, 0.0, false, paint));
     testCanvas((Canvas canvas) => canvas.drawArc(rect, 0.0, 0.0, false, fake));
     testCanvas((Canvas canvas) => canvas.drawAtlas(fake, list, list, list, fake, rect, paint));
-    testCanvas((Canvas canvas) => canvas.drawCircle(offset, double.NAN, paint));
+    testCanvas((Canvas canvas) => canvas.drawCircle(offset, double.nan, paint));
     testCanvas((Canvas canvas) => canvas.drawColor(fake, fake));
     testCanvas((Canvas canvas) => canvas.drawDRRect(fake, fake, fake));
     testCanvas((Canvas canvas) => canvas.drawImage(fake, offset, paint));
@@ -72,24 +72,24 @@ void main() {
     testCanvas((Canvas canvas) => canvas.drawRawPoints(fake, list, paint));
     testCanvas((Canvas canvas) => canvas.drawRect(rect, paint));
     testCanvas((Canvas canvas) => canvas.drawRRect(fake, paint));
-    testCanvas((Canvas canvas) => canvas.drawShadow(path, color, double.NAN, null));
-    testCanvas((Canvas canvas) => canvas.drawShadow(path, color, double.NAN, false));
-    testCanvas((Canvas canvas) => canvas.drawShadow(path, color, double.NAN, true));
-    testCanvas((Canvas canvas) => canvas.drawShadow(path, color, double.NAN, no));
-    testCanvas((Canvas canvas) => canvas.drawShadow(path, color, double.NAN, fake));
+    testCanvas((Canvas canvas) => canvas.drawShadow(path, color, double.nan, null));
+    testCanvas((Canvas canvas) => canvas.drawShadow(path, color, double.nan, false));
+    testCanvas((Canvas canvas) => canvas.drawShadow(path, color, double.nan, true));
+    testCanvas((Canvas canvas) => canvas.drawShadow(path, color, double.nan, no));
+    testCanvas((Canvas canvas) => canvas.drawShadow(path, color, double.nan, fake));
     testCanvas((Canvas canvas) => canvas.drawVertices(fake, null, paint));
     testCanvas((Canvas canvas) => canvas.getSaveCount());
     testCanvas((Canvas canvas) => canvas.restore());
-    testCanvas((Canvas canvas) => canvas.rotate(double.NAN));
+    testCanvas((Canvas canvas) => canvas.rotate(double.nan));
     testCanvas((Canvas canvas) => canvas.save());
     testCanvas((Canvas canvas) => canvas.saveLayer(rect, paint));
     testCanvas((Canvas canvas) => canvas.saveLayer(fake, fake));
     testCanvas((Canvas canvas) => canvas.saveLayer(null, null));
-    testCanvas((Canvas canvas) => canvas.scale(double.NAN, double.NAN));
-    testCanvas((Canvas canvas) => canvas.skew(double.NAN, double.NAN));
+    testCanvas((Canvas canvas) => canvas.scale(double.nan, double.nan));
+    testCanvas((Canvas canvas) => canvas.skew(double.nan, double.nan));
     testCanvas((Canvas canvas) => canvas.transform(fake));
     testCanvas((Canvas canvas) => canvas.transform(no));
     testCanvas((Canvas canvas) => canvas.transform(null));
-    testCanvas((Canvas canvas) => canvas.translate(double.NAN, double.NAN));
+    testCanvas((Canvas canvas) => canvas.translate(double.nan, double.nan));
   });
 }
diff --git a/testing/dart/pubspec.yaml b/testing/dart/pubspec.yaml
index 69b94607d1a7d..ec3ea88b2ac6d 100644
--- a/testing/dart/pubspec.yaml
+++ b/testing/dart/pubspec.yaml
@@ -1,4 +1,4 @@
 name: engine_tests
 dependencies:
-  test: 0.12.40
-  path: 1.6.0
+  test: 1.3.0
+  path: 1.6.2
diff --git a/testing/run_tests.sh b/testing/run_tests.sh
index 7baf91d29b711..5f4d7c54a47fa 100755
--- a/testing/run_tests.sh
+++ b/testing/run_tests.sh
@@ -2,7 +2,7 @@
 
 set -ex
 
-out/host_debug_unopt/fxl_unittests
+out/host_debug_unopt/fml_unittests
 out/host_debug_unopt/synchronization_unittests
 
 flutter/ci/analyze.sh
diff --git a/tools/licenses/pubspec.yaml b/tools/licenses/pubspec.yaml
index ba5a68adface2..f56b63a03bb56 100644
--- a/tools/licenses/pubspec.yaml
+++ b/tools/licenses/pubspec.yaml
@@ -1,6 +1,6 @@
 name: licenses
 dependencies:
   path: ^1.3.0
-  archive: ^1.0.24
-  args: 0.13.7
+  archive: ^2.0.4
+  args: 1.5.0
   crypto: ^2.0.2+1