From 5850d3f9f7042377de896e718f1584ab049aaa21 Mon Sep 17 00:00:00 2001 From: Sam Gilbert Date: Mon, 24 Jun 2019 21:03:50 -0400 Subject: Placed build info files in their own directory Bug: 135998756 Test: Output files exist in new directory. Change-Id: Idaee9119391f83f1159ce03b0de764c0a6220fc6 (cherry picked from commit 39cc7ca196a768ab2d7d7baf808cfff7f43804e9) --- buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt | 9 ++++++++- .../src/main/kotlin/androidx/build/BuildServerConfiguration.kt | 6 ++++++ .../main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt | 6 +++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt index 4e72632b8f5..95136f73564 100644 --- a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt +++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt @@ -69,6 +69,13 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension 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. @@ -522,7 +529,7 @@ class AndroidXPlugin : Plugin { 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 490b619eb56..50c2bec476f 100644 --- a/buildSrc/src/main/kotlin/androidx/build/BuildServerConfiguration.kt +++ b/buildSrc/src/main/kotlin/androidx/build/BuildServerConfiguration.kt @@ -44,6 +44,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. */ 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() -- cgit v1.2.3