Fix Gradle-project based unit tests

First, this updates the unit test runner which loads and builds the
Gradle unit test projects such that it searches through the build.gradle
files in the project and replaces older dependencies (of the Gradle
plugin, and of the buildToolsVersion) with the minimum requirements.
This means that we don't have to go and update all the unit test
projects every time we rev the requirements.

It will also insert a custom Maven URL if set via the android.mavenRepoUrl
system property, which lets you run unit tests against a dev version
of the Android plugin.

Finally I did update the various metadata files manually since we've
gotten rid of the packageName methods; this avoids build warnings
about APIs going away. While I was at it I bumped the versions too;
this isn't necessary given that the project loader above will replace
them on the fly, but since I've changed the schema I thought it best
to make the projects directly loadable in Studio as well.

Change-Id: Ib88437ed8a7ade540d3f5b6705984f423c63d924

18 files changed, 45 insertions, 45 deletions

diff --git a/android/testData/projects/moduleInfo/both/build.gradle b/android/testData/projects/moduleInfo/both/build.gradle
index e421501a800..6c1e76f958b 100644
--- a/android/testData/projects/moduleInfo/both/build.gradle
+++ b/android/testData/projects/moduleInfo/both/build.gradle
@@ -3,19 +3,19 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.10.+'
+    classpath 'com.android.tools.build:gradle:0.11.+'
   }
 }
 apply plugin: 'android'
 
 android {
   compileSdkVersion 18
-  buildToolsVersion "19.0.0"
+  buildToolsVersion "19.1.0"
 
   defaultConfig {
     minSdkVersion 9
     targetSdkVersion 17
-    packageName "from.gradle"
+    applicationId "from.gradle"
   }
 }
 
diff --git a/android/testData/projects/moduleInfo/flavors/build.gradle b/android/testData/projects/moduleInfo/flavors/build.gradle
index 16c0fdb2751..cb98ef78acd 100644
--- a/android/testData/projects/moduleInfo/flavors/build.gradle
+++ b/android/testData/projects/moduleInfo/flavors/build.gradle
@@ -3,7 +3,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.10.+'
+    classpath 'com.android.tools.build:gradle:0.11.+'
   }
 }
 apply plugin: 'android'
@@ -14,30 +14,30 @@ repositories {
 
 android {
   compileSdkVersion 18
-  buildToolsVersion "19.0.0"
+  buildToolsVersion "19.1.0"
 
   defaultConfig {
     minSdkVersion 9
     targetSdkVersion 17
-    packageName "from.gradle"
+    applicationId "from.gradle"
   }
 
   buildTypes {
     debug {
-      packageNameSuffix ".debug"
+      applicationIdSuffix ".debug"
       buildConfigField "boolean", "DEBUG2", "false"
     }
   }
 
   productFlavors {
     pro {
-      packageName "com.example.pro"
+      applicationId "com.example.pro"
       versionCode 20
       flavorGroup "version"
     }
 
     free {
-      packageName "com.example.free"
+      applicationId "com.example.free"
       minSdkVersion 14
       flavorGroup "version"
     }
diff --git a/android/testData/projects/moduleInfo/gradleOnly/build.gradle b/android/testData/projects/moduleInfo/gradleOnly/build.gradle
index 68ff637c4f2..075eb1cbd4d 100644
--- a/android/testData/projects/moduleInfo/gradleOnly/build.gradle
+++ b/android/testData/projects/moduleInfo/gradleOnly/build.gradle
@@ -3,7 +3,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.10.+'
+    classpath 'com.android.tools.build:gradle:0.11.+'
   }
 }
 apply plugin: 'android'
@@ -14,11 +14,11 @@ repositories {
 
 android {
   compileSdkVersion 18
-  buildToolsVersion "19.0.0"
+  buildToolsVersion "19.1.0"
 
   defaultConfig {
     minSdkVersion 9
     targetSdkVersion 17
-    packageName "from.gradle"
+    applicationId "from.gradle"
   }
 }
diff --git a/android/testData/projects/moduleInfo/manifestOnly/build.gradle b/android/testData/projects/moduleInfo/manifestOnly/build.gradle
index f88b5ef4cb8..1d8aaebf523 100644
--- a/android/testData/projects/moduleInfo/manifestOnly/build.gradle
+++ b/android/testData/projects/moduleInfo/manifestOnly/build.gradle
@@ -3,7 +3,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.10.+'
+    classpath 'com.android.tools.build:gradle:0.11.+'
   }
 }
 apply plugin: 'android'
