upgrade polymer and test dependencies

dart-archive · May 1, 2015 · de52918 · de52918
1 parent f741b54
commit de52918
Show file tree

Hide file tree

Showing 6 changed files with 103 additions and 41 deletions.
diff --git a/pubspec.lock b/pubspec.lock
@@ -4,83 +4,131 @@ packages:
   analyzer:
     description: analyzer
     source: hosted
-    version: "0.15.7"
+    version: "0.25.0+1"
   args:
     description: args
     source: hosted
-    version: "0.11.0+1"
+    version: "0.13.0"
   barback:
     description: barback
     source: hosted
-    version: "0.14.2"
+    version: "0.15.2+4"
   browser:
     description: browser
     source: hosted
     version: "0.10.0+2"
+  cli_util:
+    description: cli_util
+    source: hosted
+    version: "0.0.1+1"
   code_transformers:
     description: code_transformers
     source: hosted
-    version: "0.1.6"
+    version: "0.2.9"
   collection:
     description: collection
     source: hosted
-    version: "0.9.4"
+    version: "1.1.0"
   core_elements:
     description: core_elements
     source: hosted
-    version: "0.0.6"
+    version: "0.7.1+2"
+  crypto:
+    description: crypto
+    source: hosted
+    version: "0.9.0"
   csslib:
     description: csslib
     source: hosted
-    version: "0.11.0+4"
-  html5lib:
-    description: html5lib
+    version: "0.12.0"
+  dart_style:
+    description: dart_style
+    source: hosted
+    version: "0.1.8"
+  glob:
+    description: glob
+    source: hosted
+    version: "1.0.4"
+  html:
+    description: html
     source: hosted
-    version: "0.11.0+2"
+    version: "0.12.1+1"
+  http_parser:
+    description: http_parser
+    source: hosted
+    version: "0.0.2+6"
+  initialize:
+    description: initialize
+    source: hosted
+    version: "0.6.1"
   logging:
     description: logging
     source: hosted
     version: "0.9.3"
   matcher:
     description: matcher
     source: hosted
-    version: "0.11.4+4"
+    version: "0.12.0"
+  mime:
+    description: mime
+    source: hosted
+    version: "0.9.3"
   observe:
     description: observe
     source: hosted
-    version: "0.10.1+2"
+    version: "0.13.1"
   paper_elements:
     description: paper_elements
     source: hosted
-    version: "0.0.1"
+    version: "0.7.1"
   path:
     description: path
     source: hosted
     version: "1.3.5"
   polymer:
     description: polymer
     source: hosted
-    version: "0.11.0+5"
+    version: "0.16.3+1"
   polymer_expressions:
     description: polymer_expressions
     source: hosted
-    version: "0.11.2"
+    version: "0.13.1"
+  polymer_interop:
+    description: polymer_interop
+    source: hosted
+    version: "0.1.0+2"
   pool:
     description: pool
     source: hosted
     version: "1.0.1"
+  pub_semver:
+    description: pub_semver
+    source: hosted
+    version: "1.1.0"
   quiver:
     description: quiver
     source: hosted
-    version: "0.18.2"
+    version: "0.21.0"
+  shelf:
+    description: shelf
+    source: hosted
+    version: "0.6.1+1"
+  shelf_static:
+    description: shelf_static
+    source: hosted
+    version: "0.2.2"
+  shelf_web_socket:
+    description: shelf_web_socket
+    source: hosted
+    version: "0.0.1+2"
   smoke:
     description: smoke
     source: hosted
-    version: "0.1.0+1"
+    version: "0.3.3"
   source_maps:
     description: source_maps
     source: hosted
-    version: "0.9.4"
+    version: "0.10.1"
   source_span:
     description: source_span
     source: hosted
@@ -92,24 +140,36 @@ packages:
   string_scanner:
     description: string_scanner
     source: hosted
-    version: "0.0.3"
+    version: "0.1.3+1"
   template_binding:
     description: template_binding
     source: hosted
-    version: "0.11.0"
-  unittest:
-    description: unittest
+    version: "0.14.0+2"
+  test:
+    description: test
     source: hosted
