删除重复库

luhuanxml · Apr 17, 2017 · 1990334 · 1990334
1 parent 4c67e9f
commit 1990334
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'com.android.application'
-
+apply plugin: 'com.getkeepsafe.dexcount'
 android {
     compileSdkVersion 25
     buildToolsVersion "25.0.2"

diff --git a/app/src/main/java/com/luhuan/provider/MainActivity.java b/app/src/main/java/com/luhuan/provider/MainActivity.java
@@ -5,6 +5,7 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v7.widget.GridLayoutManager;
 import android.util.Log;
 import android.view.View;
@@ -30,12 +31,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import io.reactivex.annotations.NonNull;
 import io.reactivex.functions.Consumer;
 import timber.log.Timber;
 
-import static android.icu.lang.UCharacter.GraphemeClusterBreak.T;
-
 public class MainActivity extends Activity {
     XRecyclerView recyclerView;
     Banner banner;

diff --git a/build.gradle b/build.gradle
@@ -6,6 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/rxprovider/build.gradle b/rxprovider/build.gradle
@@ -28,11 +28,8 @@ dependencies {
     compile 'com.squareup.retrofit2:converter-scalars:2.2.0'
     compile 'com.squareup.retrofit2:converter-gson:2.2.0'
     compile 'com.squareup.retrofit2:adapter-rxjava2:2.2.0'
-    compile 'io.reactivex.rxjava2:rxjava:2.0.8'
     compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
     compile 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
-    compile 'com.google.code.gson:gson:2.8.0'
-    compile 'com.squareup.okhttp3:okhttp:3.6.0'
     compile 'com.squareup.okhttp3:logging-interceptor:3.6.0'
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.3@aar'

diff --git a/rxprovider/src/main/java/com/luhuan/rxprovider/DownLoadFile.java b/rxprovider/src/main/java/com/luhuan/rxprovider/DownLoadFile.java
@@ -1,6 +1,7 @@
 package com.luhuan.rxprovider;
 
 import android.os.Environment;
+import android.support.annotation.NonNull;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -10,7 +11,6 @@
 
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.annotations.NonNull;
 import io.reactivex.functions.Function;
 import io.reactivex.functions.Predicate;
 import io.reactivex.schedulers.Schedulers;

diff --git a/rxprovider/src/main/java/com/luhuan/rxprovider/Permission.java b/rxprovider/src/main/java/com/luhuan/rxprovider/Permission.java
@@ -1,13 +1,13 @@
 package com.luhuan.rxprovider;
 
 import android.app.Activity;
+import android.support.annotation.NonNull;
 
 import com.tbruyelle.rxpermissions2.RxPermissions;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableSource;
 import io.reactivex.ObservableTransformer;
-import io.reactivex.annotations.NonNull;
 import io.reactivex.functions.Predicate;
 
 /**

diff --git a/rxprovider/src/main/java/com/luhuan/rxprovider/RxCountDown.java b/rxprovider/src/main/java/com/luhuan/rxprovider/RxCountDown.java
@@ -1,10 +1,11 @@
 package com.luhuan.rxprovider;
 
+import android.support.annotation.NonNull;
+
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.annotations.NonNull;
 import io.reactivex.functions.Function;
 
 /**

diff --git a/rxprovider/src/main/java/com/luhuan/rxprovider/RxToast.java b/rxprovider/src/main/java/com/luhuan/rxprovider/RxToast.java
@@ -2,16 +2,13 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
 import android.widget.Toast;
 
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.annotations.NonNull;
 import io.reactivex.functions.Consumer;
-import io.reactivex.schedulers.Schedulers;
-
-import static android.os.Build.VERSION_CODES.N;
 
 /**
  * Created by Administrator on 2017/4/6 0006.

diff --git a/rxprovider/src/main/java/com/luhuan/rxprovider/RxTransform.java b/rxprovider/src/main/java/com/luhuan/rxprovider/RxTransform.java
@@ -1,13 +1,14 @@
 package com.luhuan.rxprovider;
 
+import android.support.annotation.NonNull;
+
 import io.reactivex.Observable;
 import io.reactivex.ObservableSource;
 import io.reactivex.ObservableTransformer;
 import io.reactivex.Single;
 import io.reactivex.SingleSource;
 import io.reactivex.SingleTransformer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.annotations.NonNull;
 import io.reactivex.schedulers.Schedulers;
 
 /**

diff --git a/rxprovider/src/main/java/com/luhuan/rxprovider/customview/recycler/RxAdapter.java b/rxprovider/src/main/java/com/luhuan/rxprovider/customview/recycler/RxAdapter.java
@@ -1,6 +1,7 @@
 package com.luhuan.rxprovider.customview.recycler;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.ViewGroup;
@@ -9,7 +10,6 @@
 
 import java.util.List;
 
-import io.reactivex.annotations.NonNull;
 import io.reactivex.functions.Consumer;
 import io.reactivex.functions.Predicate;