From ec434a5497642ecbce0cbae114bb682e98665143 Mon Sep 17 00:00:00 2001 From: Matthias Kaeppler Date: Sat, 7 Jun 2014 16:40:39 +0200 Subject: [PATCH] Bump build tools to 19.1 and android plugin to 0.11 This is to make the project compatible with Studio 0.6.x --- rxjava-contrib/rxjava-android-samples/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- rxjava-contrib/rxjava-android-samples/samples/build.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rxjava-contrib/rxjava-android-samples/build.gradle b/rxjava-contrib/rxjava-android-samples/build.gradle index 0ba4fcdb79..47786d4ee6 100644 --- a/rxjava-contrib/rxjava-android-samples/build.gradle +++ b/rxjava-contrib/rxjava-android-samples/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.9.+' + classpath 'com.android.tools.build:gradle:0.11.+' } } diff --git a/rxjava-contrib/rxjava-android-samples/gradle/wrapper/gradle-wrapper.properties b/rxjava-contrib/rxjava-android-samples/gradle/wrapper/gradle-wrapper.properties index acc117c91f..0830e23fd9 100644 --- a/rxjava-contrib/rxjava-android-samples/gradle/wrapper/gradle-wrapper.properties +++ b/rxjava-contrib/rxjava-android-samples/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Apr 05 11:18:06 CEST 2014 +#Sat Jun 07 16:12: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-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/rxjava-contrib/rxjava-android-samples/samples/build.gradle b/rxjava-contrib/rxjava-android-samples/samples/build.gradle index 9a080128a8..fb177b35d9 100644 --- a/rxjava-contrib/rxjava-android-samples/samples/build.gradle +++ b/rxjava-contrib/rxjava-android-samples/samples/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'android' android { compileSdkVersion 19 - buildToolsVersion "19.0.0" + buildToolsVersion "19.1.0" defaultConfig { minSdkVersion 14