From 08f2a30cce149598a2942e367c5b61100e58ca73 Mon Sep 17 00:00:00 2001
From: Nicholas Shahan <nshahan@google.com>
Date: Thu, 20 Jul 2017 11:30:26 -0700
Subject: [PATCH 1/2] Add Material Icon examples

* Update dependency to angular: 4.0.0-alpha+1
* Migrate examples use of Glyph to Material Icon.
* Fix disabled style in Material Button example.
---
 lib/app_component.dart                        |  4 +-
 lib/app_component.html                        | 12 +--
 lib/src/glyph_demo/glyph_demo.dart            | 15 ----
 lib/src/glyph_demo/glyph_demo.html            | 11 ---
 .../material_button_demo.css                  |  4 +-
 .../material_button_demo.dart                 |  2 +-
 .../material_button_demo.html                 |  6 +-
 .../material_dialog_demo.dart                 |  2 +-
 .../material_dialog_demo.html                 |  6 +-
 .../material_icon_demo.dart                   | 26 ++++++
 .../material_icon_demo.html                   | 86 +++++++++++++++++++
 .../material_list_demo.dart                   |  2 +-
 .../material_list_demo.html                   |  8 +-
 .../material_select_demo.dart                 | 10 ++-
 .../material_tooltip_demo.dart                |  2 +-
 .../material_tooltip_demo.html                | 24 +++---
 pubspec.lock                                  | 20 ++---
 pubspec.yaml                                  |  9 +-
 18 files changed, 172 insertions(+), 77 deletions(-)
 delete mode 100644 lib/src/glyph_demo/glyph_demo.dart
 delete mode 100644 lib/src/glyph_demo/glyph_demo.html
 create mode 100644 lib/src/material_icon_demo/material_icon_demo.dart
 create mode 100644 lib/src/material_icon_demo/material_icon_demo.html

diff --git a/lib/app_component.dart b/lib/app_component.dart
index bdc4128..00109fb 100644
--- a/lib/app_component.dart
+++ b/lib/app_component.dart
@@ -5,12 +5,12 @@ import 'package:angular/angular.dart';
 import 'package:angular_components/angular_components.dart';
 
 import 'src/demo_app/demo_app.dart';
-import 'src/glyph_demo/glyph_demo.dart';
 import 'src/material_button_demo/material_button_demo.dart';
 import 'src/material_checkbox_demo/material_checkbox_demo.dart';
 import 'src/material_chips_demo/material_chips_demo.dart';
 import 'src/material_dialog_demo/material_dialog_demo.dart';
 import 'src/material_expansionpanel_demo/material_expansionpanel_demo.dart';
+import 'src/material_icon_demo/material_icon_demo.dart';
 import 'src/material_input_demo/material_input_demo.dart';
 import 'src/material_list_demo/material_list_demo.dart';
 import 'src/material_popup_demo/material_popup_demo.dart';
