From 493d25a5aa4f7bcf2be51bb19609d2d98cd74d25 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Wed, 3 Jan 2018 12:48:03 +0200 Subject: [PATCH] Updated versions of support lib, gradle etc --- app/build.gradle | 10 +++++----- build.gradle | 6 ++++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- materialhelptutorial/build.gradle | 20 ++++++++++---------- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2b12065..3f2b062 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 - buildToolsVersion "24.0.2" + compileSdkVersion 27 + buildToolsVersion "27.0.3" defaultConfig { applicationId "za.co.riggaroo.helptut.helptutorialexample" - minSdkVersion 11 - targetSdkVersion 24 + minSdkVersion 14 + targetSdkVersion 27 versionCode 1 versionName "1.0" } @@ -23,5 +23,5 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' compile project(':materialhelptutorial') - compile 'com.android.support:appcompat-v7:24.2.1' + compile 'com.android.support:appcompat-v7:27.0.2' } diff --git a/build.gradle b/build.gradle index a0ab9e2..79b3d02 100644 --- a/build.gradle +++ b/build.gradle @@ -3,10 +3,11 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.1' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7' + classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -16,6 +17,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 380e3c7..83e685a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Oct 09 10:46:48 SAST 2016 +#Wed Jan 03 12:39:22 SAST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/materialhelptutorial/build.gradle b/materialhelptutorial/build.gradle index e2eb28d..0118b18 100644 --- a/materialhelptutorial/build.gradle +++ b/materialhelptutorial/build.gradle @@ -2,20 +2,20 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' -version = "1.4.0" +version = "1.5.0" group = "za.co.riggaroo" -def siteUrl = 'https://github.com/spongebobrf/MaterialIntroTutorial' -def gitUrl = 'https://github.com/spongebobrf/MaterialIntroTutorial.git' +def siteUrl = 'https://github.com/riggaroo/MaterialIntroTutorial' +def gitUrl = 'https://github.com/riggaroo/MaterialIntroTutorial.git' android { - compileSdkVersion 24 - buildToolsVersion "24.0.2" + compileSdkVersion 27 + buildToolsVersion "27.0.3" defaultConfig { - minSdkVersion 11 - targetSdkVersion 24 - versionCode 9 + minSdkVersion 14 + targetSdkVersion 27 + versionCode 10 versionName version } buildTypes { @@ -27,14 +27,14 @@ android { } dependencies { - final SUPPORT_LIBRARY_VERSION = '24.2.1' + final SUPPORT_LIBRARY_VERSION = '27.0.2' compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION" compile "com.android.support:percent:$SUPPORT_LIBRARY_VERSION" compile "com.android.support:support-annotations:$SUPPORT_LIBRARY_VERSION" - compile 'com.github.bumptech.glide:glide:3.7.0' + compile 'com.github.bumptech.glide:glide:3.8.0' }