Merge "Move to using Android Gradle Plugin 3.0.0-alpha4" into oc-support-26.0-dev
diff --git a/buildSrc/dependencies.gradle b/buildSrc/dependencies.gradle
index c71f344..a58b1d0 100644
--- a/buildSrc/dependencies.gradle
+++ b/buildSrc/dependencies.gradle
@@ -33,7 +33,7 @@
libs.gradle = 'com.android.tools.build:gradle:' + androidPluginVersionOverride
} else {
// Keep gradle plugin version in sync with ub_supportlib-master manifest.
- libs.gradle = 'com.android.tools.build:gradle:2.4.0-alpha6'
+ libs.gradle = 'com.android.tools.build:gradle:3.0.0-alpha4'
}
// Other dependencies
diff --git a/buildSrc/diff_and_docs.gradle b/buildSrc/diff_and_docs.gradle
index 47fcefc..8cfc91b 100644
--- a/buildSrc/diff_and_docs.gradle
+++ b/buildSrc/diff_and_docs.gradle
@@ -440,7 +440,7 @@
fileTree(releaseVariant.aidlCompile.sourceOutputDir) +
fileTree(releaseVariant.outputs[0].processResources.sourceOutputDir)
}
- task.classpath += files{releaseVariant.javaCompile.classpath.files} +
+ task.classpath += releaseVariant.getCompileClasspath(null) +
files(releaseVariant.javaCompile.destinationDir)
}
diff --git a/buildSrc/init.gradle b/buildSrc/init.gradle
index 4e66dc8..2cde002 100644
--- a/buildSrc/init.gradle
+++ b/buildSrc/init.gradle
@@ -281,9 +281,10 @@
task.doLast {
def source = testApk ? project.android.sourceSets.androidTest
: project.android.sourceSets.main
- if (task.hasProperty("outputFile") && !source.java.sourceFiles.isEmpty()) {
+ if (task.hasProperty("outputDirectory") && !source.java.sourceFiles.isEmpty()) {
copy {
- from(task.outputFile)
+ from(task.outputDirectory)
+ include '*.apk'
into(rootProject.ext.testApkDistOut)
rename { String fileName ->
// multiple modules may have the same name so prefix the name with