Skip to content
This repository has been archived by the owner on Dec 18, 2024. It is now read-only.

Commit

Permalink
feat: angular 4 compatibility (#135)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
crisbeto authored and jelbourn committed Apr 13, 2017
1 parent fd8d1ea commit 1bccf71
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "angular-io-v42",
"name": "material-angular-io",
"version": "0.0.0",
"license": "MIT",
"angular-cli": {},
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/footer/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</div>

<div class="docs-footer-copyright">
<p>Powered by Google ©2010-2016. Code licensed under an MIT-style License. Documentation licensed under CC BY 4.0.</p>
<p>Powered by Google ©2010-2017. Code licensed under an MIT-style License. Documentation licensed under CC BY 4.0.</p>
</div>
</div>
</footer>
4 changes: 2 additions & 2 deletions src/app/shared/plunker/plunker-writer.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
<!-- 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 -->`);

Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/plunker/plunker-writer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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`;

Expand Down

0 comments on commit 1bccf71

Please sign in to comment.