Merge pull request #215 from NativeScript/androidx

tgpetrov · web-flow · commit d62bf6272c34 · 2019-07-22T09:53:49.000+03:00
AndroidX support
diff --git a/demo-angular/app/App_Resources/Android/src/main/AndroidManifest.xml b/demo-angular/app/App_Resources/Android/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
 		android:xlargeScreens="true"/>
 
 	<uses-sdk
-		android:minSdkVersion="17"
+		android:minSdkVersion="18"
 		android:targetSdkVersion="__APILEVEL__"/>
 
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
diff --git a/demo-angular/references.d.ts b/demo-angular/references.d.ts
@@ -1,3 +1,3 @@
 /// <reference path="../src/node_modules/tns-platform-declarations/ios.d.ts" />
 /// <reference path="../src/node_modules/tns-platform-declarations/android.d.ts" />
-/// <reference path="../src/typings/java!uploadservice-3.4.2.ts" />
+/// <reference path="../src/typings/java!uploadservice-3.5.2.ts" />
diff --git a/demo-vue/app/App_Resources/Android/AndroidManifest.xml b/demo-vue/app/App_Resources/Android/AndroidManifest.xml
@@ -11,7 +11,7 @@
 		android:xlargeScreens="true"/>
 
 	<uses-sdk
-		android:minSdkVersion="17"
+		android:minSdkVersion="18"
 		android:targetSdkVersion="__APILEVEL__"/>
 
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
diff --git a/demo/app/App_Resources/Android/src/main/AndroidManifest.xml b/demo/app/App_Resources/Android/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
 		android:xlargeScreens="true"/>
 
 	<uses-sdk
-		android:minSdkVersion="17"
+		android:minSdkVersion="18"
 		android:targetSdkVersion="__APILEVEL__"/>
 
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
diff --git a/demo/references.d.ts b/demo/references.d.ts
@@ -1,3 +1,3 @@
 /// <reference path="../src/node_modules/tns-platform-declarations/ios.d.ts" />
 /// <reference path="../src/node_modules/tns-platform-declarations/android.d.ts" />
-/// <reference path="../src/typings/java!uploadservice-3.4.2.ts" />
+/// <reference path="../src/typings/java!uploadservice-3.5.2.ts" />
diff --git a/src/package.json b/src/package.json
@@ -1,12 +1,12 @@
 {
     "name": "nativescript-background-http",
-    "version": "3.4.1",
+    "version": "4.0.0",
     "main": "background-http",
     "typings": "index.d.ts",
     "nativescript": {
         "platforms": {
-            "android": "4.0.0",
-            "ios": "4.0.0"
+            "android": "6.0.0",
+            "ios": "6.0.0"
         }
     },
     "repository": {
@@ -53,8 +53,8 @@
     "license": "Apache-2.0",
     "homepage": "https://github.com/NativeScript/nativescript-background-http/issues",
     "devDependencies": {
-        "tns-core-modules": "^5.0.0",
-        "tns-platform-declarations": "^5.0.0",
+        "tns-core-modules": "^6.0.0",
+        "tns-platform-declarations": "^6.0.0",
         "typescript": "~3.1.6",
         "rimraf": "~2.6.2",
         "semver": "~5.6.0",
diff --git a/src/platforms/android/include.gradle b/src/platforms/android/include.gradle
@@ -4,5 +4,5 @@ android {
 
 //optional elements
 dependencies {
-    implementation 'net.gotev:uploadservice:3.4.2'
+    implementation 'net.gotev:uploadservice:3.5.2'
 }
diff --git a/src/typings/java!uploadservice-3.4.2.ts b/src/typings/java!uploadservice-3.4.2.ts
diff --git a/src/typings/java!uploadservice-3.5.2.ts b/src/typings/java!uploadservice-3.5.2.ts

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ android {`
`4`	`4`
`5`	`5`	`//optional elements`
`6`	`6`	`dependencies {`
`7`		`- implementation 'net.gotev:uploadservice:3.4.2'`
	`7`	`+ implementation 'net.gotev:uploadservice:3.5.2'`
`8`	`8`	`}`