update build

SHLIGHAB · Jan 7, 2020 · fecf45a · fecf45a
1 parent 2f67ec2
commit fecf45a
Show file tree

Hide file tree

Showing 34 changed files with 92 additions and 82 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0-alpha08'
+        classpath 'com.android.tools.build:gradle:3.5.3'
     }
 }
 allprojects {

diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu May 03 19:49:22 AEST 2018
+#Mon Jan 06 17:16:00 AEDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
@@ -4,6 +4,9 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <application />
+    <application android:usesCleartextTraffic="true">
+        <uses-library android:name="org.apache.http.legacy"
+            android:required="false"/>
+    </application>
 
 </manifest>
diff --git a/library/build.gradle b/library/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0-alpha16'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
     }
 }
@@ -19,14 +19,13 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.jfrog.bintray'
 
 dependencies {
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.google.code.gson:gson:2.8.2'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
 }
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
     useLibrary 'org.apache.http.legacy'
     sourceSets {
         main {

diff --git a/library/src/com/android/volley/AsyncRequestLoader.java b/library/src/com/android/volley/AsyncRequestLoader.java
@@ -1,7 +1,6 @@
 package com.android.volley;
 
 import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
 
 import com.android.volley.error.VolleyError;
 import com.android.volley.request.GsonRequest;
@@ -10,6 +9,8 @@
 
 import org.apache.http.HttpStatus;
 
+import androidx.loader.content.AsyncTaskLoader;
+
 
 /**
  * Created by HaKr on 12/08/15.

diff --git a/library/src/com/android/volley/Volley.java b/library/src/com/android/volley/Volley.java
@@ -4,8 +4,6 @@
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.net.http.AndroidHttpClient;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.util.ArrayMap;
 import android.text.TextUtils;
 import android.widget.ImageView;
 
@@ -23,9 +21,9 @@
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Map;
 
-import static com.android.volley.toolbox.HttpHeaderParser.parseDateAsEpoch;
+import androidx.collection.ArrayMap;
+import androidx.core.content.ContextCompat;
 
 /**
  * Created by HaKr on 13/05/17.

diff --git a/library/src/com/android/volley/cache/BitmapCache.java b/library/src/com/android/volley/cache/BitmapCache.java
@@ -20,14 +20,15 @@
 import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.util.LruCache;
 
 import com.android.volley.VolleyLog;
 import com.android.volley.misc.Utils;
 import com.android.volley.toolbox.ImageCache;
 
+import androidx.collection.LruCache;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
 /**
  * This class holds our bitmap caches (memory and disk).
  */
@@ -41,7 +42,7 @@ public class BitmapCache implements ImageCache {
 
     /**
      * Don't instantiate this class directly, use
-     * {@link #getInstance(android.support.v4.app.FragmentManager, float)}.
+     * {@link #getInstance(FragmentManager, float)}.
      * @param memCacheSize Memory cache size in KB.
      */
     private BitmapCache(int memCacheSize) {

diff --git a/library/src/com/android/volley/cache/BitmapImageCache.java b/library/src/com/android/volley/cache/BitmapImageCache.java
@@ -16,22 +16,23 @@
 
 package com.android.volley.cache;
 
-import java.io.File;
-
 import android.annotation.TargetApi;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.os.StatFs;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.util.LruCache;
 
 import com.android.volley.VolleyLog;
 import com.android.volley.cache.DiskLruBasedCache.ImageCacheParams;
 import com.android.volley.misc.Utils;
 import com.android.volley.toolbox.ImageCache;
 
+import java.io.File;
+
+import androidx.collection.LruCache;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
 /**
  * This class holds our bitmap caches (memory and disk).
  */
@@ -45,7 +46,7 @@ public class BitmapImageCache implements ImageCache {
 
     /**
      * Don't instantiate this class directly, use
-     * {@link #getInstance(android.support.v4.app.FragmentManager, float)}.
+     * {@link #getInstance(FragmentManager, float)}.
      * @param memCacheSize Memory cache size in KB.
      */
     public BitmapImageCache(int memCacheSize) {

diff --git a/library/src/com/android/volley/cache/LruImageCache.java b/library/src/com/android/volley/cache/LruImageCache.java
@@ -3,11 +3,12 @@
 import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
 import android.os.Build;
-import android.support.v4.util.LruCache;
 
 import com.android.volley.toolbox.ImageCache;
 import com.android.volley.toolbox.ImageLoader;
 
+import androidx.collection.LruCache;
+
 
 /**
  * Basic implementation of a Bitmap LRU cache to use

diff --git a/library/src/com/android/volley/cache/SimpleImageLoader.java b/library/src/com/android/volley/cache/SimpleImageLoader.java
@@ -28,7 +28,6 @@
 import android.graphics.drawable.TransitionDrawable;
 import android.net.http.AndroidHttpClient;
 import android.os.Build;
-import android.support.v4.app.FragmentActivity;
 import android.widget.ImageView;
 
 import com.android.volley.Cache;
@@ -47,6 +46,8 @@
 
 import java.util.ArrayList;
 
+import androidx.fragment.app.FragmentActivity;
+
 /**
  * A class that wraps up remote image loading requests using the Volley library combined with a
  * memory cache. An single instance of this class should be created once when your Activity or

diff --git a/library/src/com/android/volley/misc/Utils.java b/library/src/com/android/volley/misc/Utils.java
@@ -16,13 +16,6 @@
 
 package com.android.volley.misc;
 
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.nio.charset.Charset;
-
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.ContentResolver;
@@ -37,6 +30,13 @@
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.nio.charset.Charset;
+
 /**
  * Class containing some static utility methods.
  */

diff --git a/library/src/com/android/volley/toolbox/ImageLoader.java b/library/src/com/android/volley/toolbox/ImageLoader.java
@@ -22,7 +22,6 @@
 import android.graphics.Bitmap.Config;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.v4.util.ArrayMap;
 import android.widget.ImageView;
 import android.widget.ImageView.ScaleType;
 
@@ -38,6 +37,8 @@
 
 import java.util.LinkedList;
 
+import androidx.collection.ArrayMap;
+
 /**
  * Helper that handles loading and caching images from remote URLs.
  *

diff --git a/library/src/com/android/volley/ui/PhotoView.java b/library/src/com/android/volley/ui/PhotoView.java
@@ -28,24 +28,24 @@
 import android.graphics.RectF;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.v4.view.GestureDetectorCompat;
-import android.support.v4.view.ScaleGestureDetectorCompat;
 import android.text.TextUtils;
 import android.util.AttributeSet;
-import android.util.FloatMath;
 import android.view.GestureDetector.OnDoubleTapListener;
 import android.view.GestureDetector.OnGestureListener;
-import android.view.ViewGroup.LayoutParams;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
 import android.view.ViewConfiguration;
+import android.view.ViewGroup.LayoutParams;
 
 import com.android.volley.R;
 import com.android.volley.error.VolleyError;
 import com.android.volley.misc.Utils.HorizontallyScrollable;
 import com.android.volley.toolbox.ImageLoader.ImageContainer;
 import com.android.volley.toolbox.ImageLoader.ImageListener;
 
+import androidx.core.view.GestureDetectorCompat;
+import androidx.core.view.ScaleGestureDetectorCompat;
+
 /**
  * Layout for the photo list view header.
  */

diff --git a/sample/AndroidManifest.xml b/sample/AndroidManifest.xml
@@ -1,12 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.volley.demo"
     android:versionCode="3"
     android:versionName="1.1" >
 
-    <uses-sdk
-        android:minSdkVersion="9"
-        android:targetSdkVersion="19" />
-
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -17,7 +14,11 @@
         android:hardwareAccelerated="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning">
+        <meta-data
+            android:name="com.google.android.gms.ads.APPLICATION_ID"
+            android:value="ca-app-pub-6407484780907805~3972270474"/>
         <activity
             android:name="com.volley.demo.MainActivity"
             android:label="@string/app_name" >

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -4,23 +4,23 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0-alpha08'
+        classpath 'com.android.tools.build:gradle:3.5.3'
     }
 }
 
 apply plugin: 'com.android.application'
 
 dependencies {
-    compile fileTree(include: '*.jar', dir: 'libs')
-    compile 'com.android.support:appcompat-v7:27.1.1'
-    compile 'com.google.android.gms:play-services-ads:15.0.1'
-    compile project(':library')
+    implementation fileTree(include: '*.jar', dir: 'libs')
+    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.google.android.gms:play-services-ads:18.3.0'
+    implementation project(':library')
 }
 
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 29
     useLibrary 'org.apache.http.legacy'
     sourceSets {
         main {

diff --git a/sample/res/layout/activity_main.xml b/sample/res/layout/activity_main.xml
@@ -8,10 +8,9 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:background="@android:color/white"
         android:choiceMode="singleChoice"
         android:drawSelectorOnTop="true"
-        android:focusable="false"
+        android:focusable="true"
         android:gravity="center"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"

diff --git a/sample/res/layout/image_detail_pager.xml b/sample/res/layout/image_detail_pager.xml
@@ -15,9 +15,9 @@
   limitations under the License.
 -->
 
-<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.viewpager.widget.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/pager"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent" >
 
-</android.support.v4.view.ViewPager>
+</androidx.viewpager.widget.ViewPager>
diff --git a/sample/src/com/volley/demo/AboutActivity.java b/sample/src/com/volley/demo/AboutActivity.java
@@ -19,7 +19,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 

diff --git a/sample/src/com/volley/demo/ExampleCookies.java b/sample/src/com/volley/demo/ExampleCookies.java
@@ -25,7 +25,7 @@
 import org.apache.http.impl.cookie.BasicClientCookie;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
@@ -34,10 +34,10 @@
 import com.android.volley.Request.Method;
 import com.android.volley.RequestQueue;
 import com.android.volley.Response;
+import com.android.volley.Volley;
 import com.android.volley.error.VolleyError;
 import com.android.volley.request.StringRequest;
 import com.android.volley.toolbox.HttpClientStack;
-import com.android.volley.toolbox.Volley;
 
 
 /**

diff --git a/sample/src/com/volley/demo/ExampleGsonRequest.java b/sample/src/com/volley/demo/ExampleGsonRequest.java
@@ -17,7 +17,7 @@
 package com.volley.demo;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		android.enableJetifier=true
		android.useAndroidX=true