diff --git a/app/build.gradle b/app/build.gradle index 6243f744..b23a516a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -86,7 +86,16 @@ android { } } - +configurations.all { + resolutionStrategy.eachDependency { details -> + def requested = details.requested + if (requested.group == 'com.android.support') { + if (!requested.name.startsWith("multidex")) { + details.useVersion '25.4.0' + } + } + } +} repositories { maven { url "https://jitpack.io" } google() @@ -101,7 +110,7 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) testImplementation 'junit:junit:4.12' - + implementation 'com.android.support:multidex:1.0.1' // compile "com.android.support:support-annotations:${ANDROID_SUPPORT_VERSION}" implementation "com.android.support:support-v4:${ANDROID_SUPPORT_VERSION}" diff --git a/app/src/main/java/com/thirtydegreesray/openhub/AppApplication.java b/app/src/main/java/com/thirtydegreesray/openhub/AppApplication.java index e58a9fac..d4340d74 100644 --- a/app/src/main/java/com/thirtydegreesray/openhub/AppApplication.java +++ b/app/src/main/java/com/thirtydegreesray/openhub/AppApplication.java @@ -9,6 +9,7 @@ import android.content.pm.PackageManager; import android.net.ConnectivityManager; import android.os.Build; +import android.support.multidex.MultiDex; import com.orhanobut.logger.AndroidLogAdapter; import com.orhanobut.logger.Logger; @@ -41,7 +42,7 @@ public class AppApplication extends Application { @Override protected void attachBaseContext(Context base) { super.attachBaseContext(base); -// MultiDex.install(this); + MultiDex.install(this); } @Override diff --git a/build.gradle b/build.gradle index c969c927..977ceacd 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.3.1' classpath 'com.novoda:gradle-build-properties-plugin:0.3' } } diff --git a/gradle.properties b/gradle.properties index e0a0ab77..e602b71f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -44,7 +44,7 @@ FASTJSON_VERSION=1.1.46.android GLIDE_VERSION=4.0.0 ROUNDED_IMAGEVIEW_VERSION=2.3.0 CIRCLE_IMAGEVIEW_VERSION=2.1.0 -TOASTY_VERSION = 1.2.5 +TOASTY_VERSION = 1.4.0 MATERIAL_ABOUT_VERSION = 2.2.1 SUBMIT_BUTTON_VERSION = 1.1.2 MATERIAL_DIALOG_VERSION = 0.9.4.5 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b577e43b..49dd6955 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip