Merge "Move to using Doclava and Jdiff as composite builds." into oc-support-26.1-dev
diff --git a/buildSrc/init.gradle b/buildSrc/init.gradle
index c3dc6a4..f5149c0 100644
--- a/buildSrc/init.gradle
+++ b/buildSrc/init.gradle
@@ -49,8 +49,8 @@
}
p.dependencies {
- doclava project(':doclava')
- jdiff project(':jdiff')
+ doclava "com.android:doclava:1.0.6"
+ jdiff "com.android:jdiff:1.1.0"
jdiff libs.xml_parser_apis
jdiff libs.xerces_impl
}
@@ -150,9 +150,7 @@
repos.addMavenRepositories(repositories)
// Only modify Android projects.
- if (project.name.equals('doclava')
- || project.name.equals('jdiff')
- || project.name.equals('support-testutils')
+ if (project.name.equals('support-testutils')
|| project.name.equals('noto-emoji-compat')) {
// disable tests and return
project.tasks.whenTaskAdded { task ->
diff --git a/settings.gradle b/settings.gradle
index ffc34ee..892a7ef 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -170,11 +170,9 @@
File externalRoot = new File(rootDir, '../../external')
-include ':doclava'
-project(':doclava').projectDir = new File(externalRoot, 'doclava')
+includeBuild new File(externalRoot, 'doclava')
-include ':jdiff'
-project(':jdiff').projectDir = new File(externalRoot, 'jdiff')
+includeBuild new File(externalRoot, 'jdiff')
include ':noto-emoji-compat'
project(':noto-emoji-compat').projectDir = new File(externalRoot, 'noto-fonts/emoji-compat')