From 0b3679aef3ed47a4b0ddda33f6849973a0b419a1 Mon Sep 17 00:00:00 2001 From: Mark Murphy Date: Tue, 18 Feb 2014 13:44:15 -0500 Subject: [PATCH] updated to new Gradle for Android plugin --- Gradle/ConstantsSecure/build.gradle | 4 ++-- Gradle/Hello/build.gradle | 4 ++-- Gradle/HelloAIDL/Client/build.gradle | 4 ++-- Gradle/HelloAIDL/Service/build.gradle | 4 ++-- Gradle/HelloAIDL/build.gradle | 2 +- Gradle/HelloBuildConfig/build.gradle | 9 +++------ Gradle/HelloBuildType/build.gradle | 4 ++-- Gradle/HelloConfig/build.gradle | 4 ++-- Gradle/HelloInstrumentTest/build.gradle | 4 ++-- .../HelloMultiProject/HelloLibraryConsumer/build.gradle | 4 ++-- .../libraries/HelloLibrary/build.gradle | 4 ++-- Gradle/HelloNestedResources/build.gradle | 2 +- Gradle/HelloNew/build.gradle | 4 ++-- Gradle/HelloProductFlavors/build.gradle | 4 ++-- Gradle/HelloProperties/Client/build.gradle | 2 +- Gradle/HelloProperties/Service/build.gradle | 2 +- Gradle/HelloProperties/build.gradle | 2 +- Gradle/HelloVersioning/build.gradle | 4 ++-- 18 files changed, 32 insertions(+), 35 deletions(-) diff --git a/Gradle/ConstantsSecure/build.gradle b/Gradle/ConstantsSecure/build.gradle index 7d3bbf1c5..ef87c16de 100644 --- a/Gradle/ConstantsSecure/build.gradle +++ b/Gradle/ConstantsSecure/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } @@ -15,6 +15,6 @@ dependencies { android { compileSdkVersion 18 - buildToolsVersion "18.1.0" + buildToolsVersion "19.0.1" } diff --git a/Gradle/Hello/build.gradle b/Gradle/Hello/build.gradle index 3d83207f8..5f983feb2 100644 --- a/Gradle/Hello/build.gradle +++ b/Gradle/Hello/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } apply plugin: 'android' @@ -14,7 +14,7 @@ dependencies { android { compileSdkVersion 18 - buildToolsVersion "18.1.0" + buildToolsVersion "19.0.1" sourceSets { main { diff --git a/Gradle/HelloAIDL/Client/build.gradle b/Gradle/HelloAIDL/Client/build.gradle index 839cee4c0..a45c80d9d 100644 --- a/Gradle/HelloAIDL/Client/build.gradle +++ b/Gradle/HelloAIDL/Client/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } @@ -15,7 +15,7 @@ dependencies { android { compileSdkVersion 18 - buildToolsVersion "18.1.0" + buildToolsVersion "19.0.1" sourceSets { main { diff --git a/Gradle/HelloAIDL/Service/build.gradle b/Gradle/HelloAIDL/Service/build.gradle index 839cee4c0..a45c80d9d 100644 --- a/Gradle/HelloAIDL/Service/build.gradle +++ b/Gradle/HelloAIDL/Service/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } @@ -15,7 +15,7 @@ dependencies { android { compileSdkVersion 18 - buildToolsVersion "18.1.0" + buildToolsVersion "19.0.1" sourceSets { main { diff --git a/Gradle/HelloAIDL/build.gradle b/Gradle/HelloAIDL/build.gradle index 0b97f2691..b21ef0cf7 100644 --- a/Gradle/HelloAIDL/build.gradle +++ b/Gradle/HelloAIDL/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } diff --git a/Gradle/HelloBuildConfig/build.gradle b/Gradle/HelloBuildConfig/build.gradle index d92bf46b4..6501915c3 100644 --- a/Gradle/HelloBuildConfig/build.gradle +++ b/Gradle/HelloBuildConfig/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } @@ -15,7 +15,7 @@ dependencies { android { compileSdkVersion 18 - buildToolsVersion "18.1.0" + buildToolsVersion "19.0.1" defaultConfig { versionCode 2 @@ -42,6 +42,7 @@ android { release { signingConfig signingConfigs.release + buildConfigField "String", "SERVER_URL", '"http://prod.this-is-so-fake.com"' } mezzanine.initWith(buildTypes.release) @@ -52,10 +53,6 @@ android { signingConfig signingConfigs.release buildConfigField "String", "SERVER_URL", '"http://stage.this-is-so-fake.com"' } - - release { - buildConfigField "String", "SERVER_URL", '"http://prod.this-is-so-fake.com"' - } } } diff --git a/Gradle/HelloBuildType/build.gradle b/Gradle/HelloBuildType/build.gradle index 65d33b3af..771f4f0d5 100644 --- a/Gradle/HelloBuildType/build.gradle +++ b/Gradle/HelloBuildType/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } @@ -15,7 +15,7 @@ dependencies { android { compileSdkVersion 18 - buildToolsVersion "18.1.0" + buildToolsVersion "19.0.1" defaultConfig { versionCode 2 diff --git a/Gradle/HelloConfig/build.gradle b/Gradle/HelloConfig/build.gradle index c4a5b009e..827126ee3 100644 --- a/Gradle/HelloConfig/build.gradle +++ b/Gradle/HelloConfig/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } @@ -15,7 +15,7 @@ dependencies { android { compileSdkVersion 18 - buildToolsVersion "18.1.0" + buildToolsVersion "19.0.1" defaultConfig { versionCode 2 diff --git a/Gradle/HelloInstrumentTest/build.gradle b/Gradle/HelloInstrumentTest/build.gradle index 7b7b4fb8c..215beb807 100644 --- a/Gradle/HelloInstrumentTest/build.gradle +++ b/Gradle/HelloInstrumentTest/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } @@ -15,7 +15,7 @@ dependencies { android { compileSdkVersion 18 - buildToolsVersion "18.1.0" + buildToolsVersion "19.0.1" defaultConfig { testPackageName "com.commonsware.android.gradle.hello.test" diff --git a/Gradle/HelloMultiProject/HelloLibraryConsumer/build.gradle b/Gradle/HelloMultiProject/HelloLibraryConsumer/build.gradle index 822401db5..addb2f550 100644 --- a/Gradle/HelloMultiProject/HelloLibraryConsumer/build.gradle +++ b/Gradle/HelloMultiProject/HelloLibraryConsumer/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } @@ -16,6 +16,6 @@ dependencies { android { compileSdkVersion 18 - buildToolsVersion "18.1.0" + buildToolsVersion "19.0.1" } diff --git a/Gradle/HelloMultiProject/libraries/HelloLibrary/build.gradle b/Gradle/HelloMultiProject/libraries/HelloLibrary/build.gradle index 8d80bcb5d..3dc2eb7e2 100644 --- a/Gradle/HelloMultiProject/libraries/HelloLibrary/build.gradle +++ b/Gradle/HelloMultiProject/libraries/HelloLibrary/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } @@ -11,6 +11,6 @@ apply plugin: 'android-library' android { compileSdkVersion 18 - buildToolsVersion "18.1.0" + buildToolsVersion "19.0.1" } diff --git a/Gradle/HelloNestedResources/build.gradle b/Gradle/HelloNestedResources/build.gradle index ac8376ab8..ef87c16de 100644 --- a/Gradle/HelloNestedResources/build.gradle +++ b/Gradle/HelloNestedResources/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } diff --git a/Gradle/HelloNew/build.gradle b/Gradle/HelloNew/build.gradle index 7d3bbf1c5..ef87c16de 100644 --- a/Gradle/HelloNew/build.gradle +++ b/Gradle/HelloNew/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } @@ -15,6 +15,6 @@ dependencies { android { compileSdkVersion 18 - buildToolsVersion "18.1.0" + buildToolsVersion "19.0.1" } diff --git a/Gradle/HelloProductFlavors/build.gradle b/Gradle/HelloProductFlavors/build.gradle index fbc6aa83d..97681afd6 100644 --- a/Gradle/HelloProductFlavors/build.gradle +++ b/Gradle/HelloProductFlavors/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } @@ -15,7 +15,7 @@ dependencies { android { compileSdkVersion 18 - buildToolsVersion "18.1.0" + buildToolsVersion "19.0.1" defaultConfig { versionCode 2 diff --git a/Gradle/HelloProperties/Client/build.gradle b/Gradle/HelloProperties/Client/build.gradle index 80b94ac0d..2094d110e 100644 --- a/Gradle/HelloProperties/Client/build.gradle +++ b/Gradle/HelloProperties/Client/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } diff --git a/Gradle/HelloProperties/Service/build.gradle b/Gradle/HelloProperties/Service/build.gradle index 80b94ac0d..2094d110e 100644 --- a/Gradle/HelloProperties/Service/build.gradle +++ b/Gradle/HelloProperties/Service/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } diff --git a/Gradle/HelloProperties/build.gradle b/Gradle/HelloProperties/build.gradle index 5555be205..630b3e0d0 100644 --- a/Gradle/HelloProperties/build.gradle +++ b/Gradle/HelloProperties/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } diff --git a/Gradle/HelloVersioning/build.gradle b/Gradle/HelloVersioning/build.gradle index 9f470c092..a79a6c4ca 100644 --- a/Gradle/HelloVersioning/build.gradle +++ b/Gradle/HelloVersioning/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:0.8.+' } } @@ -15,7 +15,7 @@ dependencies { android { compileSdkVersion 18 - buildToolsVersion "18.1.0" + buildToolsVersion "19.0.1" def versionPropsFile = file('version.properties')