diff options
author | Yigit Boyar <yboyar@google.com> | 2015-07-15 15:32:35 -0700 |
---|---|---|
committer | Yigit Boyar <yboyar@google.com> | 2015-07-15 15:33:09 -0700 |
commit | 9c95c40e44e4ed885ad4266485853db2aee033c2 (patch) | |
tree | a8ecde54faa43f4b244e118817e070f8777bedf1 | |
parent | d4b096e3df6753c71c0c6a31c487298e8bb22da0 (diff) | |
download | data-binding-9c95c40e44e4ed885ad4266485853db2aee033c2.tar.gz |
Use aar to release base adapters.
This CL updates android gradle dependency to 1.3.0-beta4 which brings
support for provided aar dependencies. Taking advantage of it, now base
adapters release an AAR instead of a Jar w/o any hacks.
Bug: 22491107
Change-Id: I18fdd75de806aa507504b34a18c030ee25133b4d
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | databinding.properties | 2 | ||||
-rw-r--r-- | extensions/baseAdapters/build.gradle | 41 | ||||
-rw-r--r-- | gradlePlugin/src/main/java/android/databinding/tool/DataBinderPlugin.java | 2 |
4 files changed, 9 insertions, 37 deletions
@@ -2,3 +2,4 @@ build local.properties .gradle maven-repo +.caches diff --git a/databinding.properties b/databinding.properties index 00367196..2a8a107c 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 diff --git a/extensions/baseAdapters/build.gradle b/extensions/baseAdapters/build.gradle index 04390efd..9450d42f 100644 --- a/extensions/baseAdapters/build.gradle +++ b/extensions/baseAdapters/build.gradle @@ -43,15 +43,9 @@ android { } 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 @@ android.libraryVariants.all { variant -> 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 @@ android.libraryVariants.all { variant -> 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 @@ uploadJarArchives { } } -uploadArchives.dependsOn uploadJarArchives + task prebuild(type : Copy) { dependsOn uploadArchives from "$buildDir/outputs/aar/baseAdapters-release.aar" diff --git a/gradlePlugin/src/main/java/android/databinding/tool/DataBinderPlugin.java b/gradlePlugin/src/main/java/android/databinding/tool/DataBinderPlugin.java index 22e10563..a116dc13 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 @@ public class DataBinderPlugin implements Plugin<Project> { 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, |