From c1219702d54d28d3840f9654c1f5df50278b60df Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 1 Jun 2026 01:43:59 -0400 Subject: [PATCH] Contraband 0.9.0 --- .../contraband-scala/sbt/internal/util/AbstractEntry.scala | 7 ------- .../sbt/librarymanagement/MavenRepository.scala | 7 ------- .../sbt/librarymanagement/ModuleSettings.scala | 7 ------- .../sbt/librarymanagement/PatternsBasedRepository.scala | 7 ------- .../contraband-scala/sbt/librarymanagement/Resolver.scala | 7 ------- .../sbt/librarymanagement/SshAuthentication.scala | 7 ------- .../sbt/librarymanagement/SshBasedRepository.scala | 7 ------- .../internal/librarymanagement/ivy/IvyConfiguration.scala | 7 ------- .../sbt/internal/remotecache/RemoteCacheArtifact.scala | 7 ------- project/plugins.sbt | 2 +- .../langserver/TextDocumentPositionParamsInterface.scala | 7 ------- .../sbt/internal/protocol/JsonRpcMessage.scala | 7 ------- .../contraband-scala/sbt/protocol/CommandMessage.scala | 7 ------- .../main/contraband-scala/sbt/protocol/EventMessage.scala | 7 ------- .../sbt/protocol/SettingQueryResponse.scala | 7 ------- .../sbt/protocol/testing/TestMessage.scala | 7 ------- 16 files changed, 1 insertion(+), 106 deletions(-) diff --git a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/AbstractEntry.scala b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/AbstractEntry.scala index 259ecd727..b4f178f6f 100644 --- a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/AbstractEntry.scala +++ b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/AbstractEntry.scala @@ -11,13 +11,6 @@ abstract class AbstractEntry( - override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match { - case x: AbstractEntry => (this.channelName == x.channelName) && (this.execId == x.execId) - case _ => false - }) - override def hashCode: Int = { - 37 * (37 * (37 * (17 + "sbt.internal.util.AbstractEntry".##) + channelName.##) + execId.##) - } override def toString: String = { "AbstractEntry(" + channelName + ", " + execId + ")" } diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/MavenRepository.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/MavenRepository.scala index 02c441bea..013f131e3 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/MavenRepository.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/MavenRepository.scala @@ -19,13 +19,6 @@ abstract class MavenRepository( def this(name: String, root: String) = this(name, root, true) - override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match { - case x: MavenRepository => (this.name == x.name) && (this.root == x.root) && (this.localIfFile == x.localIfFile) - case _ => false - }) - override def hashCode: Int = { - 37 * (37 * (37 * (37 * (17 + "sbt.librarymanagement.MavenRepository".##) + name.##) + root.##) + localIfFile.##) - } override def toString: String = { "MavenRepository(" + name + ", " + root + ", " + localIfFile + ")" } diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleSettings.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleSettings.scala index f00b13b1e..d202001fe 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleSettings.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleSettings.scala @@ -11,13 +11,6 @@ abstract class ModuleSettings( def this() = this(false, None) - override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match { - case x: ModuleSettings => (this.validate == x.validate) && (this.scalaModuleInfo == x.scalaModuleInfo) - case _ => false - }) - override def hashCode: Int = { - 37 * (37 * (37 * (17 + "sbt.librarymanagement.ModuleSettings".##) + validate.##) + scalaModuleInfo.##) - } override def toString: String = { "ModuleSettings(" + validate + ", " + scalaModuleInfo + ")" } diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepository.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepository.scala index 1375a9d55..3e9e90915 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepository.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepository.scala @@ -12,13 +12,6 @@ abstract class PatternsBasedRepository( - override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match { - case x: PatternsBasedRepository => (this.name == x.name) && (this.patterns == x.patterns) - case _ => false - }) - override def hashCode: Int = { - 37 * (37 * (37 * (17 + "sbt.librarymanagement.PatternsBasedRepository".##) + name.##) + patterns.##) - } override def toString: String = { "PatternsBasedRepository(" + name + ", " + patterns + ")" } diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/Resolver.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/Resolver.scala index 08578e95f..a8cff8aad 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/Resolver.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/Resolver.scala @@ -11,13 +11,6 @@ abstract class Resolver( - override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match { - case x: Resolver => (this.name == x.name) - case _ => false - }) - override def hashCode: Int = { - 37 * (37 * (17 + "sbt.librarymanagement.Resolver".##) + name.##) - } override def toString: String = { "Resolver(" + name + ")" } diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshAuthentication.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshAuthentication.scala index 33b5f2654..b4f19e72e 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshAuthentication.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshAuthentication.scala @@ -9,13 +9,6 @@ abstract class SshAuthentication() extends Serializable { -override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match { - case _: SshAuthentication => true - case _ => false -}) -override def hashCode: Int = { - 37 * (17 + "sbt.librarymanagement.SshAuthentication".##) -} override def toString: String = { "SshAuthentication()" } diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepository.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepository.scala index a066c7015..71921b55b 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepository.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepository.scala @@ -13,13 +13,6 @@ abstract class SshBasedRepository( - override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match { - case x: SshBasedRepository => (this.name == x.name) && (this.patterns == x.patterns) && (this.connection == x.connection) - case _ => false - }) - override def hashCode: Int = { - 37 * (37 * (37 * (37 * (17 + "sbt.librarymanagement.SshBasedRepository".##) + name.##) + patterns.##) + connection.##) - } override def toString: String = { "SshBasedRepository(" + name + ", " + patterns + ", " + connection + ")" } diff --git a/lm-ivy/src/main/contraband-scala/sbt/internal/librarymanagement/ivy/IvyConfiguration.scala b/lm-ivy/src/main/contraband-scala/sbt/internal/librarymanagement/ivy/IvyConfiguration.scala index 92621aeb0..fbc13fc00 100644 --- a/lm-ivy/src/main/contraband-scala/sbt/internal/librarymanagement/ivy/IvyConfiguration.scala +++ b/lm-ivy/src/main/contraband-scala/sbt/internal/librarymanagement/ivy/IvyConfiguration.scala @@ -12,13 +12,6 @@ abstract class IvyConfiguration( def this() = this(None, None, sbt.internal.librarymanagement.ivy.UpdateOptions()) - override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match { - case x: IvyConfiguration => (this.lock == x.lock) && (this.log == x.log) && (this.updateOptions == x.updateOptions) - case _ => false - }) - override def hashCode: Int = { - 37 * (37 * (37 * (37 * (17 + "sbt.internal.librarymanagement.ivy.IvyConfiguration".##) + lock.##) + log.##) + updateOptions.##) - } override def toString: String = { "IvyConfiguration(" + lock + ", " + log + ", " + updateOptions + ")" } diff --git a/main/src/main/contraband-scala/sbt/internal/remotecache/RemoteCacheArtifact.scala b/main/src/main/contraband-scala/sbt/internal/remotecache/RemoteCacheArtifact.scala index b0feb2b3a..5fa874bad 100644 --- a/main/src/main/contraband-scala/sbt/internal/remotecache/RemoteCacheArtifact.scala +++ b/main/src/main/contraband-scala/sbt/internal/remotecache/RemoteCacheArtifact.scala @@ -11,13 +11,6 @@ abstract class RemoteCacheArtifact( - override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match { - case x: RemoteCacheArtifact => (this.artifact == x.artifact) && (this.packaged == x.packaged) - case _ => false - }) - override def hashCode: Int = { - 37 * (37 * (37 * (17 + "sbt.internal.remotecache.RemoteCacheArtifact".##) + artifact.##) + packaged.##) - } override def toString: String = { "RemoteCacheArtifact(" + artifact + ", " + packaged + ")" } diff --git a/project/plugins.sbt b/project/plugins.sbt index 43bfde102..d4c7f739a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,7 +4,7 @@ scalacOptions ++= Seq("-feature", "-Ywarn-unused:_,-imports") addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.1") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.6.0") -addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.8.0") +addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.9.0") addSbtPlugin("com.github.sbt" % "sbt-header" % "5.11.0") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.5") diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/TextDocumentPositionParamsInterface.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/TextDocumentPositionParamsInterface.scala index 9102befd9..afb88ae71 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/TextDocumentPositionParamsInterface.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/TextDocumentPositionParamsInterface.scala @@ -12,13 +12,6 @@ abstract class TextDocumentPositionParamsInterface( - override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match { - case x: TextDocumentPositionParamsInterface => (this.textDocument == x.textDocument) && (this.position == x.position) - case _ => false - }) - override def hashCode: Int = { - 37 * (37 * (37 * (17 + "sbt.internal.langserver.TextDocumentPositionParamsInterface".##) + textDocument.##) + position.##) - } override def toString: String = { "TextDocumentPositionParamsInterface(" + textDocument + ", " + position + ")" } diff --git a/protocol/src/main/contraband-scala/sbt/internal/protocol/JsonRpcMessage.scala b/protocol/src/main/contraband-scala/sbt/internal/protocol/JsonRpcMessage.scala index 8938db035..b8c05efde 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/protocol/JsonRpcMessage.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/protocol/JsonRpcMessage.scala @@ -11,13 +11,6 @@ abstract class JsonRpcMessage( - override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match { - case x: JsonRpcMessage => (this.jsonrpc == x.jsonrpc) - case _ => false - }) - override def hashCode: Int = { - 37 * (37 * (17 + "sbt.internal.protocol.JsonRpcMessage".##) + jsonrpc.##) - } override def toString: String = { "JsonRpcMessage(" + jsonrpc + ")" } diff --git a/protocol/src/main/contraband-scala/sbt/protocol/CommandMessage.scala b/protocol/src/main/contraband-scala/sbt/protocol/CommandMessage.scala index da6ba9eb9..ede0ee30b 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/CommandMessage.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/CommandMessage.scala @@ -10,13 +10,6 @@ abstract class CommandMessage() extends Serializable { -override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match { - case _: CommandMessage => true - case _ => false -}) -override def hashCode: Int = { - 37 * (17 + "sbt.protocol.CommandMessage".##) -} override def toString: String = { "CommandMessage()" } diff --git a/protocol/src/main/contraband-scala/sbt/protocol/EventMessage.scala b/protocol/src/main/contraband-scala/sbt/protocol/EventMessage.scala index 109c2287a..0b361fcc1 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/EventMessage.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/EventMessage.scala @@ -10,13 +10,6 @@ abstract class EventMessage() extends Serializable { -override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match { - case _: EventMessage => true - case _ => false -}) -override def hashCode: Int = { - 37 * (17 + "sbt.protocol.EventMessage".##) -} override def toString: String = { "EventMessage()" } diff --git a/protocol/src/main/contraband-scala/sbt/protocol/SettingQueryResponse.scala b/protocol/src/main/contraband-scala/sbt/protocol/SettingQueryResponse.scala index 8e2a290b4..5fbaed29d 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/SettingQueryResponse.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/SettingQueryResponse.scala @@ -9,13 +9,6 @@ abstract class SettingQueryResponse() extends sbt.protocol.EventMessage() with S -override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match { - case _: SettingQueryResponse => true - case _ => false -}) -override def hashCode: Int = { - 37 * (17 + "sbt.protocol.SettingQueryResponse".##) -} override def toString: String = { "SettingQueryResponse()" } diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/TestMessage.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/TestMessage.scala index f0ec89dbc..24691563e 100644 --- a/testing/src/main/contraband-scala/sbt/protocol/testing/TestMessage.scala +++ b/testing/src/main/contraband-scala/sbt/protocol/testing/TestMessage.scala @@ -10,13 +10,6 @@ abstract class TestMessage() extends Serializable { -override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match { - case _: TestMessage => true - case _ => false -}) -override def hashCode: Int = { - 37 * (17 + "sbt.protocol.testing.TestMessage".##) -} override def toString: String = { "TestMessage()" }