From 1b3d5324bb4bd730d8a729e5e71be3bbb1015756 Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Wed, 29 May 2024 10:35:34 +0200 Subject: [PATCH] Use String instead of File as key of stamps - regenerate contraband --- .../ChainedResolverFormats.scala | 15 +-------------- .../ConfigurationReportFormats.scala | 18 +----------------- .../ModuleConfigurationFormats.scala | 16 +--------------- .../PatternsBasedRepositoryFormats.scala | 12 +----------- .../PublishConfigurationFormats.scala | 8 +------- .../librarymanagement/ResolverFormats.scala | 15 +-------------- .../SftpRepositoryFormats.scala | 7 +------ .../SshBasedRepositoryFormats.scala | 9 +-------- .../SshConnectionFormats.scala | 5 +---- .../SshRepositoryFormats.scala | 7 +------ .../sbt/librarymanagement/UpdateReport.scala | 8 ++++---- .../UpdateReportFormats.scala | 2 +- .../src/main/contraband/librarymanagement.json | 2 +- .../librarymanagement/RichUpdateReport.scala | 2 +- .../librarymanagement/UpdateReportExtra.scala | 2 +- .../DMSerializationSpec.scala | 2 +- 16 files changed, 19 insertions(+), 111 deletions(-) diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolverFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolverFormats.scala index 25792d684..61cf796da 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolverFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolverFormats.scala @@ -5,20 +5,7 @@ // DO NOT EDIT MANUALLY package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } -trait ChainedResolverFormats { self: sbt.librarymanagement.ResolverFormats with - sjsonnew.BasicJsonProtocol with - sbt.librarymanagement.MavenRepoFormats with - sbt.librarymanagement.MavenCacheFormats with - sbt.librarymanagement.PatternsFormats with - sbt.librarymanagement.FileConfigurationFormats with - sbt.librarymanagement.FileRepositoryFormats with - sbt.librarymanagement.URLRepositoryFormats with - sbt.librarymanagement.SshConnectionFormats with - sbt.librarymanagement.SshAuthenticationFormats with - sbt.librarymanagement.SshRepositoryFormats with - sbt.librarymanagement.SftpRepositoryFormats with - sbt.librarymanagement.PasswordAuthenticationFormats with - sbt.librarymanagement.KeyFileAuthenticationFormats => +trait ChainedResolverFormats { self: sbt.librarymanagement.ResolverFormats with sjsonnew.BasicJsonProtocol => implicit lazy val ChainedResolverFormat: JsonFormat[sbt.librarymanagement.ChainedResolver] = new JsonFormat[sbt.librarymanagement.ChainedResolver] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ChainedResolver = { __jsOpt match { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportFormats.scala index 282877526..c8090c6e1 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportFormats.scala @@ -5,23 +5,7 @@ // DO NOT EDIT MANUALLY package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } -trait ConfigurationReportFormats { self: sbt.librarymanagement.ConfigRefFormats with - sbt.librarymanagement.ModuleReportFormats with - sbt.librarymanagement.ModuleIDFormats with - sbt.librarymanagement.ArtifactFormats with - sbt.librarymanagement.ChecksumFormats with - sjsonnew.BasicJsonProtocol with - sbt.librarymanagement.InclExclRuleFormats with - sbt.librarymanagement.CrossVersionFormats with - sbt.librarymanagement.DisabledFormats with - sbt.librarymanagement.BinaryFormats with - sbt.librarymanagement.ConstantFormats with - sbt.librarymanagement.PatchFormats with - sbt.librarymanagement.FullFormats with - sbt.librarymanagement.For3Use2_13Formats with - sbt.librarymanagement.For2_13Use3Formats with - sbt.librarymanagement.CallerFormats with - sbt.librarymanagement.OrganizationArtifactReportFormats => +trait ConfigurationReportFormats { self: sbt.librarymanagement.ConfigRefFormats with sbt.librarymanagement.ModuleReportFormats with sbt.librarymanagement.ModuleIDFormats with sbt.librarymanagement.ArtifactFormats with sbt.librarymanagement.ChecksumFormats with sjsonnew.BasicJsonProtocol with sbt.librarymanagement.InclExclRuleFormats with sbt.librarymanagement.CrossVersionFormats with sbt.librarymanagement.DisabledFormats with sbt.librarymanagement.BinaryFormats with sbt.librarymanagement.ConstantFormats with sbt.librarymanagement.PatchFormats with sbt.librarymanagement.FullFormats with sbt.librarymanagement.For3Use2_13Formats with sbt.librarymanagement.For2_13Use3Formats with sbt.librarymanagement.CallerFormats with sbt.librarymanagement.OrganizationArtifactReportFormats => implicit lazy val ConfigurationReportFormat: JsonFormat[sbt.librarymanagement.ConfigurationReport] = new JsonFormat[sbt.librarymanagement.ConfigurationReport] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ConfigurationReport = { __jsOpt match { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfigurationFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfigurationFormats.scala index f562f1bb4..1f34ab28f 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfigurationFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfigurationFormats.scala @@ -5,21 +5,7 @@ // DO NOT EDIT MANUALLY package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } -trait ModuleConfigurationFormats { self: sbt.librarymanagement.ResolverFormats with - sjsonnew.BasicJsonProtocol with - sbt.librarymanagement.ChainedResolverFormats with - sbt.librarymanagement.MavenRepoFormats with - sbt.librarymanagement.MavenCacheFormats with - sbt.librarymanagement.PatternsFormats with - sbt.librarymanagement.FileConfigurationFormats with - sbt.librarymanagement.FileRepositoryFormats with - sbt.librarymanagement.URLRepositoryFormats with - sbt.librarymanagement.SshConnectionFormats with - sbt.librarymanagement.SshAuthenticationFormats with - sbt.librarymanagement.SshRepositoryFormats with - sbt.librarymanagement.SftpRepositoryFormats with - sbt.librarymanagement.PasswordAuthenticationFormats with - sbt.librarymanagement.KeyFileAuthenticationFormats => +trait ModuleConfigurationFormats { self: sbt.librarymanagement.ResolverFormats with sjsonnew.BasicJsonProtocol => implicit lazy val ModuleConfigurationFormat: JsonFormat[sbt.librarymanagement.ModuleConfiguration] = new JsonFormat[sbt.librarymanagement.ModuleConfiguration] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ModuleConfiguration = { __jsOpt match { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepositoryFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepositoryFormats.scala index f49f0f9c6..843e70f3d 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepositoryFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepositoryFormats.scala @@ -6,16 +6,6 @@ package sbt.librarymanagement import _root_.sjsonnew.JsonFormat -trait PatternsBasedRepositoryFormats { self: sbt.librarymanagement.PatternsFormats with - sjsonnew.BasicJsonProtocol with - sbt.librarymanagement.FileConfigurationFormats with - sbt.librarymanagement.FileRepositoryFormats with - sbt.librarymanagement.URLRepositoryFormats with - sbt.librarymanagement.SshConnectionFormats with - sbt.librarymanagement.SshAuthenticationFormats with - sbt.librarymanagement.SshRepositoryFormats with - sbt.librarymanagement.SftpRepositoryFormats with - sbt.librarymanagement.PasswordAuthenticationFormats with - sbt.librarymanagement.KeyFileAuthenticationFormats => +trait PatternsBasedRepositoryFormats { self: sbt.librarymanagement.PatternsFormats with sjsonnew.BasicJsonProtocol with sbt.librarymanagement.FileConfigurationFormats with sbt.librarymanagement.FileRepositoryFormats with sbt.librarymanagement.URLRepositoryFormats with sbt.librarymanagement.SshConnectionFormats with sbt.librarymanagement.SshAuthenticationFormats with sbt.librarymanagement.SshRepositoryFormats with sbt.librarymanagement.SftpRepositoryFormats => implicit lazy val PatternsBasedRepositoryFormat: JsonFormat[sbt.librarymanagement.PatternsBasedRepository] = flatUnionFormat4[sbt.librarymanagement.PatternsBasedRepository, sbt.librarymanagement.FileRepository, sbt.librarymanagement.URLRepository, sbt.librarymanagement.SshRepository, sbt.librarymanagement.SftpRepository]("type") } diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfigurationFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfigurationFormats.scala index 8b2842ad8..d1fde3d18 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfigurationFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/PublishConfigurationFormats.scala @@ -5,13 +5,7 @@ // DO NOT EDIT MANUALLY package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } -trait PublishConfigurationFormats { self: sbt.librarymanagement.ConfigRefFormats with - sbt.librarymanagement.ArtifactFormats with - sbt.librarymanagement.UpdateLoggingFormats with - sjsonnew.BasicJsonProtocol with - sbt.librarymanagement.PasswordAuthenticationFormats with - sbt.librarymanagement.KeyFileAuthenticationFormats with - sbt.librarymanagement.ChecksumFormats => +trait PublishConfigurationFormats { self: sbt.librarymanagement.ConfigRefFormats with sbt.librarymanagement.ArtifactFormats with sbt.librarymanagement.UpdateLoggingFormats with sjsonnew.BasicJsonProtocol => implicit lazy val PublishConfigurationFormat: JsonFormat[sbt.librarymanagement.PublishConfiguration] = new JsonFormat[sbt.librarymanagement.PublishConfiguration] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.PublishConfiguration = { __jsOpt match { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/ResolverFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/ResolverFormats.scala index 3f0a73150..5569ef568 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/ResolverFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/ResolverFormats.scala @@ -6,19 +6,6 @@ package sbt.librarymanagement import _root_.sjsonnew.JsonFormat -trait ResolverFormats { self: sjsonnew.BasicJsonProtocol with - sbt.librarymanagement.ChainedResolverFormats with - sbt.librarymanagement.MavenRepoFormats with - sbt.librarymanagement.MavenCacheFormats with - sbt.librarymanagement.PatternsFormats with - sbt.librarymanagement.FileConfigurationFormats with - sbt.librarymanagement.FileRepositoryFormats with - sbt.librarymanagement.URLRepositoryFormats with - sbt.librarymanagement.SshConnectionFormats with - sbt.librarymanagement.SshAuthenticationFormats with - sbt.librarymanagement.SshRepositoryFormats with - sbt.librarymanagement.SftpRepositoryFormats with - sbt.librarymanagement.PasswordAuthenticationFormats with - sbt.librarymanagement.KeyFileAuthenticationFormats => +trait ResolverFormats { self: sjsonnew.BasicJsonProtocol with sbt.librarymanagement.ChainedResolverFormats with sbt.librarymanagement.MavenRepoFormats with sbt.librarymanagement.MavenCacheFormats with sbt.librarymanagement.PatternsFormats with sbt.librarymanagement.FileConfigurationFormats with sbt.librarymanagement.FileRepositoryFormats with sbt.librarymanagement.URLRepositoryFormats with sbt.librarymanagement.SshConnectionFormats with sbt.librarymanagement.SshAuthenticationFormats with sbt.librarymanagement.SshRepositoryFormats with sbt.librarymanagement.SftpRepositoryFormats => implicit lazy val ResolverFormat: JsonFormat[sbt.librarymanagement.Resolver] = flatUnionFormat7[sbt.librarymanagement.Resolver, sbt.librarymanagement.ChainedResolver, sbt.librarymanagement.MavenRepo, sbt.librarymanagement.MavenCache, sbt.librarymanagement.FileRepository, sbt.librarymanagement.URLRepository, sbt.librarymanagement.SshRepository, sbt.librarymanagement.SftpRepository]("type") } diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SftpRepositoryFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SftpRepositoryFormats.scala index 2a2f49073..9441ada31 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SftpRepositoryFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SftpRepositoryFormats.scala @@ -5,12 +5,7 @@ // DO NOT EDIT MANUALLY package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } -trait SftpRepositoryFormats { self: sbt.librarymanagement.PatternsFormats with - sjsonnew.BasicJsonProtocol with - sbt.librarymanagement.SshConnectionFormats with - sbt.librarymanagement.SshAuthenticationFormats with - sbt.librarymanagement.PasswordAuthenticationFormats with - sbt.librarymanagement.KeyFileAuthenticationFormats => +trait SftpRepositoryFormats { self: sbt.librarymanagement.PatternsFormats with sjsonnew.BasicJsonProtocol with sbt.librarymanagement.SshConnectionFormats with sbt.librarymanagement.SshAuthenticationFormats => implicit lazy val SftpRepositoryFormat: JsonFormat[sbt.librarymanagement.SftpRepository] = new JsonFormat[sbt.librarymanagement.SftpRepository] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.SftpRepository = { __jsOpt match { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepositoryFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepositoryFormats.scala index b16f32821..8143d7239 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepositoryFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepositoryFormats.scala @@ -6,13 +6,6 @@ package sbt.librarymanagement import _root_.sjsonnew.JsonFormat -trait SshBasedRepositoryFormats { self: sbt.librarymanagement.PatternsFormats with - sjsonnew.BasicJsonProtocol with - sbt.librarymanagement.SshConnectionFormats with - sbt.librarymanagement.SshAuthenticationFormats with - sbt.librarymanagement.SshRepositoryFormats with - sbt.librarymanagement.SftpRepositoryFormats with - sbt.librarymanagement.PasswordAuthenticationFormats with - sbt.librarymanagement.KeyFileAuthenticationFormats => +trait SshBasedRepositoryFormats { self: sbt.librarymanagement.PatternsFormats with sjsonnew.BasicJsonProtocol with sbt.librarymanagement.SshConnectionFormats with sbt.librarymanagement.SshAuthenticationFormats with sbt.librarymanagement.SshRepositoryFormats with sbt.librarymanagement.SftpRepositoryFormats => implicit lazy val SshBasedRepositoryFormat: JsonFormat[sbt.librarymanagement.SshBasedRepository] = flatUnionFormat2[sbt.librarymanagement.SshBasedRepository, sbt.librarymanagement.SshRepository, sbt.librarymanagement.SftpRepository]("type") } diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SshConnectionFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SshConnectionFormats.scala index db4ea41e5..9daea2940 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SshConnectionFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SshConnectionFormats.scala @@ -5,10 +5,7 @@ // DO NOT EDIT MANUALLY package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } -trait SshConnectionFormats { self: sbt.librarymanagement.SshAuthenticationFormats with - sjsonnew.BasicJsonProtocol with - sbt.librarymanagement.PasswordAuthenticationFormats with - sbt.librarymanagement.KeyFileAuthenticationFormats => +trait SshConnectionFormats { self: sbt.librarymanagement.SshAuthenticationFormats with sjsonnew.BasicJsonProtocol => implicit lazy val SshConnectionFormat: JsonFormat[sbt.librarymanagement.SshConnection] = new JsonFormat[sbt.librarymanagement.SshConnection] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.SshConnection = { __jsOpt match { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/SshRepositoryFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/SshRepositoryFormats.scala index 2b3c4893b..861d359b1 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/SshRepositoryFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/SshRepositoryFormats.scala @@ -5,12 +5,7 @@ // DO NOT EDIT MANUALLY package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } -trait SshRepositoryFormats { self: sbt.librarymanagement.PatternsFormats with - sjsonnew.BasicJsonProtocol with - sbt.librarymanagement.SshConnectionFormats with - sbt.librarymanagement.SshAuthenticationFormats with - sbt.librarymanagement.PasswordAuthenticationFormats with - sbt.librarymanagement.KeyFileAuthenticationFormats => +trait SshRepositoryFormats { self: sbt.librarymanagement.PatternsFormats with sjsonnew.BasicJsonProtocol with sbt.librarymanagement.SshConnectionFormats with sbt.librarymanagement.SshAuthenticationFormats => implicit lazy val SshRepositoryFormat: JsonFormat[sbt.librarymanagement.SshRepository] = new JsonFormat[sbt.librarymanagement.SshRepository] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.SshRepository = { __jsOpt match { diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReport.scala b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReport.scala index 0e3c68f1a..3e8bcbe1a 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReport.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReport.scala @@ -16,7 +16,7 @@ final class UpdateReport private ( val cachedDescriptor: java.io.File, val configurations: Vector[sbt.librarymanagement.ConfigurationReport], val stats: sbt.librarymanagement.UpdateStats, - val stamps: Map[java.io.File, Long]) extends sbt.librarymanagement.UpdateReportExtra with Serializable { + val stamps: Map[String, Long]) extends sbt.librarymanagement.UpdateReportExtra with Serializable { @@ -30,7 +30,7 @@ final class UpdateReport private ( override def toString: String = { "Update report:\n\t" + stats + "\n" + configurations.mkString } - private[this] def copy(cachedDescriptor: java.io.File = cachedDescriptor, configurations: Vector[sbt.librarymanagement.ConfigurationReport] = configurations, stats: sbt.librarymanagement.UpdateStats = stats, stamps: Map[java.io.File, Long] = stamps): UpdateReport = { + private[this] def copy(cachedDescriptor: java.io.File = cachedDescriptor, configurations: Vector[sbt.librarymanagement.ConfigurationReport] = configurations, stats: sbt.librarymanagement.UpdateStats = stats, stamps: Map[String, Long] = stamps): UpdateReport = { new UpdateReport(cachedDescriptor, configurations, stats, stamps) } def withCachedDescriptor(cachedDescriptor: java.io.File): UpdateReport = { @@ -42,11 +42,11 @@ final class UpdateReport private ( def withStats(stats: sbt.librarymanagement.UpdateStats): UpdateReport = { copy(stats = stats) } - def withStamps(stamps: Map[java.io.File, Long]): UpdateReport = { + def withStamps(stamps: Map[String, Long]): UpdateReport = { copy(stamps = stamps) } } object UpdateReport { - def apply(cachedDescriptor: java.io.File, configurations: Vector[sbt.librarymanagement.ConfigurationReport], stats: sbt.librarymanagement.UpdateStats, stamps: Map[java.io.File, Long]): UpdateReport = new UpdateReport(cachedDescriptor, configurations, stats, stamps) + def apply(cachedDescriptor: java.io.File, configurations: Vector[sbt.librarymanagement.ConfigurationReport], stats: sbt.librarymanagement.UpdateStats, stamps: Map[String, Long]): UpdateReport = new UpdateReport(cachedDescriptor, configurations, stats, stamps) } diff --git a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportFormats.scala b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportFormats.scala index 41951020d..36ea7c27a 100644 --- a/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportFormats.scala +++ b/core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportFormats.scala @@ -14,7 +14,7 @@ implicit lazy val UpdateReportFormat: JsonFormat[sbt.librarymanagement.UpdateRep val cachedDescriptor = unbuilder.readField[java.io.File]("cachedDescriptor") val configurations = unbuilder.readField[Vector[sbt.librarymanagement.ConfigurationReport]]("configurations") val stats = unbuilder.readField[sbt.librarymanagement.UpdateStats]("stats") - val stamps = unbuilder.readField[Map[java.io.File, Long]]("stamps") + val stamps = unbuilder.readField[Map[String, Long]]("stamps") unbuilder.endObject() sbt.librarymanagement.UpdateReport(cachedDescriptor, configurations, stats, stamps) case None => diff --git a/core/src/main/contraband/librarymanagement.json b/core/src/main/contraband/librarymanagement.json index 6b210d34c..89d20007d 100644 --- a/core/src/main/contraband/librarymanagement.json +++ b/core/src/main/contraband/librarymanagement.json @@ -814,7 +814,7 @@ "type": "sbt.librarymanagement.UpdateStats", "doc": [ "stats information about the update that produced this report" ] }, - { "name": "stamps", "type": "Map[java.io.File, Long]" } + { "name": "stamps", "type": "Map[String, Long]" } ], "toString": "\"Update report:\\n\\t\" + stats + \"\\n\" + configurations.mkString" }, diff --git a/core/src/main/scala/sbt/librarymanagement/RichUpdateReport.scala b/core/src/main/scala/sbt/librarymanagement/RichUpdateReport.scala index 9060f14b6..321790def 100644 --- a/core/src/main/scala/sbt/librarymanagement/RichUpdateReport.scala +++ b/core/src/main/scala/sbt/librarymanagement/RichUpdateReport.scala @@ -14,7 +14,7 @@ final class RichUpdateReport(report: UpdateReport) { val stamps = files .map(f => ( - f, + f.toString, // TODO: The list of files may also contain some odd files that do not actually exist like: // "./target/ivyhome/resolution-cache/com.example/foo/0.4.0/resolved.xml.xml". // IO.getModifiedTimeOrZero() will just return zero, but the list of files should not contain such diff --git a/core/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala b/core/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala index b54058e8c..c8b3ac69c 100644 --- a/core/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala +++ b/core/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala @@ -123,7 +123,7 @@ private[librarymanagement] abstract class UpdateReportExtra { def cachedDescriptor: File def configurations: Vector[ConfigurationReport] def stats: UpdateStats - private[sbt] def stamps: Map[File, Long] + private[sbt] def stamps: Map[String, Long] private[sbt] def moduleKey(m: ModuleID) = (m.organization, m.name, m.revision) diff --git a/ivy/src/test/scala/sbt/internal/librarymanagement/DMSerializationSpec.scala b/ivy/src/test/scala/sbt/internal/librarymanagement/DMSerializationSpec.scala index 7487252d1..bc035efa1 100644 --- a/ivy/src/test/scala/sbt/internal/librarymanagement/DMSerializationSpec.scala +++ b/ivy/src/test/scala/sbt/internal/librarymanagement/DMSerializationSpec.scala @@ -75,7 +75,7 @@ object DMSerializationSpec extends BasicTestSuite { new File("./foo"), Vector(configurationReportExample), UpdateStats(0, 0, 0, false), - Map(new File("./foo") -> 0) + Map("./foo" -> 0) ) lazy val configurationReportExample = ConfigurationReport(