diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-06-27 15:16:35 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-06-27 15:16:35 +0000 |
commit | 358bc22016ce30f6432d6d53a4f9a7f4bd6e9e8a (patch) | |
tree | a28f34d96540ccc6abb71fd27371020595110fa3 | |
parent | 138e9995b6741d35bfe775e0fa6504adb88137ef (diff) | |
parent | cd9e79459c6353dbb99802a200fdc66f95f90bd4 (diff) | |
download | support-sparse-5692845-L66800000340923932.tar.gz |
Merge "Merge cherrypicks of [1003088, 1003089] into androidx-media-release" into androidx-media-releasesparse-5692845-L93800000339959180sparse-5692845-L82000000340614367sparse-5692845-L66800000340923932sparse-5692845-L60700000340401156sparse-5692845-L60300000340073411sparse-5692845-L60200000340101388sparse-5692845-L60000000339978168sparse-5692845-L59700000340539425sparse-5692845-L54300000340008670sparse-5692845-L51200000340574068sparse-5692845-L50700000340423578sparse-5692845-L39600000340580027sparse-5692845-L37000000340093207sparse-5692845-L36000000340149868sparse-5692845-L25600000340095126sparse-5692845-L22800000340665170sparse-5692845-L16100000340807277sparse-5692845-L15400000340953020sparse-5692845-L14800000339953221sparse-5692845-L13200000340399338sparse-5692845-L12100000340815559sparse-5692845-L11700000340185622sparse-5692845-L07500000340077754sparse-5692845-L06900000340543970sparse-5692845-L06800000340040586sparse-5692845-L00800000340727487
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 05a209079f7..1da0d624015 100644 --- a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt +++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt @@ -77,6 +77,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. */ @@ -585,7 +592,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() |