From d53858f7d25972f5c707845f44d0c003f592737f Mon Sep 17 00:00:00 2001 From: Paul Hawke Date: Tue, 4 Jul 2017 14:14:17 -0500 Subject: [PATCH] Gentle version bump and added the dexcount gradle plugin --- app/build.gradle | 5 ++++- build.gradle | 1 + gradle.properties | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 567be9b70..c4794016e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.android.application' apply plugin: 'jacoco-android' apply from: 'quality.gradle' +apply plugin: 'com.getkeepsafe.dexcount' dependencies { compile 'com.github.nicolas-raoul:Quadtree:ac16ea8035bf07' @@ -13,10 +14,12 @@ dependencies { compile "com.android.support:support-v4:${project.supportLibVersion}" compile "com.android.support:appcompat-v7:${project.supportLibVersion}" compile "com.android.support:design:${project.supportLibVersion}" - compile 'com.google.code.gson:gson:2.7' + compile 'com.google.code.gson:gson:2.8.0' compile "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION" annotationProcessor "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION" compile 'com.jakewharton.timber:timber:4.5.1' + compile 'com.squareup.okhttp3:okhttp:3.8.1' + compile 'com.squareup.okio:okio:1.13.0' compile ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.0.2@aar'){ transitive=true } diff --git a/build.gradle b/build.gradle index aadbcc875..4929fec36 100644 --- a/build.gradle +++ b/build.gradle @@ -7,6 +7,7 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:${project.gradleVersion}" classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1' + classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.7.1' } } diff --git a/gradle.properties b/gradle.properties index b07acc3bb..aa730345f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ gradleVersion = 2.3.0 -supportLibVersion = 25.2.0 +supportLibVersion = 25.3.1 compileSdkVersion = android-25 buildToolsVersion = 25.0.1 @@ -12,6 +12,7 @@ targetSdkVersion = 23 android.useDeprecatedNdk=true # Library dependencies -BUTTERKNIFE_VERSION=8.4.0 +BUTTERKNIFE_VERSION=8.6.0 GUAVA_VERSION=19.0 +org.gradle.jvmargs=-Xmx1536M \ No newline at end of file