diff options
| author | George Mount <mount@google.com> | 2017-03-07 13:36:29 -0800 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2017-03-09 08:41:34 -0800 |
| commit | b4410d3df327c27337003f58b858d1493b1cc4f4 (patch) | |
| tree | 783815a0c6c0a2d0165074cecce9bb03bf8123c8 /extensions | |
| parent | 72ae3355f9ba51f8d9034cedf61d4d2173d5f464 (diff) | |
| download | data-binding-b4410d3df327c27337003f58b858d1493b1cc4f4.tar.gz | |
Fix building extensions
Test: compiled extensions
Change-Id: I81b73b318d120d0b4d38283b825e8f4a07a749e0
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/baseAdapters/build.gradle | 6 | ||||
| -rw-r--r-- | extensions/library/build.gradle | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/extensions/baseAdapters/build.gradle b/extensions/baseAdapters/build.gradle index ed82bb25..5eb56c4b 100644 --- a/extensions/baseAdapters/build.gradle +++ b/extensions/baseAdapters/build.gradle @@ -55,9 +55,9 @@ android { dependencies { // we don't care about version of these because they are not listed as dependencies in the // final maven artifact. - provided 'com.android.support:core-utils:+' - provided 'com.android.support:cardview-v7:+' - provided 'com.android.support:appcompat-v7:+' + provided 'com.android.support:support-core-utils:24.2.0' + provided 'com.android.support:cardview-v7:24.2.0' + provided 'com.android.support:appcompat-v7:24.2.0' } //create jar tasks diff --git a/extensions/library/build.gradle b/extensions/library/build.gradle index b924d173..188a9abd 100644 --- a/extensions/library/build.gradle +++ b/extensions/library/build.gradle @@ -87,6 +87,12 @@ android.libraryVariants.all { variant -> options.tags = ['hide'] classpath = files(variant.javaCompile.classpath.files) + files( "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar") + doFirst { + // There appears to be someone overwriting the classpath. + // This is disgusting, but it works: + classpath = files(variant.javaCompile.classpath.files) + files( + "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar") + } } def javadocJarTask = project.tasks.create(name: "javadocJar${suffix}", type: Jar) { |