commit 1638535d6211a53187422aab94792fee85abca0c
author Sergey Vasilinets <sergeyv@google.com> Wed Dec 13 16:56:47 2017 -0800
committer Sergey Vasilinets <sergeyv@google.com> Thu Dec 14 16:10:54 2017 -0800
tree b58ccd6e7bfaea4ef3c1261dd7c92d7323c634e6
parent df29dd08b4501bac562af88f109401bdd6d9b79b

Improve DiffAndDocs

- Move GenerateDocsTasks to separate file
- Pass DacOptions explicitly
- Make Regex static

Test: ./gradlew generateDocs
Change-Id: I4c29e5cf99ed3ebc175530636391a4aec3990ba6

buildSrc/init.gradle

diff --git a/buildSrc/init.gradle b/buildSrc/init.gradle
index cc1c11c..d47d5e8 100644
--- a/buildSrc/init.gradle
+++ b/buildSrc/init.gradle
@@ -15,7 +15,6 @@
  */
 
 
-import android.support.DacOptions
 import android.support.DiffAndDocs
 import android.support.gmaven.GMavenVersionChecker
 import com.android.build.gradle.internal.coverage.JacocoPlugin
@@ -36,9 +35,8 @@
 
 apply from: "${supportRoot}/buildSrc/dependencies.gradle"
 apply from: "${supportRoot}/buildSrc/build_dependencies.gradle"
-ext.docsDac = new DacOptions("android/support", "SUPPORT_DATA")
 
-def enableDoclavaAndJDiff(p) {
+def enableDoclavaAndJDiff(p, dacOptions) {
     p.configurations {
         doclava
         jdiff
@@ -50,7 +48,8 @@
         jdiff build_libs.xml_parser_apis
         jdiff build_libs.xerces_impl
     }
-    DiffAndDocs.configureDiffAndDocs(rootProject, createArchive, supportRootFolder)
+    def allChecks = DiffAndDocs.configureDiffAndDocs(rootProject, supportRootFolder, dacOptions)
+    createArchive.dependsOn(allChecks)
 }
 
 def getFullSdkPath() {