diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-06-27 15:16:47 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-06-27 15:16:47 +0000 |
commit | cdba966517cb5cc66a6412a42c0a076055fe582c (patch) | |
tree | afa772fa504768eb31fd2331e110010858cde5a8 | |
parent | c04eabe202d9332cc9e53643298eb72a743b03b3 (diff) | |
parent | 27a3413fdc933d8a4c56f3aaf902a6c6abfeb6a2 (diff) | |
download | support-sparse-5692840-L30500000340777280.tar.gz |
Merge "Merge cherrypicks of [1007766, 1007767] into androidx-loader-release" into androidx-loader-releasesparse-5692840-L72500000339973219sparse-5692840-L64300000340687794sparse-5692840-L60400000340621235sparse-5692840-L60400000340376815sparse-5692840-L54600000340050181sparse-5692840-L51300000340318235sparse-5692840-L43800000340610226sparse-5692840-L41500000340882825sparse-5692840-L40700000340062402sparse-5692840-L38500000340364392sparse-5692840-L38500000340039677sparse-5692840-L34300000340126436sparse-5692840-L30500000340777280sparse-5692840-L26900000340836365sparse-5692840-L25200000340398530sparse-5692840-L19700000340098661sparse-5692840-L16400000340382572sparse-5692840-L16200000340212387sparse-5692840-L16100000340801621sparse-5692840-L06800000340016144sparse-5692840-L06500000340642243sparse-5692840-L03600000340779805sparse-5692840-L00200000340483471
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 4ec2e94accd..0edbced0f69 100644 --- a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt +++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt @@ -76,6 +76,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. */ @@ -576,7 +583,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 b48db5c41ae..4d065ed2261 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() |