Use Set instead of List where possible to avoid possible duplicates. …

…We had a case where there was a duplicate module somehow.

invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/CollectedStatAggregator.kt

@@ -137,7 +137,7 @@ object CollectedStatAggregator {
       }
     }
     return origAllCollectedData.copy(
-      collectedStats = projectPathToCollectedStatsForProject.values.toList()
+      collectedStats = projectPathToCollectedStatsForProject.values.toSet()
     )
   }
 }

invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/models/InvertCombinedCollectedData.kt

@@ -4,9 +4,9 @@ package com.squareup.invert.internal.models
  * A Combined view of all data collected for all projects.
  */
 data class InvertCombinedCollectedData(
-  val collectedConfigurations: List<CollectedConfigurationsForProject>,
-  val collectedDependencies: List<CollectedDependenciesForProject>,
-  val collectedOwners: List<CollectedOwnershipForProject>,
-  val collectedStats: List<CollectedStatsForProject>,
-  val collectedPlugins: List<CollectedPluginsForProject>,
+  val collectedConfigurations: Set<CollectedConfigurationsForProject>,
+  val collectedDependencies: Set<CollectedDependenciesForProject>,
+  val collectedOwners: Set<CollectedOwnershipForProject>,
+  val collectedStats: Set<CollectedStatsForProject>,
+  val collectedPlugins: Set<CollectedPluginsForProject>,
 )

invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/report/GradleProjectAnalysisCombiner.kt

