luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9282 from eed3si9n/wip/bump-sjsonnew 

[2.x] sjson-new 0.15.0 + Contraband 0.9.0
This commit is contained in:
eugene yokota 2026-06-01 02:20:16 -04:00 committed by GitHub
parent 619e034ec9 f327ef14d0
commit b34323c39e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 4 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -409,7 +409,7 @@ lazy val hashBenchmark = (project in file("internal") / "hash-benchmark")
utilCommonSettings,
name := "Hash Benchmark",
Jmh / run / javaOptions ++= Seq("-Xmx1G", "-Dfile.encoding=UTF8"),
libraryDependencies += blake3,
libraryDependencies ++= Seq(blake3, zeroAllocationHashing),
mimaSettings,
publish / skip := true,
)

2
internal/hash-benchmark/src/main/scala/sbt/internal/util/FileHashBenchmark.scala
View File

@ -8,7 +8,7 @@ import sbt.io.syntax.*
import sbt.util.Digest
import scala.util.Using
import org.openjdk.jmh.annotations.*
import pt.kcry.blake3.{ Blake3 as Blake3Impl }
import pt.kcry.blake3.Blake3 as Blake3Impl
@State(Scope.Benchmark)
abstract class AbstractFileHashBenchmark:

7
internal/util-logging/src/main/contraband-scala/sbt/internal/util/AbstractEntry.scala generated
View File

@ -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 + ")"
}

7
lm-core/src/main/contraband-scala/sbt/librarymanagement/MavenRepository.scala generated
View File

@ -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 + ")"
}

7
lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleSettings.scala generated
View File

@ -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 + ")"
}

7
lm-core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepository.scala generated
View File

@ -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 + ")"
}

7
lm-core/src/main/contraband-scala/sbt/librarymanagement/Resolver.scala generated
View File

@ -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 + ")"
}

7
lm-core/src/main/contraband-scala/sbt/librarymanagement/SshAuthentication.scala generated
View File

@ -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()"
}

7
lm-core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepository.scala generated
View File

@ -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 + ")"
}

7
lm-ivy/src/main/contraband-scala/sbt/internal/librarymanagement/ivy/IvyConfiguration.scala generated
View File

@ -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 + ")"
}

7
main/src/main/contraband-scala/sbt/internal/remotecache/RemoteCacheArtifact.scala generated
View File

@ -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 + ")"
}

2
project/Dependencies.scala
View File

@ -62,7 +62,7 @@ object Dependencies {
def addSbtZinc = addSbtModule(sbtZincPath, "zinc", zinc)
def addSbtZincCompileCore = addSbtModule(sbtZincPath, "zincCompileCore", zincCompileCore)
lazy val sjsonNewVersion = "0.14.0"
lazy val sjsonNewVersion = "0.15.0"
def sjsonNew(n: String) = Def.setting(
"com.eed3si9n" %% n % sjsonNewVersion
) // contrabandSjsonNewVersion.value

2
project/plugins.sbt
View File

@ -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")

7
protocol/src/main/contraband-scala/sbt/internal/langserver/TextDocumentPositionParamsInterface.scala generated
View File

@ -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 + ")"
}

7
protocol/src/main/contraband-scala/sbt/internal/protocol/JsonRpcMessage.scala generated
View File

@ -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 + ")"
}

7
protocol/src/main/contraband-scala/sbt/protocol/CommandMessage.scala generated
View File

@ -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()"
}

7
protocol/src/main/contraband-scala/sbt/protocol/EventMessage.scala generated
View File

@ -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()"
}

7
protocol/src/main/contraband-scala/sbt/protocol/SettingQueryResponse.scala generated
View File

@ -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()"
}

7
testing/src/main/contraband-scala/sbt/protocol/testing/TestMessage.scala generated
View File

@ -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()"
}