Use v2.5.0

JessYanCoding · Nov 13, 2018 · 1ba6ae7 · 1ba6ae7
1 parent 24019ca
commit 1ba6ae7
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -68,9 +68,14 @@ dependencies {
     }
     implementation rootProject.ext.dependencies["paginate"]
     //arms
-    implementation project(':arms')
+//    implementation project(':arms')
     //Github 仓库上最新的 Demo 具有下一个版本的新特性, 所以依赖最新的远程库会出现版本不兼容的情况, 详情请查看 https://github.com/JessYanCoding/MVPArms/wiki/Issues#2
-//    implementation 'me.jessyan:arms:2.4.1'
+    //关于以下扩展库的详细说明请查看 https://github.com/JessYanCoding/MVPArms/blob/master/demo/build.gradle
+    implementation 'me.jessyan:arms:2.5.0'
+    implementation 'me.jessyan:arms-autolayout:2.5.0'
+    implementation 'me.jessyan:arms-imageloader-glide:2.5.0'
+    implementation rootProject.ext.dependencies["androideventbus"]
+
     //test
     testImplementation rootProject.ext.dependencies["junit"]
     debugImplementation rootProject.ext.dependencies["canary-debug"]

diff --git a/app/src/main/java/me/jessyan/mvparms/demo/app/GlobalConfiguration.java b/app/src/main/java/me/jessyan/mvparms/demo/app/GlobalConfiguration.java
@@ -23,6 +23,7 @@
 
 import com.jess.arms.base.delegate.AppLifecycles;
 import com.jess.arms.di.module.GlobalConfigModule;
+import com.jess.arms.http.imageloader.glide.GlideImageLoaderStrategy;
 import com.jess.arms.http.log.RequestInterceptor;
 import com.jess.arms.integration.ConfigModule;
 import com.jess.arms.utils.ArmsUtils;
@@ -59,6 +60,7 @@ public void applyOptions(Context context, GlobalConfigModule.Builder builder) {
         }
 
         builder.baseurl(Api.APP_DOMAIN)
+                .imageLoaderStrategy(new GlideImageLoaderStrategy())
                 //强烈建议自己自定义图片加载逻辑,因为默认提供的 GlideImageLoaderStrategy 并不能满足复杂的需求
                 //请参考 https://github.com/JessYanCoding/MVPArms/wiki#3.4
 //                .imageLoaderStrategy(new CustomLoaderStrategy())

diff --git a/app/src/main/java/me/jessyan/mvparms/demo/di/module/UserModule.java b/app/src/main/java/me/jessyan/mvparms/demo/di/module/UserModule.java
@@ -15,6 +15,7 @@
  */
 package me.jessyan.mvparms.demo.di.module;
 
+import android.support.v4.app.FragmentActivity;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 
@@ -69,7 +70,7 @@ UserContract.Model provideUserModel(UserModel model) {
     @ActivityScope
     @Provides
     RxPermissions provideRxPermissions() {
-        return new RxPermissions(view.getActivity());
+        return new RxPermissions((FragmentActivity) view.getActivity());
     }
 
     @ActivityScope

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         //Gradle Android Maven plugin
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         //Gradle Bintray Plugin

diff --git a/config.gradle b/config.gradle
@@ -1,16 +1,16 @@
 ext {
 
     android = [
-               compileSdkVersion       : 27,
-               buildToolsVersion       : "27.0.3",
+               compileSdkVersion       : 28,
+               buildToolsVersion       : "28.0.3",
                minSdkVersion           : 14,
-               targetSdkVersion        : 27,
+               targetSdkVersion        : 28,
                versionCode             : 156,
                versionName             : "2.4.1"
     ]
 
      version = [
-                   androidSupportSdkVersion: "27.1.0",
+                   androidSupportSdkVersion: "28.0.0",
                    retrofitSdkVersion      : "2.4.0",
                    dagger2SdkVersion       : "2.15",
                    glideSdkVersion         : "4.6.1",

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Oct 30 14:12:28 CST 2017
+#Tue Nov 13 17:37:02 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip