diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-07-09 11:29:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-07-09 11:29:58 +0000 |
| commit | 609b739be9c9a18b7776b6941b692d1a4a77561a (patch) | |
| tree | f61883ddcff3f5e553bd8a456756bd18a7d60d24 | |
| parent | 568db8beaf89f5fab925baba86c46e116a7c94c5 (diff) | |
| parent | 3d6a8008d8f38fede9dbe17d7c890df83374a070 (diff) | |
| download | support-sparse-5714016-L53600000340438829.tar.gz | |
Merge "Merge cherrypicks of [1012516] into androidx-vectordrawable-release" into androidx-vectordrawable-releasesparse-5714016-L75000000339967765sparse-5714016-L70800000340610731sparse-5714016-L67400000340609418sparse-5714016-L64700000340679310sparse-5714016-L62600000340632244sparse-5714016-L60500000340811317sparse-5714016-L59100000340063109sparse-5714016-L55800000340306822sparse-5714016-L55100000340550838sparse-5714016-L55000000340719205sparse-5714016-L53600000340438829sparse-5714016-L53100000340952919sparse-5714016-L48400000340677593sparse-5714016-L45600000340858282sparse-5714016-L37700000340397621sparse-5714016-L37600000340673957sparse-5714016-L36900000340474987sparse-5714016-L28500000340573967sparse-5714016-L08500000340170371sparse-5714016-L08100000340265109sparse-5714016-L07800000340626184sparse-5714016-L04400000340365099
| -rw-r--r-- | buildSrc/src/main/kotlin/androidx/build/CreateAggregateLibraryBuildInfoFileTask.kt | 6 |
1 files changed, 3 insertions, 3 deletions
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)) |