Skip to content

Commit 2cff2f6

Browse files
elena-pelena-p
authored
Merge branch 'master' into dtodorov/narusevic-add-analytics
2 parents a1bf078 + 6376efa commit 2cff2f6

10 files changed

Lines changed: 48 additions & 70 deletions

File tree

‎.travis.yml‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ matrix:
1919
- stage: "Lint"
2020
language: node_js
2121
os: linux
22-
node_js: "8"
22+
node_js: "10"
2323
script: cd src && npm run ci.tslint && cd ../demo && npm run ci.tslint && cd ../demo-angular && npm run ci.tslint
2424
- stage: "WebPack and Build"
2525
os: osx
@@ -28,7 +28,7 @@ matrix:
2828
- Type="VanillaJS"
2929
osx_image: xcode10.0
3030
language: node_js
31-
node_js: "8"
31+
node_js: "10"
3232
jdk: oraclejdk8
3333
before_script: pod repo update
3434
script:
@@ -42,7 +42,7 @@ matrix:
4242
- Type="VueJS"
4343
osx_image: xcode10.0
4444
language: node_js
45-
node_js: "8"
45+
node_js: "10"
4646
jdk: oraclejdk8
4747
before_script: pod repo update
4848
script:
@@ -56,7 +56,7 @@ matrix:
5656
- Type="Angular"
5757
osx_image: xcode10.0
5858
language: node_js
59-
node_js: "8"
59+
node_js: "10"
6060
jdk: oraclejdk8
6161
before_script: pod repo update
6262
script:
@@ -65,54 +65,61 @@ matrix:
6565
- npm i && tns build ios --bundle --env.uglify --env.aot
6666
- language: android
6767
os: linux
68+
dist: trusty
6869
env:
6970
- WebpackAndroid="28"
7071
- Type="VanillaJS"
7172
jdk: oraclejdk8
72-
before_install: nvm install 8
73+
before_install: nvm install 10
7374
script:
7475
- cd src && npm run build
7576
- cd ../demo && npm i && tns build android --bundle --env.uglify --env.snapshot --copy-to "./outputs/app-debug.apk"
7677
- "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE/$ANDROID_PACKAGE_JS?overwrite=true --data-binary @$ANDROID_PACKAGE_FOLDER_JS/app-debug.apk"
7778
- language: android
7879
os: linux
80+
dist: trusty
7981
env:
8082
- WebpackAndroid="28"
8183
- Type="VueJS"
8284
jdk: oraclejdk8
83-
before_install: nvm install 8
85+
before_install: nvm install 10
8486
script:
8587
- cd src && npm run build
8688
- cd ../demo-vue && npm i && tns build android --bundle --env.uglify --copy-to "./outputs/app-debug.apk"
8789
- "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE/$ANDROID_PACKAGE_VUE?overwrite=true --data-binary @$ANDROID_PACKAGE_FOLDER_VUE/app-debug.apk"
8890
- language: android
8991
os: linux
92+
dist: trusty
9093
env:
9194
- WebpackAndroid="28"
9295
- Type="Angular"
9396
jdk: oraclejdk8
94-
before_install: nvm install 8
97+
before_install: nvm install 10
9598
script:
9699
- cd src && npm run build
97100
- cd ../publish && sh pack.sh
98101
- cd ../demo-angular && tns plugin add ../publish/package/*.tgz
99102
- npm i && tns build android --bundle --env.uglify --env.snapshot --env.aot
100103
- language: android
104+
os: linux
105+
dist: trusty
101106
env:
102107
- BuildAndroid="28"
103108
- Type="VanillaJS"
104-
os: linux
109+
105110
jdk: oraclejdk8
106-
before_install: nvm install 8.11.4
111+
before_install: nvm install 10
107112
script:
108113
- cd demo && npm run ci.android.build
109114
- language: android
115+
os: linux
116+
dist: trusty
110117
env:
111118
- BuildAndroid="28"
112119
- Type="Angular"
113-
os: linux
120+
114121
jdk: oraclejdk8
115-
before_install: nvm install 8.11.4
122+
before_install: nvm install 10
116123
script:
117124
- cd demo-angular && npm run ci.android.build
118125
- os: osx
@@ -122,7 +129,7 @@ matrix:
122129
- Type="VanillaJS"
123130
osx_image: xcode10.0
124131
language: node_js
125-
node_js: "8"
132+
node_js: "10"
126133
jdk: oraclejdk8
127134
before_script: pod repo update
128135
script:
@@ -134,7 +141,7 @@ matrix:
134141
- Type="Angular"
135142
osx_image: xcode10.0
136143
language: node_js
137-
node_js: "8"
144+
node_js: "10"
138145
jdk: oraclejdk8
139146
before_script: pod repo update
140147
script:
@@ -145,7 +152,7 @@ matrix:
145152
- Type="VanillaJS"
146153
language: node_js
147154
os: linux
148-
node_js: "8"
155+
node_js: "10"
149156
script:
150157
- npm i -g appium
151158
- cd demo && npm i
@@ -156,7 +163,7 @@ matrix:
156163
- Type="VueJS"
157164
language: node_js
158165
os: linux
159-
node_js: "8"
166+
node_js: "10"
160167
script:
161168
- npm i -g appium
162169
- cd demo-vue && npm i
@@ -166,7 +173,7 @@ matrix:
166173
- iOS="12.0"
167174
- Type="VanillaJS"
168175
language: node_js
169-
node_js: "8"
176+
node_js: "10"
170177
script:
171178
- npm i -g appium
172179
- cd demo && npm i
@@ -176,7 +183,7 @@ matrix:
176183
- iOS="12.0"
177184
- Type="VueJS"
178185
language: node_js
179-
node_js: "8"
186+
node_js: "10"
180187
script:
181188
- npm i -g appium
182189
- cd demo-vue && npm i

‎demo-angular/app/package.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@
33
"v8Flags": "--expose_gc",
44
"requireModules": ["nativescript-facebook"]
55
},
6-
"main": "main.js",
7-
"name": "tns-template-hello-world-ng",
8-
"version": "2.5.0"
6+
"main": "main.js"
97
}

‎demo-angular/package.json‎

Lines changed: 3 additions & 3 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": "5.3.0"
7+
"version": "5.4.0"
88
},
99
"tns-android": {
10-
"version": "5.3.0"
10+
"version": "5.4.0"
1111
}
1212
},
1313
"dependencies": {
@@ -34,7 +34,7 @@
3434
"karma-nativescript-launcher": "^0.4.0",
3535
"nativescript-css-loader": "~0.26.0",
3636
"nativescript-dev-typescript": "~0.9.0",
37-
"nativescript-dev-webpack": "~0.21.0",
37+
"nativescript-dev-webpack": "~0.22.0",
3838
"tslint": "~5.11.0"
3939
},
4040
"scripts": {

‎demo-vue/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"nativescript": {
33
"id": "org.nativescript.demovue",
44
"tns-android": {
5-
"version": "5.3.0"
5+
"version": "5.4.0"
66
},
77
"tns-ios": {
8-
"version": "5.3.0"
8+
"version": "5.4.0"
99
}
1010
},
1111
"description": "NativeScript Application",
@@ -14,7 +14,7 @@
1414
"dependencies": {
1515
"nativescript-facebook": "../src",
1616
"nativescript-theme-core": "~1.0.4",
17-
"nativescript-vue": "^2.0.0",
17+
"nativescript-vue": "~2.2.0",
1818
"tns-core-modules": "^5.0.0"
1919
},
2020
"devDependencies": {
@@ -32,10 +32,10 @@
3232
"mocha-junit-reporter": "^1.18.0",
3333
"mocha-multi": "^1.0.1",
3434
"mochawesome": "^3.1.1",
35-
"nativescript-dev-appium": "5.0.0",
35+
"nativescript-dev-appium": "~5.2.0",
3636
"nativescript-dev-typescript": "~0.9.0",
37-
"nativescript-dev-webpack": "~0.21.0",
38-
"nativescript-vue-template-compiler": "^2.0.2",
37+
"nativescript-dev-webpack": "~0.22.0",
38+
"nativescript-vue-template-compiler": "~2.2.0",
3939
"node-sass": "~4.9.0",
4040
"vue-loader": "~15.4.2"
4141
},

‎demo/app/home-page.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { EventData } from 'data/observable';
2-
import { Page } from 'ui/page';
1+
import { EventData } from 'tns-core-modules/data/observable';
2+
import { Page } from 'tns-core-modules/ui/page';
33
import { HomeViewModel } from './home-view-model';
44

55
// Event handler for Page 'loaded' event attached in main-page.xml

‎demo/app/login-page.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { EventData } from 'data/observable';
2-
import { Page } from 'ui/page';
1+
import { EventData } from 'tns-core-modules/data/observable';
2+
import { Page } from 'tns-core-modules/ui/page';
33
import { LoginViewModel } from './login-view-model';
44

55
// Event handler for Page 'loaded' event attached in main-page.xml

‎demo/app/package.json‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,7 @@
11
{
2-
"name": "tns-template-hello-world-ts",
32
"main": "app.js",
4-
"version": "1.6.0",
5-
"author": {
6-
"name": "Telerik",
7-
"email": "support@telerik.com"
8-
},
9-
"description": "Nativescript hello-world-ts project template",
10-
"license": "Apache-2.0",
11-
"keywords": [
12-
"telerik",
13-
"mobile",
14-
"nativescript",
15-
"{N}",
16-
"tns",
17-
"appbuilder",
18-
"template"
19-
],
20-
"repository": {
21-
"type": "git",
22-
"url": "git+ssh://git@github.com/NativeScript/template-hello-world-ts.git"
23-
},
24-
"bugs": {
25-
"url": "https://github.com/NativeScript/template-hello-world-ts/issues"
26-
},
27-
"homepage": "https://github.com/NativeScript/template-hello-world-ts",
283
"android": {
294
"v8Flags": "--expose_gc",
305
"requireModules": ["nativescript-facebook"]
31-
},
32-
"directories": {},
33-
"readme": "ERROR: No README data found!"
6+
}
347
}

‎demo/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"nativescript": {
33
"id": "org.nativescript.demo",
44
"tns-android": {
5-
"version": "5.3.0"
5+
"version": "5.4.0"
66
},
77
"tns-ios": {
8-
"version": "5.3.0"
8+
"version": "5.4.0"
99
}
1010
},
1111
"dependencies": {
@@ -26,9 +26,9 @@
2626
"mocha-multi": "^1.0.1",
2727
"mochawesome": "^3.1.1",
2828
"nativescript-css-loader": "~0.26.1",
29-
"nativescript-dev-appium": "5.0.0",
29+
"nativescript-dev-appium": "~5.2.0",
3030
"nativescript-dev-typescript": "~0.9.0",
31-
"nativescript-dev-webpack": "~0.21.0",
31+
"nativescript-dev-webpack": "~0.22.0",
3232
"tslint": "~5.11.0",
3333
"wd": "~1.7.0",
3434
"@types/chai": "^4.1.3",

‎src/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nativescript-facebook",
3-
"version": "3.0.0",
3+
"version": "3.0.1",
44
"description": "NativeScript plugin, wrapper of native Facebook SDK for Android and iOS.",
55
"nativescript": {
66
"platforms": {
@@ -47,7 +47,7 @@
4747
"tns-platform-declarations": "^5.0.0",
4848
"typescript": "~3.1.6",
4949
"nativescript-angular": "~7.2.0",
50-
"nativescript-vue": "^2.0.2",
50+
"nativescript-vue": "~2.2.0",
5151
"@angular/core": "~7.2.0",
5252
"@angular/common": "~7.2.0",
5353
"@angular/compiler": "~7.2.0",

‎src/platforms/ios/Podfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
pod 'FBSDKCoreKit', '~> 4.7'
2-
pod 'FBSDKLoginKit', '~> 4.7'
3-
pod 'FBSDKShareKit', '~> 4.40'
1+
pod 'FBSDKCoreKit', '~> 4.38.0'
2+
pod 'FBSDKLoginKit', '~> 4.38.0'
3+
pod 'FBSDKShareKit', '~> 4.38.0'

0 commit comments

Comments
 (0)