From b1a53c0e9c566d29e66b722ed60005679d803aad Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 21 Nov 2017 16:22:08 +0100 Subject: [PATCH] updating Commons --- app/build.gradle | 33 ++++++++++----------------------- build.gradle | 9 +++++++-- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 38604d2c2..c856902ca 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,32 +47,19 @@ ext { } dependencies { - compile 'com.simplemobiletools:commons:2.39.10' - compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.8.0' - compile 'com.theartofdev.edmodo:android-image-cropper:2.4.0' - compile 'com.android.support:multidex:1.0.2' - compile 'com.google.code.gson:gson:2.8.2' - compile 'it.sephiroth.android.exif:library:1.0.1' - compile 'pl.droidsonroids.gif:android-gif-drawable:1.2.8' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'com.simplemobiletools:commons:2.41.5' + implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.8.0' + implementation 'com.theartofdev.edmodo:android-image-cropper:2.4.0' + implementation 'com.android.support:multidex:1.0.2' + implementation 'com.google.code.gson:gson:2.8.2' + implementation 'it.sephiroth.android.exif:library:1.0.1' + implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.8' - debugCompile "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion" - releaseCompile "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion" + debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion" + releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion" } -buildscript { - ext.kotlin_version = '1.1.60' - repositories { - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version" - } -} - -def Properties props = new Properties() +Properties props = new Properties() def propFile = new File('signing.properties') if (propFile.canRead()) { props.load(new FileInputStream(propFile)) diff --git a/build.gradle b/build.gradle index 8c22f1119..60b648170 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,16 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + ext.kotlin_version = '1.1.60' + repositories { jcenter() + google() } + dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:3.0.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,8 +20,8 @@ buildscript { allprojects { repositories { jcenter() + google() maven { url "https://jitpack.io" } - maven { url "https://maven.google.com" } } }