@@ -32,12 +32,12 @@ import 'src/scorecard_demo/scorecard_demo.dart';
   styleUrls: const ['app_component.css'],
   directives: const [
     DemoAppComponent,
-    GlyphDemoComponent,
     MaterialButtonDemoComponent,
     MaterialCheckboxDemoComponent,
     MaterialChipsDemoComponent,
     MaterialDialogDemoComponent,
     MaterialExpansionpanelDemoComponent,
+    MaterialIconDemoComponent,
     MaterialInputDemoComponent,
     MaterialListDemoComponent,
     MaterialPopupDemoComponent,
diff --git a/lib/app_component.html b/lib/app_component.html
index 3027a86..32313ec 100644
--- a/lib/app_component.html
+++ b/lib/app_component.html
@@ -6,7 +6,7 @@
 <p>Examples:</p>
 <nav>
   <ul>
-    <li><a href="#Glyphs">Glyphs</a></li>
+    <li><a href="#Icons">Icons</a></li>
     <li><a href="#Buttons">Buttons</a></li>
     <li><a href="#Input">Input Boxes</a></li>
     <li><a href="#Checkboxes">Checkboxes</a></li>
@@ -42,23 +42,23 @@ <h2>Demo App</h2>
 <demo-app></demo-app>
 <hr>
 
-<a name="Glyphs"></a>
-<h2>Glyphs</h2>
+<a name="Icons"></a>
+<h2>Icons</h2>
 <ul class="source-links">
   <li>
-    <a href="https://github.com/dart-lang/angular_components/tree/master/lib/src/components/glyph"
+    <a href="https://github.com/dart-lang/angular_components/tree/master/lib/src/components/material_icon"
        target="_blank">
       Component Source
     </a>
   </li>
   <li>
-    <a href="https://github.com/dart-lang/angular_components_example/tree/master/lib/src/glyph_demo"
+    <a href="https://github.com/dart-lang/angular_components_example/tree/master/lib/src/material_icon_demo"
        target="_blank">
       Example Source
     </a>
   </li>
 </ul>
-<glyph-demo></glyph-demo>
+<material_icon-demo></material_icon-demo>
 <hr>
 
 <a name="Buttons"></a>
diff --git a/lib/src/glyph_demo/glyph_demo.dart b/lib/src/glyph_demo/glyph_demo.dart
deleted file mode 100644
index 784abea..0000000
--- a/lib/src/glyph_demo/glyph_demo.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2017, 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.
-
-import 'package:angular/angular.dart';
-import 'package:angular_components/angular_components.dart';
-
-@Component(
-  selector: 'glyph-demo',
-  templateUrl: 'glyph_demo.html',
-  directives: const [GlyphComponent],
-)
-class GlyphDemoComponent {
-  // Nothing here.
-}
diff --git a/lib/src/glyph_demo/glyph_demo.html b/lib/src/glyph_demo/glyph_demo.html
deleted file mode 100644
index af71b42..0000000
--- a/lib/src/glyph_demo/glyph_demo.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--
-  Copyright (c) 2017, 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.
--->
-<glyph icon="favorite"></glyph>
-<glyph icon="business"></glyph>
-<glyph icon="thumb_up"></glyph>
-<glyph icon="bluetooth_connected"></glyph>
-<glyph icon="insert_photo"></glyph>
-<glyph icon="more_horiz"></glyph>
diff --git a/lib/src/material_button_demo/material_button_demo.css b/lib/src/material_button_demo/material_button_demo.css
index 4690e84..80bfbc3 100644
--- a/lib/src/material_button_demo/material_button_demo.css
+++ b/lib/src/material_button_demo/material_button_demo.css
@@ -4,11 +4,11 @@
  * BSD-style license that can be found in the LICENSE file.
  */
 
-.red:not([raised]) {
+.red:not([raised]):not([disabled]) {
   color: #f44336;
 }
 
-.red[raised] {
+.red[raised]:not([disabled]) {
   background-color: #f44336;
   color: white;
 }
diff --git a/lib/src/material_button_demo/material_button_demo.dart b/lib/src/material_button_demo/material_button_demo.dart
index 164927c..368dd31 100644
--- a/lib/src/material_button_demo/material_button_demo.dart
+++ b/lib/src/material_button_demo/material_button_demo.dart
@@ -12,7 +12,7 @@ import 'package:angular_components/angular_components.dart';
   directives: const [
     MaterialButtonComponent,
     MaterialFabComponent,
-    GlyphComponent
+    MaterialIconComponent,
   ],
 )
 class MaterialButtonDemoComponent {
diff --git a/lib/src/material_button_demo/material_button_demo.html b/lib/src/material_button_demo/material_button_demo.html
index 650998e..bb9933b 100644
--- a/lib/src/material_button_demo/material_button_demo.html
+++ b/lib/src/material_button_demo/material_button_demo.html
@@ -32,7 +32,7 @@ <h3>Without min-width and margin</h3>
 <section class="margin">
   <h3>With Icon</h3>
   <material-button icon>
-    <glyph icon="check"></glyph>
+    <material-icon icon="check"></material-icon>
   </material-button>
 </section>
 
@@ -43,9 +43,9 @@ <h3>
     <strong>B</strong>utton
   </h3>
   <material-fab raised>
-    <glyph icon="add"></glyph>
+    <material-icon icon="add"></material-icon>
   </material-fab>
   <material-fab mini raised>
-    <glyph icon="check"></glyph>
+    <material-icon icon="check"></material-icon>
   </material-fab>
 </section>
diff --git a/lib/src/material_dialog_demo/material_dialog_demo.dart b/lib/src/material_dialog_demo/material_dialog_demo.dart
index 70dbfaa..279c428 100644
--- a/lib/src/material_dialog_demo/material_dialog_demo.dart
+++ b/lib/src/material_dialog_demo/material_dialog_demo.dart
@@ -13,9 +13,9 @@ import 'package:angular_components/angular_components.dart';
       CORE_DIRECTIVES,
       AutoDismissDirective,
       AutoFocusDirective,
-      GlyphComponent,
       MaterialButtonComponent,
       MaterialDialogComponent,
+      MaterialIconComponent,
       ModalComponent,
     ])
 class MaterialDialogDemoComponent {
diff --git a/lib/src/material_dialog_demo/material_dialog_demo.html b/lib/src/material_dialog_demo/material_dialog_demo.html
index 6f91093..5d528e7 100644
--- a/lib/src/material_dialog_demo/material_dialog_demo.html
+++ b/lib/src/material_dialog_demo/material_dialog_demo.html
@@ -226,7 +226,7 @@ <h3>Info dialogs</h3>
 
     <div header>
       <material-button icon autoFocus (trigger)="showInfoDialog = false">
-        <glyph icon="close"></glyph>
+        <material-icon icon="close"></material-icon>
       </material-button>
 
       <h3>Information</h3>
@@ -258,7 +258,7 @@ <h3>Information</h3>
 
     <div header>
       <material-button icon autoFocus (trigger)="showAutoDismissDialog = false">
-        <glyph icon="close"></glyph>
+        <material-icon icon="close"></material-icon>
       </material-button>
 
       <h3>Auto Dismiss</h3>
@@ -285,7 +285,7 @@ <h3>Custom dialogs</h3>
       <material-button icon
                        autoFocus
                        (trigger)="showCustomColorsDialog = false">
-        <glyph icon="close"></glyph>
+        <material-icon icon="close"></material-icon>
       </material-button>
 
       <h3>Information</h3>
diff --git a/lib/src/material_icon_demo/material_icon_demo.dart b/lib/src/material_icon_demo/material_icon_demo.dart
new file mode 100644
index 0000000..25f488a
--- /dev/null
+++ b/lib/src/material_icon_demo/material_icon_demo.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2017, 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.
+
+import 'package:angular/angular.dart';
+import 'package:angular_components/angular_components.dart';
+
+@Component(
+  selector: 'material_icon-demo',
+  templateUrl: 'material_icon_demo.html',
+  directives: const [
+    MaterialButtonComponent,
+    MaterialIconComponent,
+    MaterialInputComponent,
+  ],
+  exports: const [done, doneAll, doneOutline],
+)
+class MaterialIconDemoComponent {
+  var iconModel = done;
+  var iconColor = 'blue';
+  var iconName = 'alarm';
+}
+
+const done = const Icon('done');
+const doneAll = const Icon('done_all');
+const doneOutline = const Icon('done_outline');
diff --git a/lib/src/material_icon_demo/material_icon_demo.html b/lib/src/material_icon_demo/material_icon_demo.html
new file mode 100644
index 0000000..c5360cb
--- /dev/null
+++ b/lib/src/material_icon_demo/material_icon_demo.html
@@ -0,0 +1,86 @@
+<!--
+  Copyright (c) 2017, 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.
+-->
+<h3>Basic Usage</h3>
+
+<material-icon icon="favorite"></material-icon>
+<material-icon icon="business"></material-icon>
+<material-icon icon="thumb_up"></material-icon>
+<material-icon icon="bluetooth_connected"></material-icon>
+<material-icon icon="insert_photo"></material-icon>
+<material-icon icon="more_horiz"></material-icon>
+
+<p>
+  See <a href="https://www.google.com/design/icons/" target="_blank">available icons</a>.
+</p>
+
+<h4>Using a string identifier</h4>
+<div>
+  <material-icon [icon]="iconName"></material-icon>
+</div>
+<div>
+  <material-input #iconNameInput label="Enter an icon identifier"></material-input>
+  <material-button raised (trigger)="iconName = iconNameInput.inputText">Apply</material-button>
+</div>
+<div>
+  Current icon identifier: {{iconName}}
+</div>
+
+<h4>Using an icon model</h4>
+<material-icon [icon]="iconModel"></material-icon>
+<div>
+  <material-button raised (trigger)="iconModel = done">done</material-button>
+  <material-button raised (trigger)="iconModel = doneAll">done_all</material-button>
+  <material-button raised (trigger)="iconModel = doneOutline">done_outline</material-button>
+</div>
+
+<h3>Styling</h3>
+<h4>Color</h4>
+<p>Set the color of the icon using the css color property.</p>
+<material-icon [style.color]="iconColor" icon="pets"></material-icon>
+<div>
+  <material-input #iconColorInput label="Enter a new color here"></material-input>
+  <material-button raised (trigger)="iconColor = iconColorInput.inputText">Apply</material-button>
+</div>
+
+<h4>Size</h4>
+<p>Set the size of the icon using the size attribute.</p>
+<material-icon size="x-small" icon="bug_report"></material-icon>
+<material-icon size="small" icon="bug_report"></material-icon>
+<material-icon size="medium" icon="bug_report"></material-icon>
+<material-icon size="large" icon="bug_report"></material-icon>
+<material-icon size="x-large" icon="bug_report"></material-icon>
+<material-icon icon="bug_report"></material-icon>
+
+<p>
+  x-small 12px <material-icon size="x-small" icon="bug_report" baseline></material-icon><br/>
+  small 13px <material-icon size="small" icon="bug_report" baseline></material-icon><br/>
+  medium 16px <material-icon size="medium" icon="bug_report" baseline></material-icon><br/>
+  large 18px <material-icon size="large" icon="bug_report" baseline></material-icon><br/>
+  x-large 20px <material-icon size="x-large" icon="bug_report" baseline></material-icon><br/>
+  Default (unspecified) 24px <material-icon icon="bug_report" baseline></material-icon>
+</p>
+
+<h4>Baseline</h4>
+<p>Use the baseline attribute to align an icon with surrounding text.</p>
+<p>
+  This
+  <material-icon icon="flight_land"></material-icon>
+  is <b>not</b> aligned with surrounding text.
+</p>
+<p>
+  This
+  <material-icon icon="flight_land" baseline></material-icon>
+  is aligned with surrounding text.
+</p>
+
+<h4>Light</h4>
+<p>Use the light attribute to reduce the opacity of the icon.</p>
+<p>
+  Light <material-icon icon="settings" baseline light></material-icon>
+</p>
+<p>
+  Not light <material-icon icon="settings" baseline></material-icon>
+</p>
diff --git a/lib/src/material_list_demo/material_list_demo.dart b/lib/src/material_list_demo/material_list_demo.dart
index b9d26e5..8ef8561 100644
--- a/lib/src/material_list_demo/material_list_demo.dart
+++ b/lib/src/material_list_demo/material_list_demo.dart
@@ -11,7 +11,7 @@ import 'package:angular_components/angular_components.dart';
   templateUrl: 'material_list_demo.html',
   directives: const [
     CORE_DIRECTIVES,
-    GlyphComponent,
+    MaterialIconComponent,
     MaterialListComponent,
     MaterialListItemComponent,
   ],
diff --git a/lib/src/material_list_demo/material_list_demo.html b/lib/src/material_list_demo/material_list_demo.html
index daa0752..917ea1a 100644
--- a/lib/src/material_list_demo/material_list_demo.html
+++ b/lib/src/material_list_demo/material_list_demo.html
@@ -96,8 +96,8 @@ <h3>Primary and Secondary Item Content</h3>
     </span>
   </material-list-item>
   <material-list-item>
-    <glyph icon="today" class="material-list-item-primary"
-           aria-hidden="true"></glyph>
+    <material-icon icon="today" class="material-list-item-primary"
+           aria-hidden="true"></material-icon>
     Item with primary icon
   </material-list-item>
   <material-list-item>
@@ -130,8 +130,8 @@ <h3>Grouping and Dividers</h3>
     </material-list-item>
   </div>
   <material-list-item>
-    <glyph icon="today" class="material-list-item-primary"
-           aria-hidden="true"></glyph>
+    <material-icon icon="today" class="material-list-item-primary"
+           aria-hidden="true"></material-icon>
     Item with primary icon
   </material-list-item>
   <material-list-item>
diff --git a/lib/src/material_select_demo/material_select_demo.dart b/lib/src/material_select_demo/material_select_demo.dart
index 6c47632..b106af3 100644
--- a/lib/src/material_select_demo/material_select_demo.dart
+++ b/lib/src/material_select_demo/material_select_demo.dart
@@ -229,9 +229,13 @@ class Language implements HasUIDisplayName {
 
 @Component(
     selector: 'example-renderer',
-    template: '<glyph icon="language"></glyph>{{disPlayName}}',
-    styles: const ['glyph { vertical-align: middle; margin-right: 8px; }'],
-    directives: const [GlyphComponent])
+    template: '<material-icon icon="language"></material-icon>{{disPlayName}}',
+    styles: const [
+      'material-icon { vertical-align: middle; margin-right: 8px; }'
+    ],
+    directives: const [
+      MaterialIconComponent
+    ])
 class ExampleRendererComponent implements RendersValue {
   String disPlayName = '';
 
diff --git a/lib/src/material_tooltip_demo/material_tooltip_demo.dart b/lib/src/material_tooltip_demo/material_tooltip_demo.dart
index 1381061..582db64 100644
--- a/lib/src/material_tooltip_demo/material_tooltip_demo.dart
+++ b/lib/src/material_tooltip_demo/material_tooltip_demo.dart
@@ -12,7 +12,7 @@ import 'package:angular_components/angular_components.dart';
   directives: const [
     ClickableTooltipTargetDirective,
     DarkThemeDirective,
-    GlyphComponent,
+    MaterialIconComponent,
     MaterialButtonComponent,
     MaterialIconTooltipComponent,
     MaterialInkTooltipComponent,
diff --git a/lib/src/material_tooltip_demo/material_tooltip_demo.html b/lib/src/material_tooltip_demo/material_tooltip_demo.html
index 9a8b402..bafd9be 100644
--- a/lib/src/material_tooltip_demo/material_tooltip_demo.html
+++ b/lib/src/material_tooltip_demo/material_tooltip_demo.html
@@ -5,18 +5,18 @@
 -->
 <h3>Ink tooltip</h3>
 <p>Tooltips on Icons.</p>
-<glyph icon="print"
+<material-icon icon="print"
        class="demo-glyph"
        materialTooltip="Print">
-</glyph>
-<glyph icon="save"
+</material-icon>
+<material-icon icon="save"
        class="demo-glyph"
        materialTooltip="Save">
-</glyph>
-<glyph icon="lock"
+</material-icon>
+<material-icon icon="lock"
        class="demo-glyph"
        [materialTooltip]="tooltipMsg">
-</glyph>
+</material-icon>
 
 <p>Tooltip on a button.</p>
 <material-button materialTooltip="Saves the document" raised>
@@ -47,12 +47,12 @@ <h3>Ink tooltip</h3>
 <h3>Card Tooltip</h3>
 <p>
   A simple sentence about something.
-  <glyph icon="help_outline"
+  <material-icon icon="help_outline"
          tooltipTarget
          keyboardOnlyFocusIndicator
          size="medium"
          #ref2="tooltipTarget">
-  </glyph>
+  </material-icon>
 </p>
 <material-tooltip-card [for]="ref2">
   <header>Simple sentences about things.</header>
@@ -61,13 +61,13 @@ <h3>Card Tooltip</h3>
 
 <p>
   Clickable tooltip. Target will open immediately on clicks and keyboard events.
-  <glyph icon="help_outline"
+  <material-icon icon="help_outline"
          clickableTooltipTarget
          keyboardOnlyFocusIndicator
          tabindex="0"
          size="medium"
          #clickableRef="tooltipTarget">
-  </glyph>
+  </material-icon>
 </p>
 <material-tooltip-card [for]="clickableRef">
   <header>Simple sentences about things.</header>
@@ -94,11 +94,11 @@ <h3>Icon Tooltip</h3>
 <h3>Tooltip Source</h3>
 <p>
   Use a tooltipSource to control a popup.
-  <glyph icon="help_outline"
+  <material-icon icon="help_outline"
          tooltipSource
          size="medium"
          #ref3="tooltipSource">
-  </glyph>
+  </material-icon>
 </p>
 <material-popup [source]="ref3"
                 enforceSpaceConstraints
diff --git a/pubspec.lock b/pubspec.lock
index e5e0ea1..5930019 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -12,7 +12,7 @@ packages:
       name: angular
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.0-alpha"
+    version: "4.0.0-alpha+1"
   angular_compiler:
     description:
       name: angular_compiler
@@ -21,10 +21,10 @@ packages:
     version: "0.1.1"
   angular_components:
     description:
-      name: angular_components
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.6.0-alpha"
+      path: "../angular2_components"
+      relative: true
+    source: path
+    version: "0.6.0-alpha+1"
   archive:
     description:
       name: archive
@@ -66,7 +66,7 @@ packages:
       name: build_barback
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.2"
+    version: "0.3.0"
   charcode:
     description:
       name: charcode
@@ -108,7 +108,7 @@ packages:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   csslib:
     description:
       name: csslib
@@ -132,7 +132,7 @@ packages:
       name: fixnum
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.10.5"
+    version: "0.10.6"
   front_end:
     description:
       name: front_end
@@ -198,7 +198,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   observable:
     description:
       name: observable
@@ -210,7 +210,7 @@ packages:
       name: package_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   path:
     description:
       name: path
diff --git a/pubspec.yaml b/pubspec.yaml
index 09329a9..088d9a0 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,10 +3,15 @@ description: An example app using the angular_components package.
 environment:
   sdk: '>=1.24.0 <2.0.0-dev.infinity'
 dependencies:
-  angular: '4.0.0-alpha'
-  angular_components: '0.6.0-alpha'
+  angular: 4.0.0-alpha+1
+  angular_components: 0.6.0-alpha+1
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
+dependency_overrides:
+  angular_components:
+    git:
+      url: git@github.com:dart-lang/angular_components.git
+      ref: update
 dev_dependencies:
   webdriver: ^1.2.1
 transformers:

From df93dff68ee88c9658a9fd0936429aa4833227dd Mon Sep 17 00:00:00 2001
From: Nicholas Shahan <nshahan@google.com>
Date: Thu, 20 Jul 2017 15:27:13 -0700
Subject: [PATCH 2/2] Update dependencies

---
 pubspec.lock | 10 +++++-----
 pubspec.yaml |  5 -----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index 5930019..e5ababe 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -21,9 +21,9 @@ packages:
     version: "0.1.1"
   angular_components:
     description:
-      path: "../angular2_components"
-      relative: true
-    source: path
+      name: angular_components
+      url: "https://pub.dartlang.org"
+    source: hosted
     version: "0.6.0-alpha+1"
   archive:
     description:
@@ -96,7 +96,7 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.2"
+    version: "1.14.3"
   convert:
     description:
       name: convert
@@ -228,7 +228,7 @@ packages:
       name: plugin
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0"
+    version: "0.2.0+1"
   pool:
     description:
       name: pool
diff --git a/pubspec.yaml b/pubspec.yaml
index 088d9a0..32c08d7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,11 +7,6 @@ dependencies:
   angular_components: 0.6.0-alpha+1
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
-dependency_overrides:
-  angular_components:
-    git:
-      url: git@github.com:dart-lang/angular_components.git
-      ref: update
 dev_dependencies:
   webdriver: ^1.2.1
 transformers: