Skip to content

Commit a8cbc6e

Browse files
committed
feat(androidx): migrate to androidx
1 parent 202b7b4 commit a8cbc6e

File tree

12 files changed

+1003
-1094
lines changed

12 files changed

+1003
-1094
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
android:xlargeScreens="true"/>
1212

1313
<uses-sdk
14-
android:minSdkVersion="17"
14+
android:minSdkVersion="18"
1515
android:targetSdkVersion="__APILEVEL__"/>
1616

1717
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

demo-angular/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"nativescript": {
77
"id": "org.nativescript.demoangular",
88
"tns-android": {
9-
"version": "5.3.0"
9+
"version": "5.3.0-2019-03-19-143503-02"
1010
},
1111
"tns-ios": {
1212
"version": "5.3.0"
@@ -31,8 +31,8 @@
3131
"nativescript-theme-core": "~1.0.4",
3232
"reflect-metadata": "~0.1.10",
3333
"rxjs": "^6.3.3",
34-
"tns-core-modules": "^5.0.0",
35-
"tns-platform-declarations": "^5.0.0",
34+
"tns-core-modules": "androidx",
35+
"tns-platform-declarations": "androidx",
3636
"zone.js": "~0.8.26"
3737
},
3838
"devDependencies": {

demo-angular/references.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
/// <reference path="../src/node_modules/tns-platform-declarations/ios.d.ts" />
22
/// <reference path="../src/node_modules/tns-platform-declarations/android.d.ts" />
3-
/// <reference path="../src/typings/java!uploadservice-3.4.2.ts" />
3+
/// <reference path="../src/typings/java!uploadservice-3.5.2.ts" />

demo-vue/app/App_Resources/Android/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
android:xlargeScreens="true"/>
1212

1313
<uses-sdk
14-
android:minSdkVersion="17"
14+
android:minSdkVersion="18"
1515
android:targetSdkVersion="__APILEVEL__"/>
1616

1717
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

demo-vue/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"nativescript": {
33
"id": "org.nativescript.demovue",
44
"tns-android": {
5-
"version": "5.3.0"
5+
"version": "5.3.0-2019-03-19-143503-02"
66
},
77
"tns-ios": {
88
"version": "5.3.0"
@@ -18,7 +18,7 @@
1818
"nativescript-background-http": "../src",
1919
"nativescript-theme-core": "~1.0.4",
2020
"nativescript-vue": "~2.2.0",
21-
"tns-core-modules": "^5.0.0"
21+
"tns-core-modules": "androidx"
2222
},
2323
"devDependencies": {
2424
"@babel/core": "~7.1.0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
android:xlargeScreens="true"/>
1212

1313
<uses-sdk
14-
android:minSdkVersion="17"
14+
android:minSdkVersion="18"
1515
android:targetSdkVersion="__APILEVEL__"/>
1616

1717
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

demo/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"nativescript": {
77
"id": "org.nativescript.demo",
88
"tns-android": {
9-
"version": "5.3.0"
9+
"version": "5.3.0-2019-03-19-143503-02"
1010
},
1111
"tns-ios": {
1212
"version": "5.3.0"
@@ -19,8 +19,8 @@
1919
"dependencies": {
2020
"nativescript-background-http": "../src",
2121
"nativescript-theme-core": "~1.0.4",
22-
"tns-core-modules": "^5.0.0",
23-
"tns-platform-declarations": "^5.0.0"
22+
"tns-core-modules": "androidx",
23+
"tns-platform-declarations": "androidx"
2424
},
2525
"devDependencies": {
2626
"nativescript-dev-typescript": "~0.9.0",

demo/references.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
/// <reference path="../src/node_modules/tns-platform-declarations/ios.d.ts" />
22
/// <reference path="../src/node_modules/tns-platform-declarations/android.d.ts" />
3-
/// <reference path="../src/typings/java!uploadservice-3.4.2.ts" />
3+
/// <reference path="../src/typings/java!uploadservice-3.5.2.ts" />

src/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
"license": "Apache-2.0",
5454
"homepage": "https://github.com/NativeScript/nativescript-background-http/issues",
5555
"devDependencies": {
56-
"tns-core-modules": "^5.0.0",
57-
"tns-platform-declarations": "^5.0.0",
56+
"tns-core-modules": "androidx",
57+
"tns-platform-declarations": "androidx",
5858
"typescript": "~3.1.6",
5959
"rimraf": "~2.6.2",
6060
"semver": "~5.6.0",

src/platforms/android/include.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ android {
44

55
//optional elements
66
dependencies {
7-
implementation 'net.gotev:uploadservice:3.4.2'
7+
implementation 'net.gotev:uploadservice:3.5.2'
88
}

0 commit comments

Comments
 (0)