@@ -14,7 +14,7 @@ repositories {
 
 android {
   compileSdkVersion 18
-  buildToolsVersion "19.0.0"
+  buildToolsVersion "19.1.0"
 
   defaultConfig {
   }
diff --git a/android/testData/projects/moduleInfo/merge/build.gradle b/android/testData/projects/moduleInfo/merge/build.gradle
index 34053b1d8c0..9c1784c2016 100644
--- a/android/testData/projects/moduleInfo/merge/build.gradle
+++ b/android/testData/projects/moduleInfo/merge/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.10.+'
+    classpath 'com.android.tools.build:gradle:0.11.+'
   }
 }
 apply plugin: 'android'
@@ -29,17 +29,17 @@ repositories {
 
 android {
   compileSdkVersion 18
-  buildToolsVersion "19.0.0"
+  buildToolsVersion "19.1.0"
 
   defaultConfig {
     minSdkVersion 9
     targetSdkVersion 17
-    packageName "from.gradle"
+    applicationId "from.gradle"
   }
 
   buildTypes {
     debug {
-      packageNameSuffix ".debug"
+      applicationIdSuffix ".debug"
       buildConfigField "boolean", "DEBUG2", "false"
     }
   }
diff --git a/android/testData/projects/navigator/packageview/simple/app/build.gradle b/android/testData/projects/navigator/packageview/simple/app/build.gradle
index 38700df2104..d3e9f48603e 100644
--- a/android/testData/projects/navigator/packageview/simple/app/build.gradle
+++ b/android/testData/projects/navigator/packageview/simple/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 19
-    buildToolsVersion '19.0.3'
+    buildToolsVersion '19.1.0'
 
     defaultConfig {
         minSdkVersion 14
@@ -15,4 +15,4 @@ android {
 dependencies {
     compile 'com.android.support:appcompat-v7:+'
     compile fileTree(dir: 'libs', include: ['*.jar'])
-}
\ No newline at end of file
+}
diff --git a/android/testData/projects/navigator/packageview/simple/lib/build.gradle b/android/testData/projects/navigator/packageview/simple/lib/build.gradle
index 25bb26d1431..f9f3a0ff2cd 100644
--- a/android/testData/projects/navigator/packageview/simple/lib/build.gradle
+++ b/android/testData/projects/navigator/packageview/simple/lib/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "19.0.3"
+    buildToolsVersion "19.1.0"
 
     defaultConfig {
         minSdkVersion 9
diff --git a/android/testData/projects/projectWithAppandLib/app/build.gradle b/android/testData/projects/projectWithAppandLib/app/build.gradle
index 25b6e12a095..674d6f70262 100644
--- a/android/testData/projects/projectWithAppandLib/app/build.gradle
+++ b/android/testData/projects/projectWithAppandLib/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.0.1"
+    buildToolsVersion "19.1.0"
 
     defaultConfig {
         minSdkVersion 8
@@ -18,10 +18,10 @@ android {
     }
     productFlavors {
         basic {
-          packageName "com.example.projectwithappandlib.app"
+          applicationId "com.example.projectwithappandlib.app"
         }
         paid {
-            packageName "com.example.projectwithappandlib.app.paid"
+            applicationId "com.example.projectwithappandlib.app.paid"
         }
     }
 }
diff --git a/android/testData/projects/projectWithAppandLib/build.gradle b/android/testData/projects/projectWithAppandLib/build.gradle
index 347504f63ca..4c8f6d8b90c 100644
--- a/android/testData/projects/projectWithAppandLib/build.gradle
+++ b/android/testData/projects/projectWithAppandLib/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.10.+'
+        classpath 'com.android.tools.build:gradle:0.11.+'
     }
 }
 
diff --git a/android/testData/projects/projectWithAppandLib/lib/build.gradle b/android/testData/projects/projectWithAppandLib/lib/build.gradle
index 75db87c22bd..85221ae861e 100644
--- a/android/testData/projects/projectWithAppandLib/lib/build.gradle
+++ b/android/testData/projects/projectWithAppandLib/lib/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "19.0.1"
+    buildToolsVersion "19.1.0"
 
     defaultConfig {
         minSdkVersion 8
diff --git a/android/testData/projects/resolve/simple/build.gradle b/android/testData/projects/resolve/simple/build.gradle
index 4903239b827..cfdb66e83ff 100644
--- a/android/testData/projects/resolve/simple/build.gradle
+++ b/android/testData/projects/resolve/simple/build.gradle
@@ -3,7 +3,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.10.+'
+    classpath 'com.android.tools.build:gradle:0.11.+'
   }
 }
 apply plugin: 'android'
@@ -14,7 +14,7 @@ repositories {
 
 android {
   compileSdkVersion 18
-  buildToolsVersion "19.0.0"
+  buildToolsVersion "19.1.0"
 
   defaultConfig {
     minSdkVersion 8
@@ -29,7 +29,7 @@ android {
 
   productFlavors {
     flavor1 {
-      packageName "com.example.flavor1"
+      applicationId "com.example.flavor1"
     }
   }
 
diff --git a/android/testData/projects/resolve/simple/completion/comp.gradle b/android/testData/projects/resolve/simple/completion/comp.gradle
index eaf1644857a..bee76efbf11 100644
--- a/android/testData/projects/resolve/simple/completion/comp.gradle
+++ b/android/testData/projects/resolve/simple/completion/comp.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.10.+'
+    classpath 'com.android.tools.build:gradle:0.11.+'
   }
 }
 apply plugin: 'android'
diff --git a/android/testData/projects/resolve/simple/completion/ndk.gradle b/android/testData/projects/resolve/simple/completion/ndk.gradle
index 941c7df5b7f..a01b4b3a118 100644
--- a/android/testData/projects/resolve/simple/completion/ndk.gradle
+++ b/android/testData/projects/resolve/simple/completion/ndk.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.10.+'
+    classpath 'com.android.tools.build:gradle:0.11.+'
   }
 }
 apply plugin: 'android'
diff --git a/android/testData/projects/resolve/simple/completion/suffix.gradle b/android/testData/projects/resolve/simple/completion/suffix.gradle
index 9bb14e73444..822c4b39eeb 100644
--- a/android/testData/projects/resolve/simple/completion/suffix.gradle
+++ b/android/testData/projects/resolve/simple/completion/suffix.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.10.+'
+    classpath 'com.android.tools.build:gradle:0.11.+'
   }
 }
 apply plugin: 'android'
