Skip to content

Commit

Permalink
Migrate to AndroidX (#251)
Browse files Browse the repository at this point in the history 
* add flags in gradle.properties for migrate to AndroidX
* migrate to AndroidX
* refactor gradle dependencies and third-party libraries version
* using testCompile than testImplementation
  • Loading branch information
@skydoves @jpd236
skydoves authored and jpd236 committed Mar 27, 2019
1 parent 95a6796 commit ddbc32c
Show file tree
Hide file tree
Showing 17 changed files with 29 additions and 30 deletions.
5 changes: 1 addition & 4 deletions build.gradle
View file
Expand Up @@ -38,10 +38,7 @@ apply plugin: 'com.android.library'

repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
google()
}

group = 'com.android.volley'
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
View file
@@ -0,0 +1,2 @@
android.enableJetifier=true
android.useAndroidX=true
10 changes: 5 additions & 5 deletions rules.gradle
View file
Expand Up @@ -20,15 +20,15 @@ tasks.withType(JavaCompile) {
}

dependencies {
provided "com.android.support:support-annotations:28.0.0"
implementation "androidx.annotation:annotation:1.0.1"
}

// Check if the android plugin version supports unit testing.
if (configurations.findByName("testCompile")) {
dependencies {
testCompile "junit:junit:4.12"
testCompile "org.hamcrest:hamcrest-library:1.3"
testCompile "org.mockito:mockito-core:2.2.29"
testCompile "org.robolectric:robolectric:3.0"
testCompile "junit:junit:4.12"
testCompile "org.hamcrest:hamcrest-library:1.3"
testCompile "org.mockito:mockito-core:2.19.0"
testCompile "org.robolectric:robolectric:3.4.2"
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/android/volley/CacheDispatcher.java
View file
Expand Up @@ -17,7 +17,7 @@
package com.android.volley;

import android.os.Process;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/android/volley/NetworkDispatcher.java
View file
Expand Up @@ -21,7 +21,7 @@
import android.os.Build;
import android.os.Process;
import android.os.SystemClock;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import java.util.concurrent.BlockingQueue;

/**
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/android/volley/Request.java
View file
Expand Up @@ -20,10 +20,10 @@
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
import android.support.annotation.CallSuper;
import android.support.annotation.GuardedBy;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import androidx.annotation.CallSuper;
import androidx.annotation.GuardedBy;
import androidx.annotation.Nullable;
import com.android.volley.VolleyLog.MarkerLog;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/android/volley/RequestQueue.java
View file
Expand Up @@ -18,7 +18,7 @@

import android.os.Handler;
import android.os.Looper;
import android.support.annotation.IntDef;
import androidx.annotation.IntDef;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/android/volley/toolbox/AndroidAuthenticator.java
View file
Expand Up @@ -23,7 +23,7 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import com.android.volley.AuthFailureError;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/android/volley/toolbox/DiskBasedCache.java
View file
Expand Up @@ -17,8 +17,8 @@
package com.android.volley.toolbox;

import android.os.SystemClock;
import android.support.annotation.VisibleForTesting;
import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import com.android.volley.Cache;
import com.android.volley.Header;
import com.android.volley.VolleyLog;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/android/volley/toolbox/HurlStack.java
View file
Expand Up @@ -16,7 +16,7 @@

package com.android.volley.toolbox;

import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import com.android.volley.AuthFailureError;
import com.android.volley.Header;
import com.android.volley.Request;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/android/volley/toolbox/ImageLoader.java
View file
Expand Up @@ -17,9 +17,9 @@
import android.graphics.Bitmap.Config;
import android.os.Handler;
import android.os.Looper;
import android.support.annotation.MainThread;
import android.widget.ImageView;
import android.widget.ImageView.ScaleType;
import androidx.annotation.MainThread;
import com.android.volley.Request;
import com.android.volley.RequestQueue;
import com.android.volley.Response.ErrorListener;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/android/volley/toolbox/ImageRequest.java
View file
Expand Up @@ -19,10 +19,10 @@
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
import android.graphics.BitmapFactory;
import android.support.annotation.GuardedBy;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import android.widget.ImageView.ScaleType;
import androidx.annotation.GuardedBy;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import com.android.volley.DefaultRetryPolicy;
import com.android.volley.NetworkResponse;
import com.android.volley.ParseError;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/android/volley/toolbox/JsonArrayRequest.java
View file
Expand Up @@ -16,7 +16,7 @@

package com.android.volley.toolbox;

import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.android.volley.NetworkResponse;
import com.android.volley.ParseError;
import com.android.volley.Response;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/android/volley/toolbox/JsonObjectRequest.java
View file
Expand Up @@ -16,7 +16,7 @@

package com.android.volley.toolbox;

import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.android.volley.NetworkResponse;
import com.android.volley.ParseError;
import com.android.volley.Response;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/android/volley/toolbox/JsonRequest.java
View file
Expand Up @@ -16,8 +16,8 @@

package com.android.volley.toolbox;

import android.support.annotation.GuardedBy;
import android.support.annotation.Nullable;
import androidx.annotation.GuardedBy;
import androidx.annotation.Nullable;
import com.android.volley.NetworkResponse;
import com.android.volley.Request;
import com.android.volley.Response;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/android/volley/toolbox/NetworkImageView.java
View file
Expand Up @@ -15,12 +15,12 @@

import android.content.Context;
import android.graphics.Bitmap;
import android.support.annotation.MainThread;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.ViewGroup.LayoutParams;
import android.widget.ImageView;
import androidx.annotation.MainThread;
import androidx.annotation.Nullable;
import com.android.volley.VolleyError;
import com.android.volley.toolbox.ImageLoader.ImageContainer;
import com.android.volley.toolbox.ImageLoader.ImageListener;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/android/volley/toolbox/StringRequest.java
View file
Expand Up @@ -16,8 +16,8 @@

package com.android.volley.toolbox;

import android.support.annotation.GuardedBy;
import android.support.annotation.Nullable;
import androidx.annotation.GuardedBy;
import androidx.annotation.Nullable;
import com.android.volley.NetworkResponse;
import com.android.volley.Request;
import com.android.volley.Response;
Expand Down

0 comments on commit ddbc32c

Please sign in to comment.