diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-06-27 15:15:29 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-06-27 15:15:29 +0000 |
commit | d769f3270b50c12ea162ad3c72b709b572357fc4 (patch) | |
tree | afa772fa504768eb31fd2331e110010858cde5a8 | |
parent | 13d67cbdb5dcab2618e3aa5b867ccfca849470c8 (diff) | |
parent | e395abec984d410d38d2281c70a003d3e314dde3 (diff) | |
download | support-sparse-5692844-L58300000340295712.tar.gz |
Merge "Merge cherrypicks of [1007757, 1007760] into androidx-versionedparcelable-release" into androidx-versionedparcelable-releasesparse-5692844-L67800000340511852sparse-5692844-L63500000340364998sparse-5692844-L61200000340655878sparse-5692844-L61200000340251171sparse-5692844-L59500000340349343sparse-5692844-L58800000340630426sparse-5692844-L58500000340090682sparse-5692844-L58300000340295712sparse-5692844-L56400000339983218sparse-5692844-L55000000339969684sparse-5692844-L37300000340444384sparse-5692844-L34600000339949888sparse-5692844-L34400000340885350sparse-5692844-L32300000340626083sparse-5692844-L32200000340146434sparse-5692844-L31400000340325305sparse-5692844-L31000000340229557sparse-5692844-L27900000340315205sparse-5692844-L26100000340923730sparse-5692844-L19200000340092904sparse-5692844-L15900000340681128sparse-5692844-L11100000340486097sparse-5692844-L07000000340185420sparse-5692844-L06300000340293894sparse-5692844-L02100000340698803
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() |