diff --git a/android/testData/projects/resolve/simple/lib.gradle b/android/testData/projects/resolve/simple/lib.gradle
index a2dd66ded35..3d35ef80f52 100644
--- a/android/testData/projects/resolve/simple/lib.gradle
+++ b/android/testData/projects/resolve/simple/lib.gradle
@@ -3,7 +3,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.10.+'
+    classpath 'com.android.tools.build:gradle:0.11.+'
   }
 }
 apply plugin: 'android-library'
diff --git a/android/testData/projects/runConfig/activity/build.gradle b/android/testData/projects/runConfig/activity/build.gradle
index 899479a9a88..fa8ac2dd769 100644
--- a/android/testData/projects/runConfig/activity/build.gradle
+++ b/android/testData/projects/runConfig/activity/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.10.+'
+    classpath 'com.android.tools.build:gradle:0.11.+'
   }
 }
 apply plugin: 'android'
@@ -29,17 +29,17 @@ repositories {
 
 android {
   compileSdkVersion 18
-  buildToolsVersion "19.0.0"
+  buildToolsVersion "19.1.0"
 
   defaultConfig {
     minSdkVersion 9
     targetSdkVersion 17
-    packageName "from.gradle"
+    applicationId "from.gradle"
   }
 
   buildTypes {
     debug {
-      packageNameSuffix ".debug"
+      applicationIdSuffix ".debug"
     }
   }
 }
diff --git a/android/testData/projects/runConfig/alias/build.gradle b/android/testData/projects/runConfig/alias/build.gradle
index 899479a9a88..fa8ac2dd769 100644
--- a/android/testData/projects/runConfig/alias/build.gradle
+++ b/android/testData/projects/runConfig/alias/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.10.+'
+    classpath 'com.android.tools.build:gradle:0.11.+'
   }
 }
 apply plugin: 'android'
@@ -29,17 +29,17 @@ repositories {
 
 android {
   compileSdkVersion 18
-  buildToolsVersion "19.0.0"
+  buildToolsVersion "19.1.0"
 
   defaultConfig {
     minSdkVersion 9
     targetSdkVersion 17
-    packageName "from.gradle"
+    applicationId "from.gradle"
   }
 
   buildTypes {
     debug {
-      packageNameSuffix ".debug"
+      applicationIdSuffix ".debug"
     }
   }
 }
diff --git a/android/testData/projects/runConfig/default/build.gradle b/android/testData/projects/runConfig/default/build.gradle
index 899479a9a88..fa8ac2dd769 100644
--- a/android/testData/projects/runConfig/default/build.gradle
+++ b/android/testData/projects/runConfig/default/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.10.+'
+    classpath 'com.android.tools.build:gradle:0.11.+'
   }
 }
 apply plugin: 'android'
@@ -29,17 +29,17 @@ repositories {
 
 android {
   compileSdkVersion 18
-  buildToolsVersion "19.0.0"
+  buildToolsVersion "19.1.0"
 
   defaultConfig {
     minSdkVersion 9
     targetSdkVersion 17
-    packageName "from.gradle"
+    applicationId "from.gradle"
   }
 
   buildTypes {
     debug {
-      packageNameSuffix ".debug"
+      applicationIdSuffix ".debug"
     }
   }
 }