Skip to content

Commit 2393c97

Browse files
authored
Merge pull request #129 from NativeScript/lini/update-5.0
chor: update dependencies for NativeScript 5.0
2 parents efe7d8b + aa0d097 commit 2393c97

6 files changed

Lines changed: 33 additions & 30 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ node_modules/
44
*.js
55
*.js.map
66
*.esm.json
7+
*.tns.json
78
*.metadata.json
89
*.log
910
demo/**/*.js

.travis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ matrix:
2929
- language: android
3030
os: linux
3131
env:
32-
- WebpackAndroid="26"
32+
- WebpackAndroid="28"
3333
jdk: oraclejdk8
3434
before_install: nvm install 8
3535
script:
3636
- cd src && npm run build && cd ../demo && npm i && tns build android --env.uglify --env.snapshot
3737
- cd ../demo-angular && npm i && tns build android --env.uglify --env.snapshot --env.aot
3838
- language: android
3939
env:
40-
- BuildAndroid="26"
40+
- BuildAndroid="28"
4141
os: linux
4242
jdk: oraclejdk8
4343
before_install: nvm install 8.11.4
@@ -80,9 +80,8 @@ android:
8080
components:
8181
- tools
8282
- platform-tools
83-
- build-tools-27.0.3
84-
- android-26
85-
- android-23
83+
- build-tools-28.0.2
84+
- android-28
8685
- extra-android-m2repository
8786

8887
before_install:

demo-angular/package.json

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"nativescript": {
55
"id": "org.nativescript.demoangular",
66
"tns-ios": {
7-
"version": "4.2.0"
7+
"version": "5.0.0"
88
},
99
"tns-android": {
10-
"version": "4.2.0"
10+
"version": "5.0.0"
1111
}
1212
},
1313
"dependencies": {
@@ -19,12 +19,12 @@
1919
"@angular/platform-browser": "~6.1.0",
2020
"@angular/platform-browser-dynamic": "~6.1.0",
2121
"@angular/router": "~6.1.0",
22-
"nativescript-angular": "~6.1.0",
22+
"nativescript-angular": "~6.2.0",
2323
"nativescript-facebook": "../src",
2424
"nativescript-theme-core": "^1.0.4",
2525
"nativescript-unit-test-runner": "^0.3.4",
2626
"rxjs": "~6.1.0",
27-
"tns-core-modules": "^4.2.0",
27+
"tns-core-modules": "^5.0.1",
2828
"zone.js": "^0.8.4"
2929
},
3030
"devDependencies": {
@@ -33,10 +33,12 @@
3333
"karma-jasmine": "^1.0.2",
3434
"karma-nativescript-launcher": "^0.4.0",
3535
"nativescript-css-loader": "~0.26.0",
36-
"nativescript-dev-typescript": "~0.7.2",
37-
"nativescript-dev-webpack": "~0.15.1",
36+
"nativescript-dev-typescript": "~0.7.4",
37+
"nativescript-dev-webpack": "~0.17.0",
3838
"tslint": "~5.11.0",
39-
"typescript": "~2.8.2"
39+
"typescript": "~2.8.2",
40+
"@angular/compiler-cli": "~6.1.0",
41+
"@ngtools/webpack": "~6.2.0"
4042
},
4143
"scripts": {
4244
"build.plugin": "cd ../src && npm run build",
@@ -45,4 +47,4 @@
4547
"ci.ios.build": "cd ../src && npm run build.iosOnly && cd ../demo-angular && tns build ios",
4648
"generate-android-snapshot": "generate-android-snapshot --targetArchs arm,arm64,ia32 --install"
4749
}
48-
}
50+
}

demo/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"nativescript": {
33
"id": "org.nativescript.demo",
44
"tns-android": {
5-
"version": "4.2.0"
5+
"version": "5.0.0"
66
},
77
"tns-ios": {
8-
"version": "4.2.0"
8+
"version": "5.0.0"
99
}
1010
},
1111
"dependencies": {
1212
"nativescript-facebook": "../src",
1313
"nativescript-theme-core": "^1.0.4",
1414
"nativescript-unit-test-runner": "^0.3.4",
15-
"tns-core-modules": "^4.2.0"
15+
"tns-core-modules": "^5.0.1"
1616
},
1717
"devDependencies": {
1818
"chai": "~4.1.2",
@@ -24,8 +24,8 @@
2424
"mocha": "~5.2.0",
2525
"nativescript-css-loader": "~0.26.1",
2626
"nativescript-dev-appium": "3.2.0",
27-
"nativescript-dev-typescript": "~0.7.2",
28-
"nativescript-dev-webpack": "~0.15.1",
27+
"nativescript-dev-typescript": "~0.7.4",
28+
"nativescript-dev-webpack": "~0.17.0",
2929
"tslint": "~5.11.0",
3030
"typescript": "~2.8.2",
3131
"wd": "~1.7.0",
@@ -42,4 +42,4 @@
4242
"e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
4343
"compile-tests": "tsc -p e2e --watch"
4444
}
45-
}
45+
}

src/login-manager.android.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ declare let com: any;
66

77
const LOGIN_PERMISSIONS = ["public_profile", "email"];
88

9+
export let onLoginCallback; // HACK: prevent compile error with angular + webpack
910
export let onLogoutCallback;
1011
let androidApplication;
1112
let _act: android.app.Activity;

src/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@
4141
"homepage": "https://github.com/NativeScript/nativescript-facebook",
4242
"readmeFilename": "README.md",
4343
"devDependencies": {
44-
"tns-core-modules": "^4.0.0",
45-
"tns-platform-declarations": "^4.0.0",
46-
"typescript": "~2.7.2",
47-
"nativescript-angular": "~6.0.6",
48-
"@angular/core": "~6.0.6",
49-
"@angular/common": "~6.0.6",
50-
"@angular/compiler": "~6.0.6",
51-
"@angular/compiler-cli": "~6.0.6",
52-
"rxjs": "5.4.2",
53-
"zone.js": "~0.8.4",
54-
"tslint": "~5.4.3"
44+
"tns-core-modules": "^5.0.1",
45+
"tns-platform-declarations": "^5.0.0",
46+
"typescript": "~2.8.2",
47+
"nativescript-angular": "~6.1.0",
48+
"@angular/core": "~6.1.0",
49+
"@angular/common": "~6.1.0",
50+
"@angular/compiler": "~6.1.0",
51+
"@angular/compiler-cli": "~6.1.0",
52+
"rxjs": "~6.2.0",
53+
"zone.js": "~0.8.26",
54+
"tslint": "~5.11.0"
5555
}
5656
}

0 commit comments

Comments
 (0)