Merge changes from topic "am-3cd36979-4789-4903-b753-2c3ba65bba33"
* changes:
[automerger] resolve merge conflicts of fbc76f93f0fe94924515a34654387c1dea5162af to oc-mr1-jetpack-dev am: 6319e4c19b
resolve merge conflicts of fbc76f93f0fe94924515a34654387c1dea5162af to oc-mr1-jetpack-dev
diff --git a/app-toolkit/settings.gradle b/app-toolkit/settings.gradle
index 303e4fa..ac85d95 100644
--- a/app-toolkit/settings.gradle
+++ b/app-toolkit/settings.gradle
@@ -104,9 +104,7 @@
if (inAppToolkitProject) {
File externalRoot = new File(supportRoot, '../../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')
}
diff --git a/buildSrc/build_dependencies.gradle b/buildSrc/build_dependencies.gradle
index 66121bd..313c4e3 100644
--- a/buildSrc/build_dependencies.gradle
+++ b/buildSrc/build_dependencies.gradle
@@ -33,7 +33,10 @@
build_libs.jetifier = 'androidx.tools.jetifier:gradle-plugin:0.1'
build_libs.kotlin = [gradle_plugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.0"]
// jdiff dependencies
+build_libs.jdiff = 'com.android:jdiff:1.1.0'
build_libs.xml_parser_apis = 'xerces:xmlParserAPIs:2.6.2'
build_libs.xerces_impl = 'xerces:xercesImpl:2.6.2'
+build_libs.doclava = 'com.android:doclava:1.0.6'
+
rootProject.ext['build_libs'] = build_libs
diff --git a/buildSrc/init.gradle b/buildSrc/init.gradle
index 7ae5736..3107495 100644
--- a/buildSrc/init.gradle
+++ b/buildSrc/init.gradle
@@ -21,6 +21,8 @@
import com.android.build.gradle.internal.tasks.DeviceProviderInstrumentTestTask
import org.gradle.api.logging.configuration.ShowStacktrace
+import javax.tools.ToolProvider
+
def supportRoot = ext.supportRootFolder
if (supportRoot == null) {
throw new RuntimeException("variable supportRootFolder is not set. you must set it before" +
@@ -42,8 +44,10 @@
}
p.dependencies {
- doclava project(':doclava')
- jdiff project(':jdiff')
+ doclava build_libs.doclava
+ // tools.jar required for com.sun.javadoc
+ doclava files(((URLClassLoader) ToolProvider.getSystemToolClassLoader()).getURLs())
+ jdiff build_libs.jdiff
jdiff build_libs.xml_parser_apis
jdiff build_libs.xerces_impl
}
@@ -167,9 +171,7 @@
repos.addMavenRepositories(repositories)
// Only modify Android projects.
- if (project.name.equals('doclava')
- || project.name.equals('jdiff')
- || project.name.equals('noto-emoji-compat')) {
+ if (project.name.equals('noto-emoji-compat')) {
// disable tests and return
project.tasks.whenTaskAdded { task ->
if (task instanceof org.gradle.api.tasks.testing.Test) {
diff --git a/settings.gradle b/settings.gradle
index 0f99933..d078414 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -227,11 +227,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')