commit a1642a36a8c462e02016acaef66a40a79aba3dfe
author Yigit Boyar <yboyar@google.com> Thu Jul 16 00:24:30 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 16 00:24:30 2015 +0000
tree 17381fed574704fa69f89dad6b21372a5d1bc68c
parent 999a46723cb5e87316c1c0f3361751fd461b0e37
parent 9c95c40e44e4ed885ad4266485853db2aee033c2

Merge "Use aar to release base adapters." into mnc-dev

.gitignore

diff --git a/.gitignore b/.gitignore
index 5b1b439..448ab8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 local.properties
 .gradle
 maven-repo
+.caches

databinding.properties

diff --git a/databinding.properties b/databinding.properties
index 0036719..2a8a107 100644
--- a/databinding.properties
+++ b/databinding.properties
@@ -2,7 +2,7 @@
 kotlinVersion = 0.12.613
 version = 1.0-rc2-SNAPSHOT
 releaseVersion = 1.0-rc2-SNAPSHOT
-androidPluginVersion = 1.2.3
+androidPluginVersion = 1.3.0-beta4
 javaTargetCompatibility = 1.7
 javaSourceCompatibility = 1.7
 

extensions/baseAdapters/build.gradle

diff --git a/extensions/baseAdapters/build.gradle b/extensions/baseAdapters/build.gradle
index 04390ef..9450d42 100644
--- a/extensions/baseAdapters/build.gradle
+++ b/extensions/baseAdapters/build.gradle
@@ -43,15 +43,9 @@
 }
 
 dependencies {
-    // TODO make these provided when gradle build supports them
-    // see: https://code.google.com/p/android/issues/detail?id=149268
-    compile 'com.android.support:support-v4:+'
-    compile 'com.android.support:cardview-v7:+'
-    compile 'com.android.support:appcompat-v7:+'
-}
-
-configurations {
-    jarArchives
+    provided 'com.android.support:support-v4:+'
+    provided 'com.android.support:cardview-v7:+'
+    provided 'com.android.support:appcompat-v7:+'
 }
 
 //create jar tasks
@@ -62,25 +56,9 @@
         return; // Skip debug builds.
     }
     def suffix = name.capitalize()
-    // @Jar version is needed to run compiler tests
-    def jarTask = project.tasks.create "jar${suffix}", Jar
-    jarTask.dependsOn variant.javaCompile
-    jarTask.from variant.javaCompile.destinationDir
-    def packageName = "com.android.databinding.library.baseAdapters"
-    def appPkgAsClass = packageName.replace('.', '/')
-    jarTask.exclude("android/databinding/layouts/*.*")
-    jarTask.exclude("$appPkgAsClass/databinding/*")
-    jarTask.exclude("$appPkgAsClass/BR.*")
-    jarTask.exclude("android/databinding/DataBindingComponent.*")
-    artifacts.add('jarArchives', jarTask);
 
     def javadocTask = project.tasks.create(name: "javadoc${suffix}", type: Javadoc) {
         source variant.javaCompile.source
-        exclude("android/databinding/layouts/*.*")
-        exclude("$appPkgAsClass/databinding/*")
-        exclude("$appPkgAsClass/BR.*")
-        exclude("$appPkgAsClass/R.*")
-        exclude("$appPkgAsClass/BuildConfig.*")
         classpath = files(variant.javaCompile.classpath.files) + files(
                 "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar")
     }
@@ -96,22 +74,15 @@
         from android.sourceSets.main.java.srcDirs
     }
 
-    artifacts.add('jarArchives', javadocJarTask);
-    artifacts.add('jarArchives', sourcesJarTask);
+    artifacts.add('archives', javadocJarTask);
+    artifacts.add('archives', sourcesJarTask);
 }
 
 uploadArchives {
-}
-
-uploadJarArchives {
     repositories {
         mavenDeployer {
             repository(url: "file://${config.mavenRepoDir}")
             pom.artifactId = "adapters"
-            pom.whenConfigured {
-                println("configured pom, $it")
-                it.dependencies.clear()
-            }
             pom.project {
                 licenses {
                     license {
@@ -125,7 +96,7 @@
     }
 }
 
-uploadArchives.dependsOn uploadJarArchives
+
 task prebuild(type : Copy) {
     dependsOn uploadArchives
     from "$buildDir/outputs/aar/baseAdapters-release.aar"

gradlePlugin/src/main/java/android/databinding/tool/DataBinderPlugin.java

diff --git a/gradlePlugin/src/main/java/android/databinding/tool/DataBinderPlugin.java b/gradlePlugin/src/main/java/android/databinding/tool/DataBinderPlugin.java
index 22e1056..a116dc1 100644
--- a/gradlePlugin/src/main/java/android/databinding/tool/DataBinderPlugin.java
+++ b/gradlePlugin/src/main/java/android/databinding/tool/DataBinderPlugin.java
@@ -346,7 +346,7 @@
             String removeGeneratedTaskName = "dataBindingExcludeGeneratedFrom" +
                     StringUtils.capitalize(packageTask.getName());
             if (project.getTasks().findByName(removeGeneratedTaskName) == null) {
-                final AbstractCompile javaCompileTask = variantData.javaCompileTask;
+                final AbstractCompile javaCompileTask = variantData.javacTask;
                 Preconditions.checkNotNull(javaCompileTask);
 
                 project.getTasks().create(removeGeneratedTaskName,