Added support for AndroidX and Android 9.0 Pie. Updated OkHttp to 3.1…

…2.1. Now min SDK is 18 and target SDK is 28. Updated projects and modules for Android Studio 3.3. Released 3.5.0.

build.gradle

@@ -1,18 +1,18 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-// To deploy the library to bintray and jcenter, edit the build.gradle file in the child folder
-// and then, from this folder execute:
-// ./gradlew bintrayUpload
-
 buildscript {
+ apply from: 'manifest.gradle'
+
  repositories {
  jcenter()
+ google()
  mavenCentral()
  }
+
  dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
- classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
- classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
+ classpath "com.android.tools.build:gradle:$gradle_version"
+ classpath "com.github.ben-manes:gradle-versions-plugin:$gradle_versions_plugin_version"
+ classpath "com.github.dcendents:android-maven-gradle-plugin:$maven_gradle_version"
+ classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintray_plugin_version"
 
  // NOTE: Do not place your application dependencies here; they belong
  // in the individual module build.gradle files
@@ -22,7 +22,7 @@ buildscript {
 allprojects {
  repositories {
  jcenter()
- maven { url 'http://maven.google.com' }
+ google()
  mavenCentral()
  }
 }

examples/app/build.gradle

@@ -1,17 +1,22 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+apply plugin: 'com.github.ben-manes.versions'
 
 buildscript {
+ apply from: '../../manifest.gradle'
+
  repositories {
  jcenter()
  mavenCentral()
- maven { url "https://jitpack.io" }
- maven { url "https://maven.google.com" }
+ google()
  }
+
  dependencies {
- classpath 'com.android.tools.build:gradle:3.0.1'
- classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
- classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
- classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.2'
+ classpath "com.android.tools.build:gradle:$gradle_version"
+
+ //classpath dependencies to import library project
+ classpath "com.github.ben-manes:gradle-versions-plugin:$gradle_versions_plugin_version"
+ classpath "com.github.dcendents:android-maven-gradle-plugin:$maven_gradle_version"
+ classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintray_plugin_version"
 
  // NOTE: Do not place your application dependencies here; they belong
  // in the individual module build.gradle files
@@ -22,8 +27,7 @@ allprojects {
  repositories {
  jcenter()
  mavenCentral()
- mavenLocal()
- maven { url "https://maven.google.com" }
+ google()
  }
 }
 

examples/app/demoapp/build.gradle

@@ -1,62 +1,75 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.getkeepsafe.dexcount'
-
-def sdkVersion = 26
-def libraryVersion = "3.4.2"
 
 android {
- compileSdkVersion sdkVersion
- buildToolsVersion '26.0.2'
+ compileSdkVersion target_sdk
 
  defaultConfig {
- applicationId "net.gotev.uploadservicedemo"
- minSdkVersion 16
- targetSdkVersion sdkVersion
- versionCode 22
- versionName libraryVersion
+ applicationId demo_app_id
+ minSdkVersion min_sdk
+ targetSdkVersion target_sdk
+ versionCode version_code
+ versionName library_version
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
  }
+
  buildTypes {
  release {
  minifyEnabled false
  proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
  }
  }
-}
 
-repositories {
- maven { url 'http://dl.bintray.com/igenius-code/maven' }
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
 }
 
-def butterKnifeVersion = "8.8.1"
-def supportVersion = "27.0.2"
+def butterKnifeVersion = "10.0.0"
 def stethoVersion = "1.4.2"
 
 dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
+ // Testing - https://developer.android.com/training/testing/set-up-project
+ testImplementation "junit:junit:$junit_version"
+ testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
 
- // Debugging
- debugCompile "com.facebook.stetho:stetho:${stethoVersion}"
- debugCompile "com.facebook.stetho:stetho-okhttp3:${stethoVersion}"
- releaseCompile "net.igenius:stetho-no-op:1.1"
- compile 'com.squareup.okhttp3:logging-interceptor:3.9.1'
+ // Core library
+ androidTestImplementation "androidx.test:core:$androidx_test_core_version"
 
- // Google support libraries
- compile "com.android.support:appcompat-v7:${supportVersion}"
- compile "com.android.support:design:${supportVersion}"
+ // AndroidJUnitRunner and JUnit Rules
+ androidTestImplementation "androidx.test:runner:$androidx_test_runner_version"
+ androidTestImplementation "androidx.test:rules:$androidx_test_rules_version"
+
+ // Assertions
+ androidTestImplementation "androidx.test.ext:junit:$androidx_test_ext_junit_version"
+ androidTestImplementation "androidx.test.ext:truth:$androidx_test_ext_truth_version"
+ androidTestImplementation "com.google.truth:truth:$truth_version"
+
+ // Espresso dependencies
+ androidTestImplementation "androidx.test.espresso:espresso-core:$androidx_test_espresso_version"
+
+ // Support
+ implementation "androidx.appcompat:appcompat:$androidx_appcompat_version"
+ implementation 'com.google.android.material:material:1.0.0'
+
+ // Debugging
+ implementation "com.facebook.stetho:stetho:${stethoVersion}"
+ implementation "com.facebook.stetho:stetho-okhttp3:${stethoVersion}"
+ implementation 'com.squareup.okhttp3:logging-interceptor:3.9.1'
 
  // ButterKnife
- compile "com.jakewharton:butterknife:${butterKnifeVersion}"
+ implementation "com.jakewharton:butterknife:${butterKnifeVersion}"
  annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
 
- compile 'com.nononsenseapps:filepicker:4.0.0-beta1'
- compile 'net.gotev:recycleradapter:1.6'
+ implementation 'com.nononsenseapps:filepicker:4.0.0-beta1'
+ implementation 'net.gotev:recycleradapter:1.8.0'
 
- /*compile "net.gotev:uploadservice:${libraryVersion}"
- compile "net.gotev:uploadservice-okhttp:${libraryVersion}"
- compile "net.gotev:uploadservice-ftp:${libraryVersion}"*/
+ /*implementation "net.gotev:uploadservice:${libraryVersion}"
+ implementation "net.gotev:uploadservice-okhttp:${libraryVersion}"
+ implementation "net.gotev:uploadservice-ftp:${libraryVersion}"*/
 
  //comment the previous lines and uncomment the next ones for development (it uses the local libs)
- compile project(':uploadservice')
- compile project(':uploadservice-okhttp')
- compile project(':uploadservice-ftp')
+ implementation project(':uploadservice')
+ implementation project(':uploadservice-okhttp')
+ implementation project(':uploadservice-ftp')
 }

examples/app/demoapp/src/main/AndroidManifest.xml

@@ -12,7 +12,7 @@
  android:supportsRtl="true"
  android:theme="@style/AppTheme">
  <provider
- android:name="android.support.v4.content.FileProvider"
+ android:name="androidx.core.content.FileProvider"
  android:authorities="${applicationId}.provider"
  android:exported="false"
  android:grantUriPermissions="true">

examples/app/demoapp/src/main/java/net/gotev/uploadservicedemo/BaseActivity.java

@@ -5,9 +5,9 @@
 import android.content.Intent;
 import android.graphics.Color;
 import android.net.Uri;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.StringRes;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 

examples/app/demoapp/src/main/java/net/gotev/uploadservicedemo/BinaryUploadActivity.java

@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.Toast;
 

examples/app/demoapp/src/main/java/net/gotev/uploadservicedemo/FTPUploadActivity.java

@@ -2,10 +2,6 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NavUtils;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.EditText;
@@ -25,6 +21,10 @@
 import java.util.List;
 import java.util.UUID;
 
+import androidx.annotation.Nullable;
+import androidx.core.app.NavUtils;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.OnClick;
 
@@ -69,7 +69,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
  uploadItemsAdapter = new RecyclerAdapter();
  uploadItemUtils = new UploadItemUtils(uploadItemsAdapter);
- requestItems.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
+ requestItems.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
  requestItems.setAdapter(uploadItemsAdapter);
 
  ipAddressAndHostnameValidator = new IPAddressAndHostnameValidator();

examples/app/demoapp/src/main/java/net/gotev/uploadservicedemo/UploadActivity.java

@@ -1,10 +1,6 @@
 package net.gotev.uploadservicedemo;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NavUtils;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ArrayAdapter;
@@ -21,6 +17,10 @@
 
 import java.util.List;
 
+import androidx.annotation.Nullable;
+import androidx.core.app.NavUtils;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.OnClick;
 
@@ -70,7 +70,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
  uploadItemsAdapter = new RecyclerAdapter();
  uploadItemUtils = new UploadItemUtils(uploadItemsAdapter);
- requestItems.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
+ requestItems.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
  requestItems.setAdapter(uploadItemsAdapter);
 
  AdapterItem emptyItem = getEmptyItem();

examples/app/demoapp/src/main/java/net/gotev/uploadservicedemo/adapteritems/EmptyItem.java

@@ -1,7 +1,7 @@
 package net.gotev.uploadservicedemo.adapteritems;
 
 import android.content.Context;
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 import android.view.View;
 import android.widget.TextView;
 

examples/app/demoapp/src/main/java/net/gotev/uploadservicedemo/adapteritems/UploadItem.java

@@ -1,7 +1,7 @@
 package net.gotev.uploadservicedemo.adapteritems;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

examples/app/demoapp/src/main/java/net/gotev/uploadservicedemo/dialogs/AddFileParameterNameDialog.java

@@ -2,9 +2,9 @@
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.support.annotation.StringRes;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;

examples/app/demoapp/src/main/java/net/gotev/uploadservicedemo/dialogs/AddNameValueDialog.java

@@ -2,9 +2,9 @@
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.support.annotation.StringRes;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;

examples/app/demoapp/src/main/java/net/gotev/uploadservicedemo/utils/AndroidPermissions.java

@@ -3,8 +3,8 @@
 import android.app.Activity;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 
 import java.util.ArrayList;

examples/app/demoapp/src/main/java/net/gotev/uploadservicedemo/utils/FilesPickerActivity.java

@@ -6,8 +6,8 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.widget.Toast;