Data binding as studio dep + java6

This CL gets rid of the gradle plugin and instead provides
DataBindingBuilder for the gradle plugin to directly use.

Now, everything that is deployed via SDK Manager (lib and adapters)
are included as prebuilts so that we avoid accidently changing
them w/o an SDK manager release.

There is still work to do:
> re-enable proguard for externel dependencies
> release a batch to ensure everything works

Bug: 22516688
Change-Id: I83ace15bd6d3d23bf5b4ad850f36453dd23ebd43

9 files changed, 38 insertions, 32 deletions

diff --git a/integration-tests/App With Spaces/app/build.gradle b/integration-tests/App With Spaces/app/build.gradle
index 88a44e83..15d5165b 100644
--- a/integration-tests/App With Spaces/app/build.gradle
+++ b/integration-tests/App With Spaces/app/build.gradle
@@ -15,11 +15,10 @@
  */
 
 apply plugin: 'com.android.application'
-apply plugin: 'com.android.databinding'
 
 android {
-    compileSdkVersion config.compileSdkVersion
-    buildToolsVersion config.buildToolsVersion
+    compileSdkVersion dataBindingConfig.compileSdkVersion
+    buildToolsVersion dataBindingConfig.buildToolsVersion
 
     defaultConfig {
         applicationId "com.android.databinding.appwithspaces"
@@ -28,6 +27,9 @@ android {
         versionCode 1
         versionName "1.0"
     }
+    dataBinding {
+        enabled = true
+    }
     buildTypes {
         release {
             minifyEnabled false
diff --git a/integration-tests/App With Spaces/build.gradle b/integration-tests/App With Spaces/build.gradle
index b13840ab..53e677e9 100644
--- a/integration-tests/App With Spaces/build.gradle
+++ b/integration-tests/App With Spaces/build.gradle
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 buildscript {
-    ext.rootFolder = new File(project.projectDir, "../..")
+    ext.dataBindingRootFolder = new File(project.projectDir, "../..")
     apply from: "${project.projectDir}/../../propLoader.gradle"
     ext.addRepos(repositories)
     dependencies {
-        classpath "com.android.tools.build:gradle:${config.androidPluginVersion}"
-        classpath "com.android.databinding:dataBinder:${config.version}"
+        classpath "com.android.tools.build:gradle:${dataBindingConfig.androidPluginVersion}"
     }
 }
diff --git a/integration-tests/IndependentLibrary/app/build.gradle b/integration-tests/IndependentLibrary/app/build.gradle
index ab2b979f..90d7328c 100644
--- a/integration-tests/IndependentLibrary/app/build.gradle
+++ b/integration-tests/IndependentLibrary/app/build.gradle
@@ -14,11 +14,10 @@
  */
 apply plugin: 'maven'
 apply plugin: 'com.android.library'
-apply plugin: 'com.android.databinding'
 
 android {
-    compileSdkVersion config.compileSdkVersion
-    buildToolsVersion config.buildToolsVersion
+    compileSdkVersion dataBindingConfig.compileSdkVersion
+    buildToolsVersion dataBindingConfig.buildToolsVersion
 
     defaultConfig {
         minSdkVersion 7
@@ -26,6 +25,9 @@ android {
         versionCode 1
         versionName "1.0"
     }
+    dataBinding {
+        enabled = true
+    }
     buildTypes {
         release {
             minifyEnabled false
@@ -47,10 +49,10 @@ dependencies {
 uploadArchives {
     repositories {
         mavenDeployer {
-            repository(url: "file://${config.mavenRepoDir}")
+            repository(url: "file://${dataBindingConfig.mavenRepoDir}")
             pom.artifactId = 'independent-library'
-            pom.version = config.version
-            pom.groupId = config.testGroup
+            pom.version = dataBindingConfig.version
+            pom.groupId = dataBindingConfig.testGroup
         }
     }
 }
diff --git a/integration-tests/IndependentLibrary/build.gradle b/integration-tests/IndependentLibrary/build.gradle
index db36a5bc..ca2e97c5 100644
--- a/integration-tests/IndependentLibrary/build.gradle
+++ b/integration-tests/IndependentLibrary/build.gradle
@@ -14,11 +14,10 @@
  */
 
 buildscript {
-    ext.rootFolder = new File(project.projectDir, "../..")
+    ext.dataBindingRootFolder = new File(project.projectDir, "../..")
     apply from: "${project.projectDir}/../../propLoader.gradle"
     ext.addRepos(repositories)
     dependencies {
-        classpath "com.android.tools.build:gradle:${config.androidPluginVersion}"
-        classpath "com.android.databinding:dataBinder:${config.version}"
+        classpath "com.android.tools.build:gradle:${dataBindingConfig.androidPluginVersion}"
     }
 }
\ No newline at end of file
diff --git a/integration-tests/MultiModuleTestApp/app/build.gradle b/integration-tests/MultiModuleTestApp/app/build.gradle
index 4ecc1ff9..261a902b 100644
--- a/integration-tests/MultiModuleTestApp/app/build.gradle
+++ b/integration-tests/MultiModuleTestApp/app/build.gradle
@@ -15,11 +15,10 @@
  */
 
 apply plugin: 'com.android.application'
-apply plugin: 'com.android.databinding'
 
 android {
-    compileSdkVersion config.compileSdkVersion
-    buildToolsVersion config.buildToolsVersion
+    compileSdkVersion dataBindingConfig.compileSdkVersion
+    buildToolsVersion dataBindingConfig.buildToolsVersion
 
     defaultConfig {
         applicationId "com.android.databinding.multimoduletestapp"
@@ -28,6 +27,9 @@ android {
         versionCode 1
         versionName "1.0"
     }
+    dataBinding {
+        enabled = true
+    }
     buildTypes {
         release {
             minifyEnabled false
@@ -42,10 +44,10 @@ android {
     }
 }
 
-println "combined ${config.testGroup}.independent-library:${config.version}"
+println "combined ${dataBindingConfig.testGroup}.independent-library:${dataBindingConfig.version}"
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':testlibrary')
     compile "com.android.support:support-v4:+"
-    compile "${config.testGroup}:independent-library:${config.version}"
+    compile "${dataBindingConfig.testGroup}:independent-library:${dataBindingConfig.version}"
 }
diff --git a/integration-tests/MultiModuleTestApp/build.gradle b/integration-tests/MultiModuleTestApp/build.gradle
index 5e5a3e23..7dc5032a 100644
--- a/integration-tests/MultiModuleTestApp/build.gradle
+++ b/integration-tests/MultiModuleTestApp/build.gradle
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 buildscript {
-    ext.rootFolder = new File(project.projectDir, "../..")
+    ext.dataBindingRootFolder = new File(project.projectDir, "../..")
     apply from: "${project.projectDir}/../../propLoader.gradle"
     ext.addRepos(repositories)
     dependencies {
-        classpath "com.android.tools.build:gradle:${config.androidPluginVersion}"
-        classpath "com.android.databinding:dataBinder:${config.version}"
+        classpath "com.android.tools.build:gradle:${dataBindingConfig.androidPluginVersion}"
     }
 }
\ No newline at end of file
diff --git a/integration-tests/MultiModuleTestApp/testlibrary/build.gradle b/integration-tests/MultiModuleTestApp/testlibrary/build.gradle
index 71ff29f1..d1bde4db 100644
--- a/integration-tests/MultiModuleTestApp/testlibrary/build.gradle
+++ b/integration-tests/MultiModuleTestApp/testlibrary/build.gradle
@@ -15,11 +15,10 @@
  */
 
 apply plugin: 'com.android.library'
-apply plugin: 'com.android.databinding'
 
 android {
-    compileSdkVersion config.compileSdkVersion
-    buildToolsVersion config.buildToolsVersion
+    compileSdkVersion dataBindingConfig.compileSdkVersion
+    buildToolsVersion dataBindingConfig.buildToolsVersion
 
     defaultConfig {
         minSdkVersion 7
@@ -27,6 +26,9 @@ android {
         versionCode 1
         versionName "1.0"
     }
+    dataBinding {
+        enabled = true
+    }
     buildTypes {
         release {
             minifyEnabled false
diff --git a/integration-tests/TestApp/app/build.gradle b/integration-tests/TestApp/app/build.gradle
index b96ba2ad..0981966f 100644
--- a/integration-tests/TestApp/app/build.gradle
+++ b/integration-tests/TestApp/app/build.gradle
@@ -1,9 +1,8 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.android.databinding'
 
 android {
-    compileSdkVersion config.compileSdkVersion
-    buildToolsVersion config.buildToolsVersion
+    compileSdkVersion dataBindingConfig.compileSdkVersion
+    buildToolsVersion dataBindingConfig.buildToolsVersion
 
     defaultConfig {
         applicationId "com.android.databinding.testapp"
@@ -12,6 +11,9 @@ android {
         versionCode 1
         versionName "1.0"
     }
+    dataBinding {
+        enabled = true
+    }
     buildTypes {
         release {
             minifyEnabled false
diff --git a/integration-tests/TestApp/build.gradle b/integration-tests/TestApp/build.gradle
index c15f7f59..35f8e950 100644
--- a/integration-tests/TestApp/build.gradle
+++ b/integration-tests/TestApp/build.gradle
@@ -1,9 +1,8 @@
 buildscript {
-    ext.rootFolder = new File(project.projectDir, "../..")
+    ext.dataBindingRootFolder = new File(project.projectDir, "../..")
     apply from: "${project.projectDir}/../../propLoader.gradle"
     ext.addRepos(repositories)
     dependencies {
-        classpath "com.android.tools.build:gradle:${config.androidPluginVersion}"
-        classpath "com.android.databinding:dataBinder:${config.version}"
+        classpath "com.android.tools.build:gradle:${dataBindingConfig.androidPluginVersion}"
     }
 }