-    version: "0.11.5+4"
+    version: "0.12.0"
   utf:
     description: utf
     source: hosted
     version: "0.9.0+2"
+  watcher:
+    description: watcher
+    source: hosted
+    version: "0.9.5"
   web_components:
     description: web_components
     source: hosted
-    version: "0.4.0"
+    version: "0.11.4"
+  when:
+    description: when
+    source: hosted
+    version: "0.2.0"
+  which:
+    description: which
+    source: hosted
+    version: "0.1.3"
   yaml:
     description: yaml
     source: hosted
-    version: "1.1.1"
+    version: "2.1.2"
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,11 +3,11 @@ author: Dart Team <misc@dartlang.org>
 homepage: https://github.com/dart-lang/dump-info-visualizer/
 description: A visualizer for the JSON data produced by the dart2js --dump-info command
 dependencies:
-  core_elements: any
-  paper_elements: any
-  polymer: '>=0.11.0 <0.12.0'
+  core_elements: '^0.7.1+2'
+  paper_elements: '^0.7.1'
+  polymer: '^0.16.3+1'
 dev_dependencies:
-  unittest: any
+  test: '^0.12.0'
 transformers:
 - polymer:
     entry_points: web/index.html

diff --git a/test/diff_test.dart b/test/diff_test.dart
@@ -5,7 +5,7 @@
 import 'package:dump_viz/infohelper.dart';
 import 'package:dump_viz/diff_alg.dart';
 
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 class FakeInfoHelper {
   InfoHelper info;

diff --git a/test/streams_test.dart b/test/streams_test.dart
@@ -6,7 +6,7 @@ import 'dart:async';
 
 import 'package:dump_viz/async.dart';
 
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 class StreamWrapper<A> {
   final List<A> list = [];

diff --git a/web/index.html b/web/index.html
@@ -8,12 +8,11 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <link rel="import" href="packages/paper_elements/roboto.html">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Dump Info Visualizer</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="viewer.css">
-    <script src="packages/web_components/platform.js"></script>
-    <script src="packages/web_components/dart_support.js"></script>
+
+    <link rel="import" href="packages/paper_elements/roboto.html">
     <link rel="import" href="polymer_lib/tree_table.html">
     <link rel="import" href="polymer_lib/dependency_view.html">
     <link rel="import" href="polymer_lib/diff_view.html">
@@ -22,7 +21,7 @@
     <link rel="import" href="packages/paper_elements/paper_tab.html">
     <link rel="import" href="packages/paper_elements/paper_tabs.html">
   </head>
-  <body>
+  <body unresolved>
     <core-toolbar>
       <a id="refresh" href="">⟳</a>
       <paper-tabs selected="-10">
@@ -94,7 +93,8 @@ <h2>
 
     </div>
 
-    <!-- entry point dart file -->
-    <script type="application/dart" src="./viewer.dart"></script>
+    <script type="application/dart">
+        export 'viewer.dart';
+    </script>
   </body>
 </html>
diff --git a/web/viewer.dart b/web/viewer.dart
@@ -21,6 +21,8 @@ import './polymer_lib/dependency_view.dart';
 import './polymer_lib/diff_view.dart';
 import './history.dart' show HistoryState;
 
+export 'package:polymer/init.dart';
+
 part './dragdrop.dart';
 
 final List<String> slides = const <String>[
@@ -79,8 +81,8 @@ void _switchSlide(String id, {bool fromMouse: false}) {
   });
 }
 
-main() {
-  initPolymer();
+@whenPolymerReady
+void init() {
   HistoryState.setup(_switchSlide, animationTime);
   _noSlide();
   _switchSlide('load');
@@ -99,7 +101,7 @@ main() {
 
   TreeTable treeTable = querySelector('tree-table');
   DependencyView dependencyView = querySelector('dependency-view');
-  DiffView diffView = querySelector('diff-view');
+  var diffView = querySelector('diff-view') as DiffView;
 
   var tabs = querySelectorAll('paper-tab');
   for (PaperTab tab in tabs) {