Skip to content

Commit dc6f30e

Browse files
authored
Merge pull request #180 from NativeScript/lini/update-5.0
chor: update dependencies for NativeScript 5.0
2 parents affaebd + a2b19c7 commit dc6f30e

File tree

10 files changed

+38
-24
lines changed

10 files changed

+38
-24
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*.js.map
77
*.log
88
*.esm.json
9+
*.tns.json
910
src/*.d.ts
1011
!src/index.d.ts
1112
!src/references.d.ts

.travis.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ matrix:
4242
- tns build android --bundle --env.uglify --env.aot
4343
- language: android
4444
env:
45-
- BuildAndroid="26"
45+
- BuildAndroid="28"
4646
os: linux
4747
jdk: oraclejdk8
4848
before_install: nvm install 8.11.4
@@ -61,12 +61,10 @@ matrix:
6161

6262
android:
6363
components:
64-
- tools
6564
- tools
6665
- platform-tools
67-
- build-tools-27.0.3
68-
- android-26
69-
- android-23
66+
- build-tools-28.0.2
67+
- android-28
7068
- extra-android-m2repository
7169

7270
before_install:

demo-angular/app/App_Resources/Android/src/main/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<uses-permission android:name="android.permission.INTERNET"/>
2020

2121
<application
22+
android:networkSecurityConfig="@xml/network_security_config"
2223
android:name="com.tns.NativeScriptApplication"
2324
android:allowBackup="true"
2425
android:icon="@drawable/icon"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<network-security-config>
3+
<domain-config cleartextTrafficPermitted="true">
4+
<domain includeSubdomains="true">10.0.2.2</domain>
5+
</domain-config>
6+
</network-security-config>

demo-angular/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"nativescript": {
77
"id": "org.nativescript.demoangular",
88
"tns-android": {
9-
"version": "4.2.0"
9+
"version": "5.0.0"
1010
},
1111
"tns-ios": {
12-
"version": "4.2.0"
12+
"version": "5.0.0"
1313
}
1414
},
1515
"scripts": {
@@ -26,18 +26,18 @@
2626
"@angular/platform-browser": "~6.1.0",
2727
"@angular/platform-browser-dynamic": "~6.1.0",
2828
"@angular/router": "~6.1.0",
29-
"nativescript-angular": "~6.1.0",
29+
"nativescript-angular": "~6.2.0",
3030
"nativescript-background-http": "../src",
3131
"nativescript-theme-core": "~1.0.4",
3232
"reflect-metadata": "~0.1.10",
3333
"rxjs": "~6.2.0",
34-
"tns-core-modules": "^4.2.0",
35-
"tns-platform-declarations": "^4.2.0",
34+
"tns-core-modules": "^5.0.1",
35+
"tns-platform-declarations": "^5.0.0",
3636
"zone.js": "~0.8.26"
3737
},
3838
"devDependencies": {
39-
"nativescript-dev-typescript": "^0.7.2",
40-
"nativescript-dev-webpack": "~0.15.1",
39+
"nativescript-dev-typescript": "~0.7.4",
40+
"nativescript-dev-webpack": "~0.17.0",
4141
"typescript": "~2.8.2",
4242
"tslint": "~5.11.0"
4343
}

demo/app/App_Resources/Android/src/main/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<uses-permission android:name="android.permission.INTERNET"/>
2020

2121
<application
22+
android:networkSecurityConfig="@xml/network_security_config"
2223
android:name="com.tns.NativeScriptApplication"
2324
android:allowBackup="true"
2425
android:icon="@drawable/icon"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<network-security-config>
3+
<domain-config cleartextTrafficPermitted="true">
4+
<domain includeSubdomains="true">10.0.2.2</domain>
5+
</domain-config>
6+
</network-security-config>

demo/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"nativescript": {
77
"id": "org.nativescript.demo",
88
"tns-android": {
9-
"version": "4.2.0"
9+
"version": "5.0.0"
1010
},
1111
"tns-ios": {
12-
"version": "4.2.0"
12+
"version": "5.0.0"
1313
}
1414
},
1515
"scripts": {
@@ -19,12 +19,12 @@
1919
"dependencies": {
2020
"nativescript-background-http": "../src",
2121
"nativescript-theme-core": "~1.0.4",
22-
"tns-core-modules": "^4.2.0",
23-
"tns-platform-declarations": "^4.2.0"
22+
"tns-core-modules": "^5.0.1",
23+
"tns-platform-declarations": "^5.0.0"
2424
},
2525
"devDependencies": {
26-
"nativescript-dev-typescript": "^0.7.2",
27-
"nativescript-dev-webpack": "^0.15.1",
26+
"nativescript-dev-typescript": "~0.7.4",
27+
"nativescript-dev-webpack": "~0.17.0",
2828
"typescript": "~2.8.2",
2929
"tslint": "~5.11.0"
3030
}

src/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@
5151
"license": "Apache-2.0",
5252
"homepage": "https://github.com/NativeScript/nativescript-background-http/issues",
5353
"devDependencies": {
54-
"tns-core-modules": "^3.0.0 || ^4.0.0",
55-
"tns-platform-declarations": "^3.0.0 || ^4.0.0",
56-
"typescript": "~2.7.2",
57-
"rimraf": "^2.5.0",
58-
"tslint": "^5.0.0",
59-
"semver": "^5.5.0"
54+
"tns-core-modules": "^5.0.1",
55+
"tns-platform-declarations": "^5.0.0",
56+
"typescript": "~2.8.2",
57+
"rimraf": "~2.6.2",
58+
"tslint": "~5.11.0",
59+
"semver": "~5.6.0"
6060
},
6161
"bootstrapper": "nativescript-plugin-seed"
6262
}

src/platforms/android/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
34
<uses-permission android:name="android.permission.INTERNET" />
45
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
56
<uses-permission android:name="android.permission.WAKE_LOCK" />

0 commit comments

Comments
 (0)