From b2b4d7b73fcd4bb3806d327e49fa4000868e2113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Mon, 21 Dec 2020 13:47:10 +0000 Subject: [PATCH 1/2] Update sbt-contraband to 0.5.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e63f16e1..762a07bd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.2") -addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.4.1") +addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.5.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0") addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.14") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.1.0") From 3fafb62f77c4cde0a3592bdfd8583c33d14f3f04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Mon, 21 Dec 2020 18:24:41 +0000 Subject: [PATCH 2/2] regen contraband --- io/src/main/contraband-scala/sbt/io/CopyOptions.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/io/src/main/contraband-scala/sbt/io/CopyOptions.scala b/io/src/main/contraband-scala/sbt/io/CopyOptions.scala index 78b145e0..1aaeb25b 100644 --- a/io/src/main/contraband-scala/sbt/io/CopyOptions.scala +++ b/io/src/main/contraband-scala/sbt/io/CopyOptions.scala @@ -20,10 +20,10 @@ final class CopyOptions private ( private def this() = this(false, false, true) - override def equals(o: Any): Boolean = o match { + override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match { case x: CopyOptions => (this.overwrite == x.overwrite) && (this.preserveLastModified == x.preserveLastModified) && (this.preserveExecutable == x.preserveExecutable) case _ => false - } + }) override def hashCode: Int = { 37 * (37 * (37 * (37 * (17 + "sbt.io.CopyOptions".##) + overwrite.##) + preserveLastModified.##) + preserveExecutable.##) }