From 871bd08ad42a834def9c883b93ad67c596b7aeb4 Mon Sep 17 00:00:00 2001 From: Vinay Gaba Date: Sat, 22 Apr 2017 14:10:13 -0700 Subject: [PATCH] Upgraded gradle (#1) * Upgraded gradle * Updated .gitignore * Updated android plugin for gradle version --- .gitignore | 62 +++++++++++++++++++++--- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- library/build.gradle | 10 ++-- sample/build.gradle | 10 ++-- 5 files changed, 68 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 9c4de58..f23280a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,55 @@ -.gradle -/local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store -/build -/captures +# Built application files +*.apk +*.ap_ + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# Intellij +*.iml +.idea/workspace.xml +.idea/tasks.xml +.idea/gradle.xml +.idea/dictionaries +.idea/libraries + +# Keystore files +*.jks + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild + +# Google Services (e.g. APIs or Firebase) +google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json \ No newline at end of file diff --git a/build.gradle b/build.gradle index 9405f3f..072e693 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.android.tools.build:gradle:2.3.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 48b78ce..c631715 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jul 08 00:45:47 IST 2015 +#Sat Apr 22 13:17:08 PDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index 4961a3b..da2db91 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 22 - buildToolsVersion "22.0.1" + compileSdkVersion 25 + buildToolsVersion "25.0.2" defaultConfig { - minSdkVersion 8 - targetSdkVersion 22 + minSdkVersion 9 + targetSdkVersion 25 versionCode 1 versionName "1.0" } @@ -20,5 +20,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:22.2.0' + compile 'com.android.support:appcompat-v7:25.3.0' } diff --git a/sample/build.gradle b/sample/build.gradle index 271f24c..0ba5abe 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 22 - buildToolsVersion "22.0.1" + compileSdkVersion 25 + buildToolsVersion "25.0.2" defaultConfig { applicationId "com.vinaygaba.sample" - minSdkVersion 8 - targetSdkVersion 22 + minSdkVersion 9 + targetSdkVersion 25 versionCode 1 versionName "1.0" } @@ -21,6 +21,6 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:22.2.0' + compile 'com.android.support:appcompat-v7:25.3.0' compile project(':library') }