From 8c3586f6a0f2a155c298602529e495e01fea1f38 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 21 Aug 2017 09:32:55 +0200 Subject: [PATCH] updgrade gradle plugin --- .travis.yml | 1 - build.gradle | 7 +++++-- libs/MemorizingTrustManager/build.gradle | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca6bcd5ab..f395eb317 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ android: - tools - build-tools-26.0.1 - android-25 - - extra-android-m2repository - extra-google-m2repository - extra-google-google_play_services licenses: diff --git a/build.gradle b/build.gradle index 52dac5379..f1d553ada 100644 --- a/build.gradle +++ b/build.gradle @@ -4,9 +4,12 @@ buildscript { repositories { jcenter() mavenCentral() + maven { + url 'https://maven.google.com' + } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:2.3.3' } } @@ -42,7 +45,7 @@ dependencies { compile 'com.makeramen:roundedimageview:2.3.0' compile "com.wefika:flowlayout:0.4.1" compile 'net.ypresto.androidtranscoder:android-transcoder:0.2.0' - compile ('com.vdurmont:emoji-java:3.3.0') { + compile('com.vdurmont:emoji-java:3.3.0') { exclude group: 'org.json', module: 'json' } } diff --git a/libs/MemorizingTrustManager/build.gradle b/libs/MemorizingTrustManager/build.gradle index f10883553..5fbcd8f83 100644 --- a/libs/MemorizingTrustManager/build.gradle +++ b/libs/MemorizingTrustManager/build.gradle @@ -2,6 +2,7 @@ buildscript { repositories { mavenCentral() } + dependencies { classpath 'com.android.tools.build:gradle:2.3.0' } -- 2.45.2