@@ -14,11 +14,11 @@ import java.io.File
  */
 object GradleProjectAnalysisCombiner {
   fun combineAnalysisResults(resultDirPaths: List<String>): InvertCombinedCollectedData {
-    val collectedConfigurations = mutableListOf<CollectedConfigurationsForProject>()
-    val collectedDependencies = mutableListOf<CollectedDependenciesForProject>()
-    val collectedOwners = mutableListOf<CollectedOwnershipForProject>()
-    val collectedStats = mutableListOf<CollectedStatsForProject>()
-    val collectedPlugins = mutableListOf<CollectedPluginsForProject>()
+    val collectedConfigurations = mutableSetOf<CollectedConfigurationsForProject>()
+    val collectedDependencies = mutableSetOf<CollectedDependenciesForProject>()
+    val collectedOwners = mutableSetOf<CollectedOwnershipForProject>()
+    val collectedStats = mutableSetOf<CollectedStatsForProject>()
+    val collectedPlugins = mutableSetOf<CollectedPluginsForProject>()
 
     resultDirPaths
       .map { File(it) }

invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/report/InvertReportWriter.kt

@@ -23,12 +23,12 @@ class InvertReportWriter(
 ) {
   fun writeProjectData(
     reportMetadata: MetadataJsReportModel,
-    collectedOwners: List<CollectedOwnershipForProject>,
-    collectedStats: List<CollectedStatsForProject>,
-    collectedDependencies: List<CollectedDependenciesForProject>,
-    collectedConfigurations: List<CollectedConfigurationsForProject>,
-    collectedPlugins: List<CollectedPluginsForProject>,
-    historicalData: List<HistoricalData>,
+    collectedOwners: Set<CollectedOwnershipForProject>,
+    collectedStats: Set<CollectedStatsForProject>,
+    collectedDependencies: Set<CollectedDependenciesForProject>,
+    collectedConfigurations: Set<CollectedConfigurationsForProject>,
+    collectedPlugins: Set<CollectedPluginsForProject>,
+    historicalData: Set<HistoricalData>,
   ) {
     val collectedOwnershipInfo = InvertJsReportUtils.buildModuleToOwnerMap(collectedOwners)
     val allProjectsStatsData = InvertJsReportUtils.buildModuleToStatsMap(collectedStats)
@@ -47,7 +47,7 @@ class InvertReportWriter(
     val historicalDataWithCurrent = (historicalData + HistoricalData(
       reportMetadata = reportMetadata,
       statTotalsAndMetadata = CollectedStatTotalsJsReportModel(globalStats)
-    )).sortedBy { it.reportMetadata.latestCommitTime  }
+    )).sortedBy { it.reportMetadata.latestCommitTime  }.toSet()
 
     // JSON Report
     InvertJsonReportWriter(invertLogger, rootBuildReportsDir).createInvertJsonReport(

invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/report/js/InvertJsReportUtils.kt

@@ -31,7 +31,7 @@ object InvertJsReportUtils {
    * Takes all [CollectedOwnershipForProject] collected by Invert, and creates the JS Report Model.
    */
   fun buildModuleToOwnerMap(
-    collectedOwners: List<CollectedOwnershipForProject>
+    collectedOwners: Set<CollectedOwnershipForProject>
   ): OwnershipJsReportModel {
     return OwnershipJsReportModel(
       modules = collectedOwners
@@ -125,7 +125,7 @@ object InvertJsReportUtils {
   /**
    * Takes all [CollectedStatsForProject] collected by Invert, and creates the JS Report Model.
    */
-  fun buildModuleToStatsMap(collectedStats: List<CollectedStatsForProject>): StatsJsReportModel {
+  fun buildModuleToStatsMap(collectedStats: Set<CollectedStatsForProject>): StatsJsReportModel {
     val statInfos: Map<StatKey, StatMetadata> = mutableSetOf<StatMetadata>()
       .also { statInfos ->
         collectedStats.forEach { collectedStatsForProject ->
@@ -148,7 +148,7 @@ object InvertJsReportUtils {
   /**
    * Takes all [CollectedPluginsForProject] collected by Invert, and creates the JS Report Model.
    */
-  fun toCollectedPlugins(allPlugins: List<CollectedPluginsForProject>): PluginsJsReportModel {
+  fun toCollectedPlugins(allPlugins: Set<CollectedPluginsForProject>): PluginsJsReportModel {
     return PluginsJsReportModel(
       plugins = mutableMapOf<GradlePluginId, MutableList<ModulePath>>()
         .also { resultingDepIdToModuleUsageInfo ->
@@ -175,7 +175,7 @@ object InvertJsReportUtils {
    * Takes all [CollectedDependenciesForProject] collected by Invert, and creates the JS Report Model.
    */
   fun toInvertedDependenciesJsReportModel(
-    collectedDependenciesForProjects: List<CollectedDependenciesForProject>
+    collectedDependenciesForProjects: Set<CollectedDependenciesForProject>
   ): DependenciesJsReportModel {
     return DependenciesJsReportModel(
       mutableMapOf<DependencyId, MutableMap<ModulePath, MutableList<ConfigurationName>>>()
@@ -197,7 +197,7 @@ object InvertJsReportUtils {
   }
 
   fun toCollectedConfigurations(
-    allProjectsConfigurationsData: List<CollectedConfigurationsForProject>
+    allProjectsConfigurationsData: Set<CollectedConfigurationsForProject>
   ): ConfigurationsJsReportModel {
     val allConfigurationNames = mutableSetOf<String>()
     val moduleToAllConfigurationNames = mutableMapOf<ModulePath, Set<ConfigurationName>>()
@@ -227,7 +227,7 @@ object InvertJsReportUtils {
   }
 
   fun toDirectDependenciesJsReportModel(
-    allProjectsDependencyData: List<CollectedDependenciesForProject>
+    allProjectsDependencyData: Set<CollectedDependenciesForProject>
   ): DirectDependenciesJsReportModel {
     return DirectDependenciesJsReportModel(
       allProjectsDependencyData.associate { it.path to it.directDependencies }

invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/report/js/InvertJsReportWriter.kt

@@ -19,6 +19,7 @@ import com.squareup.invert.models.js.PluginsJsReportModel
 import com.squareup.invert.models.js.StatsJsReportModel
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.builtins.SetSerializer
 import java.io.File
 
 class InvertJsReportWriter(
@@ -28,16 +29,16 @@ class InvertJsReportWriter(
   private val rootBuildHtmlReportDir = File(rootBuildReportsDir, InvertFileUtils.JS_FOLDER_NAME)
 
   fun createInvertHtmlReport(
-    allProjectsDependencyData: List<CollectedDependenciesForProject>,
-    allProjectsConfigurationsData: List<CollectedConfigurationsForProject>,
+    allProjectsDependencyData: Set<CollectedDependenciesForProject>,
+    allProjectsConfigurationsData: Set<CollectedConfigurationsForProject>,
     allProjectsStatsData: StatsJsReportModel,
     directDependencies: DirectDependenciesJsReportModel,
     invertedDependencies: DependenciesJsReportModel,
-    allPluginsData: List<CollectedPluginsForProject>,
+    allPluginsData: Set<CollectedPluginsForProject>,
     collectedOwnershipInfo: OwnershipJsReportModel,
     globalStatTotals: CollectedStatTotalsJsReportModel,
     reportMetadata: MetadataJsReportModel,
-    historicalData: List<HistoricalData>,
+    historicalData: Set<HistoricalData>,
   ) {
     val pluginsReport = InvertJsReportUtils.toCollectedPlugins(allPluginsData)
     val modulesList = allProjectsDependencyData.map { it.path }
@@ -56,7 +57,7 @@ class InvertJsReportWriter(
 
     writeJsFileInDir(
       fileKey = JsReportFileKey.HISTORICAL_DATA,
-      serializer = ListSerializer(HistoricalData.serializer()),
+      serializer = SetSerializer(HistoricalData.serializer()),
       value = historicalData
     )
 

invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/report/json/InvertJsonReportWriter.kt

@@ -17,6 +17,7 @@ import com.squareup.invert.models.js.StatTotalAndMetadata
 import com.squareup.invert.models.js.StatsJsReportModel
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.builtins.SetSerializer
 import java.io.File
 
 class InvertJsonReportWriter(
@@ -25,14 +26,14 @@ class InvertJsonReportWriter(
 ) {
   private val rootBuildJsonReportsDir = File(rootBuildReportsDir, InvertFileUtils.JSON_FOLDER_NAME)
   fun createInvertJsonReport(
-    allConfigurationsData: List<CollectedConfigurationsForProject>,
-    allProjectsDependencyData: List<CollectedDependenciesForProject>,
+    allConfigurationsData: Set<CollectedConfigurationsForProject>,
+    allProjectsDependencyData: Set<CollectedDependenciesForProject>,
     allProjectsStatsData: StatsJsReportModel,
-    allPluginsData: List<CollectedPluginsForProject>,
-    allOwnersData: List<CollectedOwnershipForProject>,
+    allPluginsData: Set<CollectedPluginsForProject>,
+    allOwnersData: Set<CollectedOwnershipForProject>,
     globalStats: Map<StatKey, StatTotalAndMetadata>,
     reportMetadata: MetadataJsReportModel,
-    historicalData: List<HistoricalData>,
+    historicalData: Set<HistoricalData>,
   ) {
     writeJsonFileInDir(
       jsonFileKey = InvertPluginFileKey.METADATA,
@@ -41,12 +42,12 @@ class InvertJsonReportWriter(
     )
     writeJsonFileInDir(
       jsonFileKey = InvertPluginFileKey.PLUGINS,
-      serializer = ListSerializer(CollectedPluginsForProject.serializer()),
+      serializer = SetSerializer(CollectedPluginsForProject.serializer()),
       value = allPluginsData
     )
     writeJsonFileInDir(
       jsonFileKey = InvertPluginFileKey.HISTORICAL_DATA,
-      serializer = ListSerializer(HistoricalData.serializer()),
+      serializer = SetSerializer(HistoricalData.serializer()),
       value = historicalData
     )
 
@@ -58,13 +59,13 @@ class InvertJsonReportWriter(
 
     writeJsonFileInDir(
       jsonFileKey = InvertPluginFileKey.CONFIGURATIONS,
-      serializer = ListSerializer(CollectedConfigurationsForProject.serializer()),
+      serializer = SetSerializer(CollectedConfigurationsForProject.serializer()),
       value = allConfigurationsData
     )
 
     writeJsonFileInDir(
       jsonFileKey = InvertPluginFileKey.DEPENDENCIES,
-      serializer = ListSerializer(CollectedDependenciesForProject.serializer()),
+      serializer = SetSerializer(CollectedDependenciesForProject.serializer()),
       value = allProjectsDependencyData
     )
 
@@ -76,7 +77,7 @@ class InvertJsonReportWriter(
 
     writeJsonFileInDir(
       jsonFileKey = InvertPluginFileKey.OWNERS,
-      serializer = ListSerializer(CollectedOwnershipForProject.serializer()),
+      serializer = SetSerializer(CollectedOwnershipForProject.serializer()),
       value = allOwnersData
     )
   }

invert-gradle-plugin/src/main/kotlin/com/squareup/invert/internal/tasks/InvertTask.kt

@@ -95,7 +95,7 @@ abstract class InvertTask : DefaultTask() {
       )
 
       val historicalDataFile: File? = historicalDataFileProperty.orNull?.let { File(it) }
-      val historicalData: List<HistoricalData> =
+      val historicalData: Set<HistoricalData> =
         if (historicalDataFile?.isFile == true && historicalDataFile.length() > 0) {
           try {
             val fileContents = historicalDataFile.readText()
@@ -106,7 +106,7 @@ abstract class InvertTask : DefaultTask() {
           }
         } else {
           listOf()
-        }
+        }.toSet()
 
       InvertReportWriter(
         invertLogger = invertLogger(),