Skip to content
This repository was archived by the owner on Feb 7, 2019. It is now read-only.

Commit eadaea2

Browse files
linilini
authored
Merge pull request #171 from NativeScript/lini/add-ns-3.4.0-compatibility
update travis CI and hook code for compatibility with 3.4.0
2 parents 535a498 + 1d7378d commit eadaea2

File tree

3 files changed

+270
-240
lines changed

3 files changed

+270
-240
lines changed

‎.travis.yml‎

Lines changed: 65 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,65 @@
1-
branches:
2-
only:
3-
- master
4-
matrix:
5-
include:
6-
- stage: "Lint"
7-
language: node_js
8-
os: linux
9-
node_js: "6"
10-
script: cd src && npm run ci.tslint && cd ../demo && npm run ci.tslint
11-
- stage: "WebPack and Build"
12-
os: osx
13-
env:
14-
- Platform="iOS"
15-
- Xcode="9.2"
16-
osx_image: xcode9.2
17-
language: node_js
18-
node_js: "6"
19-
jdk: oraclejdk8
20-
script: cd demo && npm run build.plugin && npm i && npm run build-ios-bundle
21-
- os: linux
22-
language: android
23-
env:
24-
- Platform="Android"
25-
- AndroidSDK="26"
26-
jdk: oraclejdk8
27-
before_install: nvm install 6.10.3
28-
script: >
29-
echo { \"project_info\": { \"project_number\": \"424050927453\", \"firebase_url\": \"https://pptest-53916.firebaseio.com\", \"project_id\": \"pptest-53916\", \"storage_bucket\": \"pptest-53916.appspot.com\" }, \"client\": [ { \"client_info\": { \"mobilesdk_app_id\": \"1:424050927453:android:21d2dd8987e1e3d1\", \"android_client_info\": { \"package_name\": \"org.nativescript.ppTest\" } }, \"oauth_client\": [ { \"client_id\": \"424050927453-o7gv6bcmknujjoaaoa5r4d452cutb9jf.apps.googleusercontent.com\", \"client_type\": 3 } ], \"api_key\": [ { \"current_key\": \"AIzaSyDr3fqH7Z8-vhBNpAges_KFTA7oOoylGvU\" } ], \"services\": { \"analytics_service\": { \"status\": 1 }, \"appinvite_service\": { \"status\": 1, \"other_platform_oauth_client\": [] }, \"ads_service\": { \"status\": 2 } } } ], \"configuration_version\": \"1\"} > demo/app/App_Resources/Android/google-services.json &&
30-
cd demo && npm run build.plugin && npm i && npm run build-android-bundle
31-
- language: android
32-
env:
33-
- Platform="Android"
34-
- AndroidSDK="26"
35-
os: linux
36-
jdk: oraclejdk8
37-
before_install: nvm install stable
38-
script: >
39-
echo { \"project_info\": { \"project_number\": \"424050927453\", \"firebase_url\": \"https://pptest-53916.firebaseio.com\", \"project_id\": \"pptest-53916\", \"storage_bucket\": \"pptest-53916.appspot.com\" }, \"client\": [ { \"client_info\": { \"mobilesdk_app_id\": \"1:424050927453:android:21d2dd8987e1e3d1\", \"android_client_info\": { \"package_name\": \"org.nativescript.ppTest\" } }, \"oauth_client\": [ { \"client_id\": \"424050927453-o7gv6bcmknujjoaaoa5r4d452cutb9jf.apps.googleusercontent.com\", \"client_type\": 3 } ], \"api_key\": [ { \"current_key\": \"AIzaSyDr3fqH7Z8-vhBNpAges_KFTA7oOoylGvU\" } ], \"services\": { \"analytics_service\": { \"status\": 1 }, \"appinvite_service\": { \"status\": 1, \"other_platform_oauth_client\": [] }, \"ads_service\": { \"status\": 2 } } } ], \"configuration_version\": \"1\"} > demo/app/App_Resources/Android/google-services.json &&
40-
cd demo && npm run ci.android.build
41-
- os: osx
42-
env:
43-
- Platform="iOS"
44-
- Xcode="9.2"
45-
osx_image: xcode9.2
46-
language: node_js
47-
node_js: "6"
48-
jdk: oraclejdk8
49-
script: cd demo && npm run ci.ios.build
50-
51-
android:
52-
components:
53-
- tools
54-
- platform-tools
55-
- build-tools-26.0.1
56-
- android-23
57-
- android-26
58-
- extra-android-m2repository
59-
60-
install:
61-
- echo no | npm install -g nativescript
62-
- tns usage-reporting disable
63-
- tns error-reporting disable
64-
1+
branches:
2+
only:
3+
- master
4+
matrix:
5+
include:
6+
- stage: "Lint"
7+
language: node_js
8+
os: linux
9+
node_js: "6"
10+
script: cd src && npm run ci.tslint && cd ../demo && npm run ci.tslint
11+
- stage: "WebPack and Build"
12+
os: osx
13+
env:
14+
- Platform="iOS"
15+
- Xcode="9.2"
16+
- Webpack="true"
17+
osx_image: xcode9.2
18+
language: node_js
19+
node_js: "6"
20+
jdk: oraclejdk8
21+
script: cd demo && npm run build.plugin && npm i && tns build ios --bundle --env.uglify
22+
- os: linux
23+
language: android
24+
env:
25+
- Platform="Android"
26+
- AndroidSDK="26"
27+
- Webpack="true"
28+
jdk: oraclejdk8
29+
before_install: nvm install 6.10.3
30+
script: >
31+
echo { \"project_info\": { \"project_number\": \"424050927453\", \"firebase_url\": \"https://pptest-53916.firebaseio.com\", \"project_id\": \"pptest-53916\", \"storage_bucket\": \"pptest-53916.appspot.com\" }, \"client\": [ { \"client_info\": { \"mobilesdk_app_id\": \"1:424050927453:android:21d2dd8987e1e3d1\", \"android_client_info\": { \"package_name\": \"org.nativescript.ppTest\" } }, \"oauth_client\": [ { \"client_id\": \"424050927453-o7gv6bcmknujjoaaoa5r4d452cutb9jf.apps.googleusercontent.com\", \"client_type\": 3 } ], \"api_key\": [ { \"current_key\": \"AIzaSyDr3fqH7Z8-vhBNpAges_KFTA7oOoylGvU\" } ], \"services\": { \"analytics_service\": { \"status\": 1 }, \"appinvite_service\": { \"status\": 1, \"other_platform_oauth_client\": [] }, \"ads_service\": { \"status\": 2 } } } ], \"configuration_version\": \"1\"} > demo/app/App_Resources/Android/google-services.json &&
32+
cd demo && npm run build.plugin && npm i && tns build android --bundle --env.uglify
33+
- language: android
34+
env:
35+
- Platform="Android"
36+
- AndroidSDK="26"
37+
os: linux
38+
jdk: oraclejdk8
39+
before_install: nvm install stable
40+
script: >
41+
echo { \"project_info\": { \"project_number\": \"424050927453\", \"firebase_url\": \"https://pptest-53916.firebaseio.com\", \"project_id\": \"pptest-53916\", \"storage_bucket\": \"pptest-53916.appspot.com\" }, \"client\": [ { \"client_info\": { \"mobilesdk_app_id\": \"1:424050927453:android:21d2dd8987e1e3d1\", \"android_client_info\": { \"package_name\": \"org.nativescript.ppTest\" } }, \"oauth_client\": [ { \"client_id\": \"424050927453-o7gv6bcmknujjoaaoa5r4d452cutb9jf.apps.googleusercontent.com\", \"client_type\": 3 } ], \"api_key\": [ { \"current_key\": \"AIzaSyDr3fqH7Z8-vhBNpAges_KFTA7oOoylGvU\" } ], \"services\": { \"analytics_service\": { \"status\": 1 }, \"appinvite_service\": { \"status\": 1, \"other_platform_oauth_client\": [] }, \"ads_service\": { \"status\": 2 } } } ], \"configuration_version\": \"1\"} > demo/app/App_Resources/Android/google-services.json &&
42+
cd demo && npm run ci.android.build
43+
- os: osx
44+
env:
45+
- Platform="iOS"
46+
- Xcode="9.2"
47+
osx_image: xcode9.2
48+
language: node_js
49+
node_js: "6"
50+
jdk: oraclejdk8
51+
script: cd demo && npm run ci.ios.build
52+
53+
android:
54+
components:
55+
- tools
56+
- platform-tools
57+
- build-tools-26.0.1
58+
- android-23
59+
- android-26
60+
- extra-android-m2repository
61+
62+
install:
63+
- echo no | npm install -g nativescript
64+
- tns usage-reporting disable
65+
- tns error-reporting disable

‎demo/package.json‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"nativescript": {
55
"id": "org.nativescript.ppTest",
66
"tns-ios": {
7-
"version": "3.3.0"
7+
"version": "3.4.0"
88
},
99
"tns-android": {
10-
"version": "3.3.1"
10+
"version": "3.4.0"
1111
}
1212
},
1313
"repository": {
@@ -21,36 +21,31 @@
2121
"tns-core-modules": "^3.3.0"
2222
},
2323
"devDependencies": {
24-
"awesome-typescript-loader": "~3.1.3",
24+
"awesome-typescript-loader": "~3.4.1",
2525
"babel-traverse": "6.26.0",
2626
"babel-types": "6.26.0",
2727
"babylon": "6.18.0",
28-
"copy-webpack-plugin": "~4.0.1",
28+
"copy-webpack-plugin": "~4.3.1",
2929
"extract-text-webpack-plugin": "~3.0.0",
3030
"lazy": "1.0.11",
3131
"nativescript-css-loader": "~0.26.0",
32-
"nativescript-dev-typescript": "~0.5.0",
33-
"nativescript-dev-webpack": "^0.8.0",
32+
"nativescript-dev-typescript": "~0.6.0",
33+
"nativescript-dev-webpack": "^0.9.0",
3434
"nativescript-worker-loader": "~0.8.1",
3535
"raw-loader": "~0.5.1",
36-
"resolve-url-loader": "~2.1.0",
36+
"resolve-url-loader": "~2.2.1",
3737
"tslint": "^5.8.0",
38-
"typescript": "~2.4.2",
39-
"webpack": "~3.2.0",
38+
"typescript": "~2.6.2",
39+
"webpack": "~3.10.0",
4040
"webpack-bundle-analyzer": "^2.8.2",
41-
"webpack-sources": "~1.0.1"
41+
"webpack-sources": "~1.1.0",
42+
"css-loader": "~0.28.7"
4243
},
4344
"scripts": {
4445
"build.plugin": "cd ../src && npm run build",
4546
"ci.tslint": "npm run build.plugin && npm i && tslint --config ../tslint.json 'app/**/*.ts' --exclude '**/node_modules/**'",
4647
"ci.android.build": "npm run build.plugin && tns build android",
4748
"ci.ios.build": "npm run build.plugin && tns build ios",
48-
"ns-bundle": "ns-bundle",
49-
"publish-ios-bundle": "npm run ns-bundle --ios --publish-app",
50-
"generate-android-snapshot": "generate-android-snapshot --targetArchs arm,arm64,ia32 --install",
51-
"start-android-bundle": "npm run ns-bundle --android --run-app",
52-
"start-ios-bundle": "npm run ns-bundle --ios --run-app",
53-
"build-android-bundle": "npm run ns-bundle --android --build-app",
54-
"build-ios-bundle": "npm run ns-bundle --ios --build-app"
49+
"generate-android-snapshot": "generate-android-snapshot --targetArchs arm,arm64,ia32 --install"
5550
}
5651
}

0 commit comments

Comments
 (0)