Skip to content

Commit ec59525

Browse files
authored
Merge pull request #132 from NativeScript/hristova/update-to-angular-7
chore: update to angular 7
2 parents 2393c97 + 2ea32e2 commit ec59525

6 files changed

Lines changed: 27 additions & 109 deletions

File tree

demo-angular/package.json

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111
}
1212
},
1313
"dependencies": {
14-
"@angular/common": "~6.1.0",
15-
"@angular/compiler": "~6.1.0",
16-
"@angular/core": "~6.1.0",
17-
"@angular/forms": "~6.1.0",
18-
"@angular/http": "~6.1.0",
19-
"@angular/platform-browser": "~6.1.0",
20-
"@angular/platform-browser-dynamic": "~6.1.0",
21-
"@angular/router": "~6.1.0",
22-
"nativescript-angular": "~6.2.0",
14+
"@angular/common": "~7.0.0",
15+
"@angular/compiler": "~7.0.0",
16+
"@angular/core": "~7.0.0",
17+
"@angular/forms": "~7.0.0",
18+
"@angular/http": "~7.0.0",
19+
"@angular/platform-browser": "~7.0.0",
20+
"@angular/platform-browser-dynamic": "~7.0.0",
21+
"@angular/router": "~7.0.0",
22+
"nativescript-angular": "~7.0.0",
2323
"nativescript-facebook": "../src",
2424
"nativescript-theme-core": "^1.0.4",
2525
"nativescript-unit-test-runner": "^0.3.4",
26-
"rxjs": "~6.1.0",
27-
"tns-core-modules": "^5.0.1",
26+
"rxjs": "^6.3.3",
27+
"tns-core-modules": "^5.0.0",
2828
"zone.js": "^0.8.4"
2929
},
3030
"devDependencies": {
@@ -33,12 +33,9 @@
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.4",
37-
"nativescript-dev-webpack": "~0.17.0",
38-
"tslint": "~5.11.0",
39-
"typescript": "~2.8.2",
40-
"@angular/compiler-cli": "~6.1.0",
41-
"@ngtools/webpack": "~6.2.0"
36+
"nativescript-dev-typescript": "~0.7.0",
37+
"nativescript-dev-webpack": "~0.18.0",
38+
"tslint": "~5.11.0"
4239
},
4340
"scripts": {
4441
"build.plugin": "cd ../src && npm run build",

demo/app/package.json

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -29,78 +29,6 @@
2929
"v8Flags": "--expose_gc",
3030
"requireModules": ["nativescript-facebook"]
3131
},
32-
"devDependencies": {
33-
"nativescript-dev-typescript": "^0.3.0"
34-
},
35-
"_id": "tns-template-hello-world-ts@1.6.0",
36-
"_shasum": "a567c2b9a56024818c06596dab9629d155c5b8a8",
37-
"_resolved": "https://registry.npmjs.org/tns-template-hello-world-ts/-/tns-template-hello-world-ts-1.6.0.tgz",
38-
"_from": "tns-template-hello-world-ts@latest",
39-
"scripts": {},
40-
"_npmVersion": "2.14.7",
41-
"_nodeVersion": "4.2.2",
42-
"_npmUser": {
43-
"name": "enchev",
44-
"email": "vladimir.enchev@gmail.com"
45-
},
46-
"dist": {
47-
"shasum": "a567c2b9a56024818c06596dab9629d155c5b8a8",
48-
"tarball": "http://registry.npmjs.org/tns-template-hello-world-ts/-/tns-template-hello-world-ts-1.6.0.tgz"
49-
},
50-
"maintainers": [
51-
{
52-
"name": "enchev",
53-
"email": "vladimir.enchev@gmail.com"
54-
},
55-
{
56-
"name": "erjangavalji",
57-
"email": "erjan.gavalji@gmail.com"
58-
},
59-
{
60-
"name": "fatme",
61-
"email": "hfatme@gmail.com"
62-
},
63-
{
64-
"name": "hdeshev",
65-
"email": "hristo@deshev.com"
66-
},
67-
{
68-
"name": "kerezov",
69-
"email": "d.kerezov@gmail.com"
70-
},
71-
{
72-
"name": "ligaz",
73-
"email": "stefan.dobrev@gmail.com"
74-
},
75-
{
76-
"name": "nsndeck",
77-
"email": "nedyalko.nikolov@telerik.com"
78-
},
79-
{
80-
"name": "rosen-vladimirov",
81-
"email": "rosen.vladimirov.91@gmail.com"
82-
},
83-
{
84-
"name": "sdobrev",
85-
"email": "stefan.dobrev@gmail.com"
86-
},
87-
{
88-
"name": "tailsu",
89-
"email": "tailsu@gmail.com"
90-
},
91-
{
92-
"name": "teobugslayer",
93-
"email": "teobugslayer@gmail.com"
94-
},
95-
{
96-
"name": "valio.stoychev",
97-
"email": "valio.stoychev@gmail.com"
98-
}
99-
],
100-
"_npmOperationalInternal": {
101-
"host": "packages-5-east.internal.npmjs.com",
102-
"tmp": "tmp/tns-template-hello-world-ts-1.6.0.tgz_1455717516189_0.6427943941671401"
103-
},
10432
"directories": {},
10533
"readme": "ERROR: No README data found!"
10634
}

