diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-07-09 11:29:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-07-09 11:29:41 +0000 |
| commit | 4e72143b0ffe465a1fe03d730f16cc87778e115b (patch) | |
| tree | 0fe3f50c8397ee03c689a83c9a133f7930677b86 | |
| parent | 5322d8dcf88fcc315778c8ad5a3e7358acf321fa (diff) | |
| parent | 11adb910ca28348e728d2f0c4d8ea46900ed0ba2 (diff) | |
| download | support-sparse-5714013-L34700000340293591.tar.gz | |
Merge "Merge cherrypicks of [1011467] into androidx-transition-release" into androidx-transition-releasesparse-5714013-L70500000339960392sparse-5714013-L65900000339980491sparse-5714013-L65200000340631840sparse-5714013-L62300000340368836sparse-5714013-L60400000340799601sparse-5714013-L58700000340507105sparse-5714013-L56500000340118154sparse-5714013-L54000000340003620sparse-5714013-L51600000340338839sparse-5714013-L46000000339982915sparse-5714013-L41900000340640324sparse-5714013-L41600000340177138sparse-5714013-L39400000340267230sparse-5714013-L35600000340060685sparse-5714013-L35100000340096439sparse-5714013-L34700000340293591sparse-5714013-L33400000340318740sparse-5714013-L25800000340027961sparse-5714013-L23300000340630123sparse-5714013-L21400000339975643sparse-5714013-L17700000340087349sparse-5714013-L17400000340661332sparse-5714013-L14200000340062705sparse-5714013-L10600000340291369sparse-5714013-L07600000340412872sparse-5714013-L05500000340804348sparse-5714013-L04600000340934234
| -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)) |