From a8fac033aa7b7390740a1a4534621b8e27e7546d Mon Sep 17 00:00:00 2001 From: gabrielemariotti Date: Sat, 14 Jun 2014 23:40:06 +0200 Subject: [PATCH] Updated gradle 1.12, gradle-plugin 0.11, build-tools 19.1.0 for AS 0.6.x #190 --- .travis.yml | 6 +++--- build.gradle | 4 ++-- demo/extras/build.gradle | 2 +- demo/stock/build.gradle | 6 +++--- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library-extra/build.gradle | 2 +- library/build.gradle | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index a3fcfb85..935b0f58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,8 @@ before_install: - export TERM=dumb # newer version of gradle - # - wget http://services.gradle.org/distributions/gradle-1.11-bin.zip - # - unzip -qq gradle-1.11-bin.zip + # - wget http://services.gradle.org/distributions/gradle-1.12-bin.zip + # - unzip -qq gradle-1.12-bin.zip # - export GRADLE_HOME=$PWD/gradle-1.11 # - export PATH=$GRADLE_HOME/bin:$PATH @@ -51,7 +51,7 @@ before_install: # Install required components. # For a full list, run `android list sdk -a --extended` - echo yes | android update sdk --filter platform-tools --no-ui --force > /dev/null - - echo yes | android update sdk --all --filter build-tools-19.0.3 --no-ui --force > /dev/null + - echo yes | android update sdk --all --filter build-tools-19.1.0 --no-ui --force > /dev/null - echo yes | android update sdk --filter android-19 --no-ui --force > /dev/null - echo yes | android update sdk --filter extra-android-support --no-ui --force > /dev/null - echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null diff --git a/build.gradle b/build.gradle index 36625c5c..7b477736 100644 --- a/build.gradle +++ b/build.gradle @@ -5,14 +5,14 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.10.+' + classpath 'com.android.tools.build:gradle:0.11.+' classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.10.+' } } ext { compileSdkVersion = 19 - buildToolsVersion = "19.0.3" + buildToolsVersion = "19.1.0" } def isReleaseBuild() { diff --git a/demo/extras/build.gradle b/demo/extras/build.gradle index 5892c555..5fa82a0a 100644 --- a/demo/extras/build.gradle +++ b/demo/extras/build.gradle @@ -28,7 +28,7 @@ android { } debug { - packageNameSuffix ".debug" + applicationIdSuffix ".debug" versionNameSuffix "-debug" } } diff --git a/demo/stock/build.gradle b/demo/stock/build.gradle index eb336d83..b4ecf3bb 100644 --- a/demo/stock/build.gradle +++ b/demo/stock/build.gradle @@ -15,7 +15,7 @@ android { versionName project.VERSION_NAME versionCode Integer.parseInt(project.VERSION_CODE) - testInstrumentationRunner "com.google.android.apps.common.testing.testrunner.GoogleInstrumentationTestRunner" + //testInstrumentationRunner "com.google.android.apps.common.testing.testrunner.GoogleInstrumentationTestRunner" } signingConfigs { @@ -30,7 +30,7 @@ android { } debug { - packageNameSuffix ".debug" + applicationIdSuffix ".debug" versionNameSuffix "-debug" } } @@ -47,7 +47,7 @@ dependencies { // Support Libraries compile 'com.android.support:support-v4:19.1.0' - androidTestCompile 'com.jakewharton.espresso:espresso:1.1-r2' + //androidTestCompile 'com.jakewharton.espresso:espresso:1.1-r2' } diff --git a/gradle.properties b/gradle.properties index e6d76105..7cf652f9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=1.7.1-SNAPSHOT +VERSION_NAME=1.7.2-SNAPSHOT VERSION_CODE=32 GROUP=com.github.gabrielemariotti.cards diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a26acf81..441963e1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jan 29 22:27:25 CET 2014 +#Sat Jun 14 20:21:40 CEST 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/library-extra/build.gradle b/library-extra/build.gradle index b01c2f22..1ee68003 100644 --- a/library-extra/build.gradle +++ b/library-extra/build.gradle @@ -32,4 +32,4 @@ dependencies { } // Used to update in Maven -//apply from: '../maven_push.gradle' \ No newline at end of file +apply from: '../maven_push.gradle' \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index e3b87840..9fc85678 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -26,4 +26,4 @@ dependencies { } // Used to update in Maven -//apply from: '../maven_push.gradle' \ No newline at end of file +apply from: '../maven_push.gradle' \ No newline at end of file