diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-06-27 15:15:49 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-06-27 15:15:49 +0000 |
commit | 16d79836d845cec6f471f1d916cd94e56c75ab17 (patch) | |
tree | 7f613d2932ef3da28bae2c3a889dd8738eaf53ad | |
parent | c9fc681982324c5592c6b43188ac1a945ad6ff4d (diff) | |
parent | e6ffac83dac22768012ba8b99974be40322256ea (diff) | |
download | support-sparse-5692841-L32700000340682138.tar.gz |
Merge "Merge cherrypicks of [1007759, 1007761] into androidx-collection-release" into androidx-collection-releasesparse-5692841-L89800000340611539sparse-5692841-L68400000340891612sparse-5692841-L65500000340508519sparse-5692841-L59200000340768089sparse-5692841-L59000000340710418sparse-5692841-L57600000340684057sparse-5692841-L54400000340086743sparse-5692841-L53200000340819498sparse-5692841-L47300000340827174sparse-5692841-L46900000340382269sparse-5692841-L45500000340755666sparse-5692841-L38300000340338233sparse-5692841-L32700000340682138sparse-5692841-L32500000340791218sparse-5692841-L24900000340084723sparse-5692841-L22800000340007357sparse-5692841-L19700000340840001sparse-5692841-L17900000340655171sparse-5692841-L11800000340838082sparse-5692841-L09300000340898177sparse-5692841-L09100000340071997sparse-5692841-L08300000339952110sparse-5692841-L03900000340947061sparse-5692841-L02700000340139263sparse-5692841-L01100000340786673
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 2b1ef3a163e..c5d3165d31f 100644 --- a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt +++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt @@ -70,6 +70,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. */ @@ -522,7 +529,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 490b619eb56..50c2bec476f 100644 --- a/buildSrc/src/main/kotlin/androidx/build/BuildServerConfiguration.kt +++ b/buildSrc/src/main/kotlin/androidx/build/BuildServerConfiguration.kt @@ -45,6 +45,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() |