From 582a744b3bdb16ab41628b430d54d27b88b79ed8 Mon Sep 17 00:00:00 2001 From: jddeep Date: Sun, 27 Oct 2019 08:18:52 +0530 Subject: [PATCH] Updating project configs and fixing build fails --- app/build.gradle | 22 +++++++++++----------- build.gradle | 10 +++++++++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 05d512d..4f49dc6 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 26 + buildToolsVersion "28.0.3" defaultConfig { applicationId "com.codingblocks.shortlr" minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -20,14 +20,14 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.3.0' - compile 'com.squareup.retrofit2:retrofit:+' - compile 'com.android.support:cardview-v7:25.3.0' - compile 'com.squareup.retrofit2:converter-gson:+' - compile 'com.android.support:palette-v7:25.3.0' - testCompile 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'com.squareup.retrofit2:retrofit:2.6.2' + implementation 'com.android.support:cardview-v7:26.1.0' + implementation 'com.squareup.retrofit2:converter-gson:2.6.2' + implementation 'com.android.support:palette-v7:26.1.0' + implementation 'junit:junit:4.12' } diff --git a/build.gradle b/build.gradle index b78a0b8..e40a7ba 100755 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,13 @@ buildscript { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:3.3.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +19,10 @@ buildscript { allprojects { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5933f1c..d57d0e9 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Apr 15 14:00:16 IST 2017 +#Sun Oct 27 07:54:52 IST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip