From 1bccf714f1c2c4c2beeda832c4c715ade794bde3 Mon Sep 17 00:00:00 2001 From: Kristiyan Kostadinov Date: Thu, 13 Apr 2017 09:17:03 -0700 Subject: [PATCH] feat: angular 4 compatibility (#135) * Updates all Angular dependencies to the latest RC. * Fixes any errors/warnings caused by the upgrade. * Fixes error when running the unit tests. * Bumps the year in the license. --- LICENSE | 2 +- package.json | 4 ++-- src/app/shared/footer/footer.html | 2 +- src/app/shared/plunker/plunker-writer.spec.ts | 4 ++-- src/app/shared/plunker/plunker-writer.ts | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/LICENSE b/LICENSE index 13a6fd789..47bfda24a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2016 Google, Inc. +Copyright (c) 2017 Google, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/package.json b/package.json index c99d501d7..36b3bdfd4 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "angular-io-v42", + "name": "material-angular-io", "version": "0.0.0", "license": "MIT", "angular-cli": {}, @@ -28,7 +28,7 @@ "@angular/router": "~4.0.0", "core-js": "^2.4.1", "rxjs": "^5.1.0", - "zone.js": "^0.7.7" + "zone.js": "^0.8.4" }, "devDependencies": { "@angular/cli": "^1.0.0", diff --git a/src/app/shared/footer/footer.html b/src/app/shared/footer/footer.html index d88488876..a7885ff5a 100644 --- a/src/app/shared/footer/footer.html +++ b/src/app/shared/footer/footer.html @@ -13,7 +13,7 @@ diff --git a/src/app/shared/plunker/plunker-writer.spec.ts b/src/app/shared/plunker/plunker-writer.spec.ts index c3a7163b8..b312f69f2 100644 --- a/src/app/shared/plunker/plunker-writer.spec.ts +++ b/src/app/shared/plunker/plunker-writer.spec.ts @@ -45,13 +45,13 @@ describe('PlunkerWriter', () => { it('should append correct copyright', () => { expect(plunkerWriter._appendCopyright('test.ts', 'NoContent')).toBe(`NoContent -/** Copyright 2016 Google Inc. All Rights Reserved. +/** Copyright 2017 Google Inc. All Rights Reserved. Use of this source code is governed by an MIT-style license that can be found in the LICENSE file at http://angular.io/license */`); expect(plunkerWriter._appendCopyright('test.html', 'NoContent')).toBe(`NoContent -`); diff --git a/src/app/shared/plunker/plunker-writer.ts b/src/app/shared/plunker/plunker-writer.ts index 93390cc0e..df6a9bde2 100644 --- a/src/app/shared/plunker/plunker-writer.ts +++ b/src/app/shared/plunker/plunker-writer.ts @@ -6,7 +6,7 @@ import 'rxjs/add/operator/toPromise'; const PLUNKER_URL = 'https://plnkr.co/edit/?p=preview'; const COPYRIGHT = - `Copyright 2016 Google Inc. All Rights Reserved. + `Copyright 2017 Google Inc. All Rights Reserved. Use of this source code is governed by an MIT-style license that can be found in the LICENSE file at http://angular.io/license`;