demo/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"nativescript-facebook": "../src",
1313
"nativescript-theme-core": "^1.0.4",
1414
"nativescript-unit-test-runner": "^0.3.4",
15-
"tns-core-modules": "^5.0.1"
15+
"tns-core-modules": "^5.0.0"
1616
},
1717
"devDependencies": {
1818
"chai": "~4.1.2",
@@ -24,10 +24,9 @@
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.4",
28-
"nativescript-dev-webpack": "~0.17.0",
27+
"nativescript-dev-typescript": "~0.7.0",
28+
"nativescript-dev-webpack": "~0.18.0",
2929
"tslint": "~5.11.0",
30-
"typescript": "~2.8.2",
3130
"wd": "~1.7.0",
3231
"@types/chai": "^4.1.3",
3332
"@types/mocha": "^5.2.0",

src/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"description": "NativeScript plugin, wrapper of native Facebook SDK for Adroid and iOS.",
55
"nativescript": {
66
"platforms": {
7-
"android": "3.0.0",
8-
"ios": "3.0.0"
7+
"android": "4.0.0",
8+
"ios": "4.0.0"
99
}
1010
},
1111
"scripts": {
@@ -41,15 +41,15 @@
4141
"homepage": "https://github.com/NativeScript/nativescript-facebook",
4242
"readmeFilename": "README.md",
4343
"devDependencies": {
44-
"tns-core-modules": "^5.0.1",
44+
"tns-core-modules": "^5.0.0",
4545
"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",
46+
"typescript": "~3.1.6",
47+
"nativescript-angular": "~7.0.0",
48+
"@angular/core": "~7.0.0",
49+
"@angular/common": "~7.0.0",
50+
"@angular/compiler": "~7.0.0",
51+
"@angular/compiler-cli": "~7.0.0",
52+
"rxjs": "^6.3.3",
5353
"zone.js": "~0.8.26",
5454
"tslint": "~5.11.0"
5555
}

src/platforms/android/include.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
/* Include.gradle configuration: http://docs.nativescript.org/plugins/plugins#includegradle-specification */
22

33
android {
4-
productFlavors {
5-
"nativescript-facebook" {
6-
dimension "nativescript-facebook"
7-
}
8-
}
94
}
105

116
dependencies {

src/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
],
1919
"compileOnSave": false,
2020
"angularCompilerOptions": {
21-
"annotateForClosureCompiler": true,
2221
"strictMetadataEmit": true,
2322
"skipTemplateCodegen": true,
2423
"genDir": "."

0 commit comments

Comments
 (0)