aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOussama Ben Abdelbaki <obenabde@google.com>2019-06-25 13:30:47 -0400
committerandroid-build-prod (mdb) <android-build-team-robot@google.com>2019-06-27 15:14:09 +0000
commitcc92c2dd3a5225fcec6e859f39cf017bff2aec39 (patch)
tree3ad5e34af0ba42584ad2503475d7633952e7ec8d
parent138e9995b6741d35bfe775e0fa6504adb88137ef (diff)
downloadsupport-cc92c2dd3a5225fcec6e859f39cf017bff2aec39.tar.gz
Change generated json variable name from "Artifacts" to "artifacts"
Test: gw bOS Change-Id: I72dccc2d72254ef8c3fd3b34bc8311f619cce0e3 (cherry picked from commit 5b1671c10c431b5d26cb46a02f853b651da30319)
-rw-r--r--buildSrc/src/main/kotlin/androidx/build/CreateAggregateLibraryBuildInfoFileTask.kt6
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))