Update to use package:observable & latest package:observe

example/person.dart

@@ -4,9 +4,9 @@
 
 library person;
 
-import 'package:observe/observe.dart';
+import 'package:observable/observable.dart';
 
-class Person extends ChangeNotifier {
+class Person extends Observable {
   String _firstName;
   String _lastName;
   List<String> _items;

lib/eval.dart

@@ -7,6 +7,7 @@ library polymer_expressions.eval;
 import 'dart:async';
 import 'dart:collection';
 
+import 'package:observable/observable.dart';
 import 'package:observe/observe.dart';
 import 'package:smoke/smoke.dart' as smoke;
 

pubspec.yaml

@@ -1,11 +1,12 @@
 name: polymer_expressions
-version: 0.13.0+2
+version: 0.13.0+3
 author: Polymer.dart Authors <[email protected]>
 description: An expressive custom binding syntax for HTML templates
 homepage: http://www.dartlang.org/polymer-dart/
 dependencies:
   browser: ">=0.10.0 <0.11.0"
-  observe: ">=0.11.0 <0.14.0"
+  observable: "^0.14.0"
+  observe: "^0.14.0"
   template_binding: ">=0.13.0 <0.15.0"
 dev_dependencies:
   unittest: ">=0.10.0 <0.11.0"

test/bindings_test.dart

@@ -7,6 +7,7 @@ library bindings_test;
 import 'dart:async';
 import 'dart:html';
 
+import 'package:observable/observable.dart';
 import 'package:observe/observe.dart';
 import 'package:observe/mirrors_used.dart' as mu;
 import 'package:observe/src/dirty_check.dart' show dirtyCheckZone;
@@ -314,7 +315,7 @@ _nextMicrotask(_) => new Future(() {});
 _afterTimeout(_) => new Future.delayed(new Duration(milliseconds: 30), () {});
 
 @reflectable
-class NotifyModel extends ChangeNotifier {
+class NotifyModel extends Observable {
   var _x;
   var _y;
   NotifyModel([this._x, this._y]);

test/eval_test.dart

@@ -14,6 +14,7 @@ import 'package:polymer_expressions/eval.dart';
 import 'package:polymer_expressions/filter.dart';
 import 'package:polymer_expressions/parser.dart';
 import 'package:unittest/unittest.dart';
+import 'package:observable/observable.dart';
 import 'package:observe/observe.dart';
 import 'package:observe/mirrors_used.dart' as mu;
 
@@ -349,7 +350,7 @@ main() {
 }
 
 @reflectable
-class Foo extends ChangeNotifier {
+class Foo extends Observable {
   String _name;
   String get name => _name;
   void set name(String n) {
@@ -434,7 +435,7 @@ expectObserve(String s,
 }
 
 // Regression test from https://code.google.com/p/dart/issues/detail?id=13459
-class WordElement extends Observable {
+class WordElement extends AutoObservable {
   @observable
   List chars1 = 'abcdefg'.split('');
   @reflectable

test/syntax_test.dart

@@ -5,6 +5,7 @@
 import 'dart:async';
 import 'dart:html';
 
+import 'package:observable/observable.dart';
 import 'package:observe/observe.dart';
 import 'package:observe/mirrors_used.dart' as mu;
 import 'package:polymer_expressions/polymer_expressions.dart';
@@ -606,7 +607,7 @@ Future<Element> waitForChange(Element e) {
 }
 
 @reflectable
-class Model extends ChangeNotifier {
+class Model extends Observable {
   String _data;
 
   Model(this._data);