Merge "Merge cherrypicks of [1007753, 1007755] into androidx-room-release" into androidx-room-releasesparse-5693107-L86200000340609115sparse-5693107-L85800000339960291sparse-5693107-L82200000340613761sparse-5693107-L65400000339973421sparse-5693107-L65000000340541344sparse-5693107-L63300000339982814sparse-5693107-L59400000340651737sparse-5693107-L58000000340301974sparse-5693107-L57100000340098863sparse-5693107-L47200000340404085sparse-5693107-L43600000340291268sparse-5693107-L35600000340649919sparse-5693107-L31800000340048666sparse-5693107-L26100000340889996sparse-5693107-L26000000340677088sparse-5693107-L22100000340834749sparse-5693107-L11300000340321366sparse-5693107-L05600000340472563sparse-5693107-L05200000340348939sparse-5693107-L02800000340186834

4 files changed, 20 insertions, 7 deletions

diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
index 076a99a9885..85b308226d5 100644
--- a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
@@ -75,6 +75,13 @@ import java.io.File
 import java.util.concurrent.ConcurrentHashMap
 
 /**
+ * Setting this property indicates that a build is being performed to check for forward
+ * compatibility.
+ */
+const val USE_MAX_DEP_VERSIONS = "useMaxDepVersions"
+const val BUILD_INFO_DIR = "build-info"
+
+/**
  * A plugin which enables all of the Gradle customizations for AndroidX.
  * This plugin reacts to other plugins being added and adds required and optional functionality.
  */
@@ -567,7 +574,7 @@ class AndroidXPlugin : Plugin<Project> {
                     CREATE_LIBRARY_BUILD_INFO_FILES_TASK,
                     CreateLibraryBuildInfoFileTask::class.java
                 ) {
-                    it.outputFile.set(File(project.getDistributionDirectory(),
+                    it.outputFile.set(File(project.getBuildInfoDirectory(),
                         "${project.group}_${project.name}_build_info.txt"))
                 }
                 project.rootProject.tasks.named(CREATE_LIBRARY_BUILD_INFO_FILES_TASK).configure {
diff --git a/buildSrc/src/main/kotlin/androidx/build/BuildServerConfiguration.kt b/buildSrc/src/main/kotlin/androidx/build/BuildServerConfiguration.kt
index f705a693d52..cabe03bfd66 100644
--- a/buildSrc/src/main/kotlin/androidx/build/BuildServerConfiguration.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/BuildServerConfiguration.kt
@@ -46,6 +46,12 @@ fun Project.getDistributionDirectory(): File {
 }
 
 /**
+ * Directory to put build info files for release service dependency files.
+ */
+fun Project.getBuildInfoDirectory(): File =
+        File(getDistributionDirectory(), "build-info")
+
+/**
  * Directory to put host test results so they can be consumed by the testing dashboard.
  */
 fun Project.getHostTestResultDirectory(): File =
diff --git a/buildSrc/src/main/kotlin/androidx/build/CreateAggregateLibraryBuildInfoFileTask.kt b/buildSrc/src/main/kotlin/androidx/build/CreateAggregateLibraryBuildInfoFileTask.kt
index 5b2ef1699a6..2db3f6f25bd 100644
--- a/buildSrc/src/main/kotlin/androidx/build/CreateAggregateLibraryBuildInfoFileTask.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/CreateAggregateLibraryBuildInfoFileTask.kt
@@ -50,7 +50,7 @@ abstract class CreateAggregateLibraryBuildInfoFileTask : DefaultTask() {
     }
 
     private data class AllLibraryBuildInfoFiles(
-        val Artifacts: ArrayList<LibraryBuildInfoFile>
+        val artifacts: ArrayList<LibraryBuildInfoFile>
     )
 
     /**
@@ -63,7 +63,7 @@ abstract class CreateAggregateLibraryBuildInfoFileTask : DefaultTask() {
         val gson = Gson()
         val jsonString: String = jsonFile.readText(Charsets.UTF_8)
         val aggregateBuildInfoFile = gson.fromJson(jsonString, AllLibraryBuildInfoFiles::class.java)
-        aggregateBuildInfoFile.Artifacts.forEach { artifact ->
+        aggregateBuildInfoFile.artifacts.forEach { artifact ->
             if (!artifactList.contains("${artifact.groupId}_${artifact.artifactId}")) {
                 println("Failed to find ${artifact.artifactId} in artifact list!")
                 return false
@@ -83,7 +83,7 @@ abstract class CreateAggregateLibraryBuildInfoFileTask : DefaultTask() {
         // Loop through each file in the list of libraryBuildInfoFiles and collect all build info
         // data from each of these $groupId-$artifactId-_build_info.txt files
         var output = StringBuilder()
-        output.append("{ \"Artifacts\": [\n")
+        output.append("{ \"artifacts\": [\n")
         var artifactList = mutableListOf<String>()
         for (infoFile in libraryBuildInfoFiles.get()) {
             if ((infoFile.isFile and (infoFile.name != outputFile.name))
diff --git a/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt b/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt
index 83a390678ae..0e12bcd3522 100644
--- a/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt
@@ -46,10 +46,10 @@ open class CreateLibraryBuildInfoFileTask : DefaultTask() {
     }
 
     private fun writeJsonToFile(info: LibraryBuildInfoFile) {
-        if (!project.getDistributionDirectory().exists()) {
-            if (!project.getDistributionDirectory().mkdirs()) {
+        if (!project.getBuildInfoDirectory().exists()) {
+            if (!project.getBuildInfoDirectory().mkdirs()) {
                 throw RuntimeException("Failed to create " +
-                        "output directory: ${project.getDistributionDirectory()}")
+                        "output directory: ${project.getBuildInfoDirectory()}")
             }
         }
         var resolvedOutputFile: File = outputFile.get()