diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-06-27 15:14:44 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-06-27 15:14:44 +0000 |
commit | 198b2fb70a1a0506b5c02765f9b7a000a3c6b6ac (patch) | |
tree | 9f876bb3421f706a052068dbec30362b8c7e384a | |
parent | 76774ccb9f6da58b7c6cf7bcf590152454a2b5ed (diff) | |
parent | e947670dd440bd44c6c63f5c85ccd68fe9037107 (diff) | |
download | support-sparse-5692842-L24300000339987561.tar.gz |
Merge "Merge cherrypicks of [1003086, 1003087] into androidx-annotation-release" into androidx-annotation-releasesparse-5692842-L82800000339968674sparse-5692842-L80400000340617801sparse-5692842-L69200000340680320sparse-5692842-L63300000340834345sparse-5692842-L59300000340705873sparse-5692842-L58600000340846566sparse-5692842-L55400000340942617sparse-5692842-L51800000340547909sparse-5692842-L51600000340388430sparse-5692842-L49700000341095834sparse-5692842-L48800000340100075sparse-5692842-L47900000340126032sparse-5692842-L46500000340095732sparse-5692842-L43200000340468321sparse-5692842-L38700000340741829sparse-5692842-L35700000340420245sparse-5692842-L33400000340773341sparse-5692842-L30700000341867575sparse-5692842-L28800000340574371sparse-5692842-L24500000340501954sparse-5692842-L24300000339987561sparse-5692842-L21500000341392168sparse-5692842-L19400000340084622sparse-5692842-L19100000340578411sparse-5692842-L18800000339999176sparse-5692842-L16000000340186228sparse-5692842-L12500000340954737sparse-5692842-L06300000340086642sparse-5692842-L04600000340059978sparse-5692842-L03200000340197742sparse-5692842-L02600000340905550
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 4e72632b8f5..95136f73564 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() |