Skip to content

Commit

Permalink
Update dependencies and fix breaking changes.
Browse files Browse the repository at this point in the history
Update according to breaking changes in angular-material2 (2.0.0-beta.8).  Code was last updated to 2.0.0-beta.2.  (Fix: firebase#238),

Update versions of angular-firebase and firebase2
  • Loading branch information
gabrielsr committed Oct 11, 2017
1 parent ec1c77a commit 1e2bbd3
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 15 deletions.
7 changes: 4 additions & 3 deletions cloud-functions-angular-start/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,24 @@
"private": true,
"dependencies": {
"@angular/animations": "^4.0.1",
"@angular/cdk": "^2.0.0-beta.12",
"@angular/common": "^4.0.0",
"@angular/compiler": "^4.0.0",
"@angular/core": "^4.0.0",
"@angular/forms": "^4.0.0",
"@angular/http": "^4.0.0",
"@angular/material": "^2.0.0-beta.2",
"@angular/material": "^2.0.0-beta.12",
"@angular/platform-browser": "^4.0.0",
"@angular/platform-browser-dynamic": "^4.0.0",
"@angular/router": "^4.0.0",
"angularfire2": "^4.0.0-rc.1",
"core-js": "^2.4.1",
"firebase": "^4.1.2",
"firebase": "^3.6.6",
"rxjs": "^5.1.0",
"zone.js": "^0.8.4"
},
"devDependencies": {
"@angular/cli": "1.1.2",
"@angular/cli": "1.4.5",
"@angular/compiler-cli": "^4.0.0",
"@angular/language-service": "^4.0.0",
"@types/jasmine": "2.5.45",
Expand Down
4 changes: 2 additions & 2 deletions cloud-functions-angular-start/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { Component, Inject } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
import { AngularFireAuth } from 'angularfire2/auth';
import { MdSnackBar } from '@angular/material';
import { MatSnackBar } from '@angular/material';
import * as firebase from 'firebase';

const LOADING_IMAGE_URL = 'https://www.google.com/images/spin-32.gif';
Expand All @@ -36,7 +36,7 @@ export class AppComponent {
topics = '';
value = '';

constructor(public db: AngularFireDatabase, public afAuth: AngularFireAuth, public snackBar: MdSnackBar) {
constructor(public db: AngularFireDatabase, public afAuth: AngularFireAuth, public snackBar: MatSnackBar) {
this.user = afAuth.authState;
this.user.subscribe((user: firebase.User) => {
console.log(user);
Expand Down
4 changes: 2 additions & 2 deletions cloud-functions-angular-start/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
import { AngularFireModule } from 'angularfire2';
import { AngularFireDatabaseModule } from 'angularfire2/database';
import { AngularFireAuthModule } from 'angularfire2/auth';
import { MaterialModule } from '@angular/material';
import { MatSnackBarModule } from '@angular/material';

import { AppComponent } from './app.component';
import { StylizePipe } from './stylize.pipe';
Expand Down Expand Up @@ -54,7 +54,7 @@ if (!environment.firebase) {
FormsModule,
HttpModule,
BrowserAnimationsModule,
MaterialModule,
MatSnackBarModule,
AngularFireModule.initializeApp(environment.firebase),
AngularFireDatabaseModule,
AngularFireAuthModule
Expand Down
9 changes: 5 additions & 4 deletions cloud-functions-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,24 @@
"private": true,
"dependencies": {
"@angular/animations": "^4.0.1",
"@angular/cdk": "^2.0.0-beta.12",
"@angular/common": "^4.0.0",
"@angular/compiler": "^4.0.0",
"@angular/core": "^4.0.0",
"@angular/forms": "^4.0.0",
"@angular/http": "^4.0.0",
"@angular/material": "^2.0.0-beta.2",
"@angular/material": "^2.0.0-beta.12",
"@angular/platform-browser": "^4.0.0",
"@angular/platform-browser-dynamic": "^4.0.0",
"@angular/router": "^4.0.0",
"angularfire2": "^4.0.0-rc.1",
"angularfire2": "4.0.0-rc.2",
"core-js": "^2.4.1",
"firebase": "^4.1.2",
"firebase": "~4.4.0",
"rxjs": "^5.1.0",
"zone.js": "^0.8.4"
},
"devDependencies": {
"@angular/cli": "1.1.2",
"@angular/cli": "1.4.5",
"@angular/compiler-cli": "^4.0.0",
"@angular/language-service": "^4.0.0",
"@types/jasmine": "2.5.45",
Expand Down
4 changes: 2 additions & 2 deletions cloud-functions-angular/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { Component, Inject } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
import { AngularFireAuth } from 'angularfire2/auth';
import { MdSnackBar } from '@angular/material';
import { MatSnackBar } from '@angular/material';
import * as firebase from 'firebase';

const LOADING_IMAGE_URL = 'https://www.google.com/images/spin-32.gif';
Expand All @@ -36,7 +36,7 @@ export class AppComponent {
topics = '';
value = '';

constructor(public db: AngularFireDatabase, public afAuth: AngularFireAuth, public snackBar: MdSnackBar) {
constructor(public db: AngularFireDatabase, public afAuth: AngularFireAuth, public snackBar: MatSnackBar) {
this.user = afAuth.authState;
this.user.subscribe((user: firebase.User) => {
console.log(user);
Expand Down
4 changes: 2 additions & 2 deletions cloud-functions-angular/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
import { AngularFireModule } from 'angularfire2';
import { AngularFireDatabaseModule } from 'angularfire2/database';
import { AngularFireAuthModule } from 'angularfire2/auth';
import { MaterialModule } from '@angular/material';
import { MatSnackBarModule } from '@angular/material';

import { AppComponent } from './app.component';
import { StylizePipe } from './stylize.pipe';
Expand Down Expand Up @@ -54,7 +54,7 @@ if (!environment.firebase) {
FormsModule,
HttpModule,
BrowserAnimationsModule,
MaterialModule,
MatSnackBarModule,
AngularFireModule.initializeApp(environment.firebase),
AngularFireDatabaseModule,
AngularFireAuthModule
Expand Down

0 comments on commit 1e2bbd3

Please sign in to comment.