From 35a72d34c15f9581e9d34b6df903b437459f302c Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Tue, 14 Nov 2017 11:01:29 +0100 Subject: [PATCH] update libraries and try to work around build issues See https://github.com/tony19/logback-android/issues/73 --- app/build.gradle | 21 ++++++++++----------- build.gradle | 1 + 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c336df31c..d79a31494 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,9 +36,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - dexOptions { - preDexLibraries = System.getenv('TRAVIS_BUILD_NUMBER') ? true : false - } lintOptions { abortOnError ABORT_ON_CHECK_FAILURE @@ -67,14 +64,16 @@ dependencies { testCompile "org.robolectric:robolectric:3.3.2" compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:cardview-v7:25.3.1' - compile 'com.android.support:recyclerview-v7:25.3.1' - compile 'com.android.support:support-v4:25.3.1' - compile 'com.android.support:gridlayout-v7:25.3.1' - compile 'com.android.support:design:25.3.1' - compile 'com.android.support:palette-v7:25.3.1' - compile 'com.github.tony19:logback-android-classic:1.1.1-6' + compile 'com.android.support:appcompat-v7:25.4.0' + compile 'com.android.support:cardview-v7:25.4.0' + compile 'com.android.support:recyclerview-v7:25.4.0' + compile 'com.android.support:support-v4:25.4.0' + compile 'com.android.support:gridlayout-v7:25.4.0' + compile 'com.android.support:design:25.4.0' + compile 'com.android.support:palette-v7:25.4.0' + compile('com.github.tony19:logback-android-classic:1.1.1-6') { + exclude group: 'com.google.android', module: 'android' + } compile 'org.slf4j:slf4j-api:1.7.7' compile 'com.github.PhilJay:MPAndroidChart:v3.0.2' compile 'com.github.pfichtner:durationformatter:0.1.1' diff --git a/build.gradle b/build.gradle index 1426c3420..c41c322f1 100644 --- a/build.gradle +++ b/build.gradle @@ -19,5 +19,6 @@ allprojects { maven { url "https://jitpack.io" } + google() } }