From 2fa3159f18942883754e9ff7024ae85c3487d64b Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 18 Sep 2025 11:50:58 -0400 Subject: [PATCH] Update to Contraband 0.8.0 --- build.sbt | 20 ++++++++++++++-- .../sbt/internal/util/LogOption.scala | 11 +++++---- .../sbt/internal/util/SuccessEvent.scala | 2 +- .../util/codec/AbstractEntryFormats.scala | 2 +- .../util/codec/LogOptionFormats.scala | 2 +- .../util/codec/ProgressEventFormats.scala | 2 +- .../util/codec/ProgressItemFormats.scala | 2 +- .../util/codec/StringEventFormats.scala | 2 +- .../util/codec/SuccessEventFormats.scala | 2 +- .../util/codec/TraceEventFormats.scala | 2 +- .../sbt/internal/util/ManagedLogger.scala | 2 +- .../src/test/scala/ManagedLoggerSpec.scala | 8 +++---- .../librarymanagement/SemSelAndChunk.scala | 2 +- .../librarymanagement/UpdateReportLite.scala | 2 +- .../librarymanagement/ArtifactFormats.scala | 2 +- .../ArtifactTypeFilterFormats.scala | 2 +- .../sbt/librarymanagement/CallerFormats.scala | 2 +- .../ChainedResolverFormats.scala | 2 +- .../librarymanagement/ChecksumFormats.scala | 2 +- .../ConfigurationReportFormats.scala | 2 +- .../ConfigurationReportLiteFormats.scala | 2 +- .../ConflictManagerFormats.scala | 2 +- .../librarymanagement/DeveloperFormats.scala | 2 +- .../FileConfigurationFormats.scala | 2 +- .../FileRepositoryFormats.scala | 2 +- .../GetClassifiersConfigurationFormats.scala | 2 +- .../GetClassifiersModuleFormats.scala | 2 +- .../InclExclRuleFormats.scala | 2 +- .../IvyFileConfigurationFormats.scala | 2 +- .../librarymanagement/IvyPathsFormats.scala | 2 +- .../KeyFileAuthenticationFormats.scala | 2 +- .../librarymanagement/LicenseFormats.scala | 2 +- .../librarymanagement/MavenCacheFormats.scala | 2 +- .../librarymanagement/MavenRepoFormats.scala | 2 +- .../MavenRepositoryFormats.scala | 2 +- .../ModuleConfigurationFormats.scala | 2 +- ...ModuleDescriptorConfigurationFormats.scala | 2 +- .../librarymanagement/ModuleIDFormats.scala | 2 +- .../librarymanagement/ModuleInfoFormats.scala | 2 +- .../ModuleReportFormats.scala | 2 +- .../ModuleSettingsFormats.scala | 2 +- .../OrganizationArtifactReportFormats.scala | 2 +- .../PasswordAuthenticationFormats.scala | 2 +- .../PatternsBasedRepositoryFormats.scala | 2 +- .../librarymanagement/PatternsFormats.scala | 2 +- .../PomConfigurationFormats.scala | 2 +- .../PublishConfigurationFormats.scala | 2 +- .../librarymanagement/ResolverFormats.scala | 2 +- .../RetrieveConfigurationFormats.scala | 2 +- .../ScalaModuleInfoFormats.scala | 2 +- .../librarymanagement/ScmInfoFormats.scala | 2 +- .../librarymanagement/SemanticSelector.scala | 2 +- .../SftpRepositoryFormats.scala | 2 +- .../SshAuthenticationFormats.scala | 2 +- .../SshBasedRepositoryFormats.scala | 2 +- .../SshConnectionFormats.scala | 2 +- .../SshRepositoryFormats.scala | 2 +- .../URLRepositoryFormats.scala | 2 +- .../UpdateConfigurationFormats.scala | 2 +- .../sbt/librarymanagement/UpdateLogging.scala | 13 +++++----- .../UpdateLoggingFormats.scala | 2 +- .../UpdateReportFormats.scala | 2 +- .../UpdateReportLiteFormats.scala | 2 +- .../UpdateStatsFormats.scala | 2 +- .../internal/librarymanagement/JsonUtil.scala | 2 +- .../sbt/librarymanagement/ModuleIdTest.scala | 4 ++-- .../ivy/ExternalIvyConfigurationFormats.scala | 2 +- .../ivy/InlineIvyConfigurationFormats.scala | 2 +- .../ivy/IvyConfigurationFormats.scala | 2 +- .../sbt/internal/librarymanagement/Ivy.scala | 24 ++++++++++++------- .../sbt/internal/sona/DeploymentState.scala | 17 ++++++------- .../sona/codec/DeploymentStateFormats.scala | 2 +- .../sona/codec/PublisherStatusFormats.scala | 2 +- .../main/scala/sbt/internal/sona/Sona.scala | 2 +- .../src/test/scala/sbt/CacheIvyTest.scala | 2 +- .../contraband-scala/sbt/CommandSource.scala | 2 +- .../contraband-scala/sbt/ConnectionType.scala | 9 +++---- .../sbt/ServerAuthentication.scala | 7 +++--- .../sbt/internal/CommandSourceFormats.scala | 2 +- .../sbt/internal/ConnectionTypeFormats.scala | 2 +- .../sbt/internal/ExecFormats.scala | 2 +- .../ServerAuthenticationFormats.scala | 2 +- .../sbt/internal/client/NetworkClient.scala | 8 +++---- .../scala/sbt/internal/server/Server.scala | 4 ++-- main/src/main/scala/sbt/Defaults.scala | 1 - main/src/main/scala/sbt/RemoteCache.scala | 2 +- .../scala/sbt/internal/CommandExchange.scala | 2 +- .../sbt/internal/LibraryManagement.scala | 8 +++---- .../src/main/scala/sbt/internal/RunUtil.scala | 4 ++-- .../sbt/internal/server/BspCompileTask.scala | 2 +- .../server/BuildServerEvalReporter.scala | 2 +- .../internal/server/BuildServerReporter.scala | 2 +- .../sbt/internal/server/Definition.scala | 6 ++--- .../server/LanguageServerProtocol.scala | 2 +- .../sbt/internal/server/NetworkChannel.scala | 4 ++-- .../sbt/internal/server/VirtualTerminal.scala | 2 +- project/plugins.sbt | 2 +- .../bsp/BuildClientCapabilities.scala | 2 +- .../internal/bsp/BuildTargetIdentifier.scala | 2 +- .../sbt/internal/bsp/CleanCacheParams.scala | 2 +- .../sbt/internal/bsp/CompileProvider.scala | 2 +- .../sbt/internal/bsp/CompileTask.scala | 2 +- .../sbt/internal/bsp/DebugProvider.scala | 2 +- .../internal/bsp/DebugSessionAddress.scala | 2 +- .../bsp/DependencySourcesParams.scala | 2 +- .../bsp/DependencySourcesResult.scala | 2 +- .../sbt/internal/bsp/JavacOptionsParams.scala | 2 +- .../sbt/internal/bsp/JavacOptionsResult.scala | 2 +- .../sbt/internal/bsp/OutputPathsParams.scala | 2 +- .../sbt/internal/bsp/OutputPathsResult.scala | 2 +- .../sbt/internal/bsp/ResourcesParams.scala | 2 +- .../sbt/internal/bsp/ResourcesResult.scala | 2 +- .../sbt/internal/bsp/RunProvider.scala | 2 +- .../sbt/internal/bsp/ScalaDiagnostic.scala | 2 +- .../sbt/internal/bsp/ScalaTestParams.scala | 2 +- .../sbt/internal/bsp/ScalaWorkspaceEdit.scala | 2 +- .../internal/bsp/ScalacOptionsParams.scala | 2 +- .../internal/bsp/ScalacOptionsResult.scala | 2 +- .../sbt/internal/bsp/SourcesParams.scala | 2 +- .../sbt/internal/bsp/SourcesResult.scala | 2 +- .../sbt/internal/bsp/TestProvider.scala | 2 +- .../internal/bsp/TextDocumentIdentifier.scala | 2 +- .../bsp/WorkspaceBuildTargetsResult.scala | 2 +- .../bsp/codec/BspCompileResultFormats.scala | 2 +- .../codec/BspConnectionDetailsFormats.scala | 2 +- .../BuildClientCapabilitiesFormats.scala | 2 +- .../BuildServerCapabilitiesFormats.scala | 2 +- .../BuildTargetCapabilitiesFormats.scala | 2 +- .../bsp/codec/BuildTargetFormats.scala | 2 +- .../codec/BuildTargetIdentifierFormats.scala | 2 +- .../bsp/codec/CleanCacheParamsFormats.scala | 2 +- .../bsp/codec/CleanCacheResultFormats.scala | 2 +- .../bsp/codec/CompileParamsFormats.scala | 2 +- .../bsp/codec/CompileProviderFormats.scala | 2 +- .../bsp/codec/CompileReportFormats.scala | 2 +- .../bsp/codec/CompileTaskFormats.scala | 2 +- .../bsp/codec/DebugProviderFormats.scala | 2 +- .../codec/DebugSessionAddressFormats.scala | 2 +- .../bsp/codec/DebugSessionParamsFormats.scala | 2 +- .../codec/DependencySourcesItemFormats.scala | 2 +- .../DependencySourcesParamsFormats.scala | 2 +- .../DependencySourcesResultFormats.scala | 2 +- .../bsp/codec/DiagnosticFormats.scala | 2 +- .../DiagnosticRelatedInformationFormats.scala | 2 +- .../codec/InitializeBuildParamsFormats.scala | 2 +- .../codec/InitializeBuildResultFormats.scala | 2 +- .../bsp/codec/JavacOptionsItemFormats.scala | 2 +- .../bsp/codec/JavacOptionsParamsFormats.scala | 2 +- .../bsp/codec/JavacOptionsResultFormats.scala | 2 +- .../bsp/codec/JvmBuildTargetFormats.scala | 2 +- .../bsp/codec/JvmEnvironmentItemFormats.scala | 2 +- .../JvmRunEnvironmentParamsFormats.scala | 2 +- .../JvmRunEnvironmentResultFormats.scala | 2 +- .../JvmTestEnvironmentParamsFormats.scala | 2 +- .../JvmTestEnvironmentResultFormats.scala | 2 +- .../internal/bsp/codec/LocationFormats.scala | 2 +- .../bsp/codec/MetalsMetadataFormats.scala | 2 +- .../bsp/codec/OutputPathItemFormats.scala | 2 +- .../bsp/codec/OutputPathsItemFormats.scala | 2 +- .../bsp/codec/OutputPathsParamsFormats.scala | 2 +- .../bsp/codec/OutputPathsResultFormats.scala | 2 +- .../internal/bsp/codec/PositionFormats.scala | 2 +- .../PublishDiagnosticsParamsFormats.scala | 2 +- .../sbt/internal/bsp/codec/RangeFormats.scala | 2 +- .../bsp/codec/ResourcesItemFormats.scala | 2 +- .../bsp/codec/ResourcesParamsFormats.scala | 2 +- .../bsp/codec/ResourcesResultFormats.scala | 2 +- .../internal/bsp/codec/RunParamsFormats.scala | 2 +- .../bsp/codec/RunProviderFormats.scala | 2 +- .../internal/bsp/codec/RunResultFormats.scala | 2 +- .../bsp/codec/SbtBuildTargetFormats.scala | 2 +- .../bsp/codec/ScalaActionFormats.scala | 2 +- .../bsp/codec/ScalaBuildTargetFormats.scala | 2 +- .../bsp/codec/ScalaDiagnosticFormats.scala | 2 +- .../bsp/codec/ScalaMainClassFormats.scala | 2 +- .../codec/ScalaMainClassesItemFormats.scala | 2 +- .../codec/ScalaMainClassesParamsFormats.scala | 2 +- .../codec/ScalaMainClassesResultFormats.scala | 2 +- .../codec/ScalaTestClassesItemFormats.scala | 2 +- .../codec/ScalaTestClassesParamsFormats.scala | 2 +- .../codec/ScalaTestClassesResultFormats.scala | 2 +- .../bsp/codec/ScalaTestParamsFormats.scala | 2 +- .../bsp/codec/ScalaTextEditFormats.scala | 2 +- .../bsp/codec/ScalaWorkspaceEditFormats.scala | 2 +- .../bsp/codec/ScalacOptionsItemFormats.scala | 2 +- .../codec/ScalacOptionsParamsFormats.scala | 2 +- .../codec/ScalacOptionsResultFormats.scala | 2 +- .../bsp/codec/SourceItemFormats.scala | 2 +- .../bsp/codec/SourcesItemFormats.scala | 2 +- .../bsp/codec/SourcesParamsFormats.scala | 2 +- .../bsp/codec/SourcesResultFormats.scala | 2 +- .../bsp/codec/TaskFinishParamsFormats.scala | 2 +- .../internal/bsp/codec/TaskIdFormats.scala | 2 +- .../bsp/codec/TaskProgressParamsFormats.scala | 2 +- .../bsp/codec/TaskStartParamsFormats.scala | 2 +- .../bsp/codec/TestParamsFormats.scala | 2 +- .../bsp/codec/TestProviderFormats.scala | 2 +- .../bsp/codec/TestResultFormats.scala | 2 +- .../codec/TextDocumentIdentifierFormats.scala | 2 +- .../WorkspaceBuildTargetsResultFormats.scala | 2 +- .../graph/codec/ModuleModelFormats.scala | 2 +- .../langserver/CancelRequestParams.scala | 2 +- .../langserver/ClientCapabilities.scala | 4 +--- .../langserver/InitializeResult.scala | 2 +- .../sbt/internal/langserver/SaveOptions.scala | 2 +- .../internal/langserver/SbtExecParams.scala | 2 +- .../langserver/TextDocumentIdentifier.scala | 2 +- .../codec/CancelRequestParamsFormats.scala | 2 +- .../codec/ClientCapabilitiesFormats.scala | 2 +- .../langserver/codec/DiagnosticFormats.scala | 2 +- .../codec/InitializeParamsFormats.scala | 2 +- .../codec/InitializeResultFormats.scala | 2 +- .../langserver/codec/LocationFormats.scala | 2 +- .../codec/LogMessageParamsFormats.scala | 2 +- .../langserver/codec/PositionFormats.scala | 2 +- .../PublishDiagnosticsParamsFormats.scala | 2 +- .../langserver/codec/RangeFormats.scala | 2 +- .../langserver/codec/SaveOptionsFormats.scala | 2 +- .../codec/SbtExecParamsFormats.scala | 2 +- .../codec/ServerCapabilitiesFormats.scala | 2 +- .../codec/TextDocumentIdentifierFormats.scala | 2 +- .../TextDocumentPositionParamsFormats.scala | 2 +- ...cumentPositionParamsInterfaceFormats.scala | 2 +- .../TextDocumentSyncOptionsFormats.scala | 2 +- .../codec/InitializeOptionFormats.scala | 2 +- .../protocol/codec/PortFileFormats.scala | 2 +- .../protocol/codec/TokenFileFormats.scala | 2 +- .../sbt/internal/worker/ClientJobParams.scala | 2 +- .../worker/codec/ClientJobParamsFormats.scala | 2 +- .../worker/codec/FilePathFormats.scala | 2 +- .../worker/codec/JvmRunInfoFormats.scala | 2 +- .../worker/codec/NativeRunInfoFormats.scala | 2 +- .../worker/codec/RunInfoFormats.scala | 2 +- .../sbt/protocol/Attach.scala | 2 +- .../sbt/protocol/ChannelAcceptedEvent.scala | 2 +- .../sbt/protocol/SettingQuery.scala | 2 +- .../sbt/protocol/SettingQueryFailure.scala | 2 +- .../protocol/TerminalAttributesQuery.scala | 4 +--- .../sbt/protocol/TerminalGetSizeQuery.scala | 4 +--- .../TerminalSetAttributesResponse.scala | 4 +--- .../sbt/protocol/TerminalSetEchoCommand.scala | 2 +- .../protocol/TerminalSetEchoResponse.scala | 4 +--- .../protocol/TerminalSetRawModeCommand.scala | 2 +- .../protocol/TerminalSetRawModeResponse.scala | 4 +--- .../protocol/TerminalSetSizeResponse.scala | 4 +--- .../sbt/protocol/codec/AttachFormats.scala | 2 +- .../codec/ChannelAcceptedEventFormats.scala | 2 +- .../codec/CommandMessageFormats.scala | 2 +- .../codec/CompletionParamsFormats.scala | 2 +- .../codec/CompletionResponseFormats.scala | 2 +- .../protocol/codec/EventMessageFormats.scala | 2 +- .../protocol/codec/ExecCommandFormats.scala | 2 +- .../codec/ExecStatusEventFormats.scala | 2 +- .../codec/ExecutionEventFormats.scala | 2 +- .../protocol/codec/InitCommandFormats.scala | 2 +- .../sbt/protocol/codec/LogEventFormats.scala | 2 +- .../codec/SettingQueryFailureFormats.scala | 2 +- .../protocol/codec/SettingQueryFormats.scala | 2 +- .../codec/SettingQueryResponseFormats.scala | 2 +- .../codec/SettingQuerySuccessFormats.scala | 2 +- .../TerminalAttributesQueryFormats.scala | 2 +- .../TerminalAttributesResponseFormats.scala | 2 +- .../TerminalCapabilitiesQueryFormats.scala | 2 +- .../TerminalCapabilitiesResponseFormats.scala | 2 +- .../codec/TerminalGetSizeQueryFormats.scala | 2 +- .../TerminalGetSizeResponseFormats.scala | 2 +- .../TerminalPropertiesResponseFormats.scala | 2 +- .../TerminalSetAttributesCommandFormats.scala | 2 +- ...TerminalSetAttributesResponseFormats.scala | 2 +- .../codec/TerminalSetEchoCommandFormats.scala | 2 +- .../TerminalSetEchoResponseFormats.scala | 2 +- .../TerminalSetRawModeCommandFormats.scala | 2 +- .../TerminalSetRawModeResponseFormats.scala | 2 +- .../codec/TerminalSetSizeCommandFormats.scala | 2 +- .../TerminalSetSizeResponseFormats.scala | 2 +- .../scala/sbt/protocol/ClientSocket.scala | 2 +- .../scala/sbt/protocol/Serialization.scala | 16 ++++++------- .../testing/StartTestGroupEvent.scala | 2 +- .../protocol/testing/TestCompleteEvent.scala | 2 +- .../sbt/protocol/testing/TestInitEvent.scala | 4 +--- .../sbt/protocol/testing/TestResult.scala | 13 +++++----- .../protocol/testing/TestStringEvent.scala | 2 +- .../codec/EndTestGroupErrorEventFormats.scala | 2 +- .../codec/EndTestGroupEventFormats.scala | 2 +- .../codec/StartTestGroupEventFormats.scala | 2 +- .../codec/TestCompleteEventFormats.scala | 2 +- .../testing/codec/TestInitEventFormats.scala | 2 +- .../testing/codec/TestItemDetailFormats.scala | 2 +- .../testing/codec/TestItemEventFormats.scala | 2 +- .../testing/codec/TestMessageFormats.scala | 2 +- .../testing/codec/TestResultFormats.scala | 2 +- .../codec/TestStringEventFormats.scala | 2 +- .../sbt/internal/testing/TestLogger.scala | 4 ++-- .../util/codec/ActionResultFormats.scala | 2 +- .../internal/util/codec/ManifestFormats.scala | 2 +- 295 files changed, 380 insertions(+), 369 deletions(-) diff --git a/build.sbt b/build.sbt index 74f65eb54..2af72ce32 100644 --- a/build.sbt +++ b/build.sbt @@ -337,6 +337,8 @@ lazy val utilLogging = project mimaBinaryIssueFilters ++= Seq( exclude[MissingClassProblem]("sbt.internal.util.ConsoleAppenderFromLog4J"), exclude[MissingClassProblem]("sbt.internal.util.Log4JConsoleAppender"), + exclude[Problem]("sbt.internal.util.LogOption.*"), + exclude[MissingClassProblem]("sbt.internal.util.LogOption$*"), ), ) .configure(addSbtIO) @@ -427,8 +429,10 @@ lazy val testingProj = (project in file("testing")) Compile / generateContrabands / sourceManaged := baseDirectory.value / "src" / "main" / "contraband-scala", Compile / generateContrabands / contrabandFormatsForType := ContrabandConfig.getFormats, mimaSettings, - mimaBinaryIssueFilters ++= Seq( - ) + mimaBinaryIssueFilters ++= Vector( + exclude[Problem]("sbt.protocol.testing.TestResult.*"), + exclude[MissingClassProblem]("sbt.protocol.testing.TestResult$*"), + ), ) .configure(addSbtIO, addSbtCompilerClasspath) @@ -555,6 +559,10 @@ lazy val actionsProj = (project in file("main-actions")) // Test / fork := true, Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat, mimaSettings, + mimaBinaryIssueFilters ++= Vector( + exclude[Problem]("sbt.internal.sona.DeploymentState.*"), + exclude[MissingClassProblem]("sbt.internal.sona.DeploymentState$*"), + ), ) .dependsOn(lmCore) .configure( @@ -604,6 +612,10 @@ lazy val commandProj = (project in file("main-command")) Compile / generateContrabands / contrabandFormatsForType := ContrabandConfig.getFormats, mimaSettings, mimaBinaryIssueFilters ++= Vector( + exclude[Problem]("sbt.ConnectionType.*"), + exclude[MissingClassProblem]("sbt.ConnectionType*"), + exclude[Problem]("sbt.ServerAuthentication.*"), + exclude[MissingClassProblem]("sbt.ServerAuthentication*"), ), Compile / headerCreate / unmanagedSources := { val old = (Compile / headerCreate / unmanagedSources).value @@ -1191,6 +1203,10 @@ lazy val lmCore = (project in file("lm-core")) (((srcs --- sdirs --- base) pair (relativeTo(sdirs) | relativeTo(base) | flat)) toSeq) }, mimaSettings, + mimaBinaryIssueFilters ++= Seq( + exclude[Problem]("sbt.librarymanagement.UpdateLogging.*"), + exclude[MissingClassProblem]("sbt.librarymanagement.UpdateLogging*"), + ), ) .dependsOn(utilLogging, utilPosition, utilCache) .configure(addSbtIO, addSbtCompilerInterface) diff --git a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/LogOption.scala b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/LogOption.scala index 729a08363..cb820ecdc 100644 --- a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/LogOption.scala +++ b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/LogOption.scala @@ -5,11 +5,12 @@ // DO NOT EDIT MANUALLY package sbt.internal.util /** value for logging options like color */ -sealed abstract class LogOption extends Serializable +enum LogOption { + + case Always + case Never + case Auto +} object LogOption { - - case object Always extends LogOption - case object Never extends LogOption - case object Auto extends LogOption } diff --git a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/SuccessEvent.scala b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/SuccessEvent.scala index 2f2870f85..42659750f 100644 --- a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/SuccessEvent.scala +++ b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/SuccessEvent.scala @@ -19,7 +19,7 @@ final class SuccessEvent private ( override def toString: String = { "SuccessEvent(" + message + ")" } - private def copy(message: String = message): SuccessEvent = { + private def copy(message: String): SuccessEvent = { new SuccessEvent(message) } def withMessage(message: String): SuccessEvent = { diff --git a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/AbstractEntryFormats.scala b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/AbstractEntryFormats.scala index e50257ba5..4bf90a59b 100644 --- a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/AbstractEntryFormats.scala +++ b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/AbstractEntryFormats.scala @@ -7,5 +7,5 @@ package sbt.internal.util.codec import _root_.sjsonnew.JsonFormat trait AbstractEntryFormats { self: sjsonnew.BasicJsonProtocol & sbt.internal.util.codec.StringEventFormats & sbt.internal.util.codec.TraceEventFormats & sbt.internal.util.codec.ProgressItemFormats & sbt.internal.util.codec.ProgressEventFormats => -implicit lazy val AbstractEntryFormat: JsonFormat[sbt.internal.util.AbstractEntry] = flatUnionFormat3[sbt.internal.util.AbstractEntry, sbt.internal.util.StringEvent, sbt.internal.util.TraceEvent, sbt.internal.util.ProgressEvent]("type") +given AbstractEntryFormat: JsonFormat[sbt.internal.util.AbstractEntry] = flatUnionFormat3[sbt.internal.util.AbstractEntry, sbt.internal.util.StringEvent, sbt.internal.util.TraceEvent, sbt.internal.util.ProgressEvent]("type") } diff --git a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/LogOptionFormats.scala b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/LogOptionFormats.scala index cb60fd5c9..5691ccafc 100644 --- a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/LogOptionFormats.scala +++ b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/LogOptionFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.util.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait LogOptionFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val LogOptionFormat: JsonFormat[sbt.internal.util.LogOption] = new JsonFormat[sbt.internal.util.LogOption] { +given LogOptionFormat: JsonFormat[sbt.internal.util.LogOption] = new JsonFormat[sbt.internal.util.LogOption] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.util.LogOption = { __jsOpt match { case Some(__js) => diff --git a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/ProgressEventFormats.scala b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/ProgressEventFormats.scala index 273e75f56..89b167893 100644 --- a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/ProgressEventFormats.scala +++ b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/ProgressEventFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.util.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ProgressEventFormats { self: sbt.internal.util.codec.ProgressItemFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ProgressEventFormat: JsonFormat[sbt.internal.util.ProgressEvent] = new JsonFormat[sbt.internal.util.ProgressEvent] { +given ProgressEventFormat: JsonFormat[sbt.internal.util.ProgressEvent] = new JsonFormat[sbt.internal.util.ProgressEvent] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.util.ProgressEvent = { __jsOpt match { case Some(__js) => diff --git a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/ProgressItemFormats.scala b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/ProgressItemFormats.scala index a7696ad7c..8d613a742 100644 --- a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/ProgressItemFormats.scala +++ b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/ProgressItemFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.util.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ProgressItemFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val ProgressItemFormat: JsonFormat[sbt.internal.util.ProgressItem] = new JsonFormat[sbt.internal.util.ProgressItem] { +given ProgressItemFormat: JsonFormat[sbt.internal.util.ProgressItem] = new JsonFormat[sbt.internal.util.ProgressItem] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.util.ProgressItem = { __jsOpt match { case Some(__js) => diff --git a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/StringEventFormats.scala b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/StringEventFormats.scala index b3d8af7b6..7875812ea 100644 --- a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/StringEventFormats.scala +++ b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/StringEventFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.util.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait StringEventFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val StringEventFormat: JsonFormat[sbt.internal.util.StringEvent] = new JsonFormat[sbt.internal.util.StringEvent] { +given StringEventFormat: JsonFormat[sbt.internal.util.StringEvent] = new JsonFormat[sbt.internal.util.StringEvent] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.util.StringEvent = { __jsOpt match { case Some(__js) => diff --git a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/SuccessEventFormats.scala b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/SuccessEventFormats.scala index ec6264288..4e9c1b5db 100644 --- a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/SuccessEventFormats.scala +++ b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/SuccessEventFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.util.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait SuccessEventFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val SuccessEventFormat: JsonFormat[sbt.internal.util.SuccessEvent] = new JsonFormat[sbt.internal.util.SuccessEvent] { +given SuccessEventFormat: JsonFormat[sbt.internal.util.SuccessEvent] = new JsonFormat[sbt.internal.util.SuccessEvent] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.util.SuccessEvent = { __jsOpt match { case Some(__js) => diff --git a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/TraceEventFormats.scala b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/TraceEventFormats.scala index 1c1abb1ef..cf97865a0 100644 --- a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/TraceEventFormats.scala +++ b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/codec/TraceEventFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.util.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TraceEventFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TraceEventFormat: JsonFormat[sbt.internal.util.TraceEvent] = new JsonFormat[sbt.internal.util.TraceEvent] { +given TraceEventFormat: JsonFormat[sbt.internal.util.TraceEvent] = new JsonFormat[sbt.internal.util.TraceEvent] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.util.TraceEvent = { __jsOpt match { case Some(__js) => diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala index e07da7a7b..6788969a2 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala @@ -8,7 +8,7 @@ package sbt.internal.util -import sbt.internal.util.codec.JsonProtocol.* +import sbt.internal.util.codec.JsonProtocol.given import sbt.util.* import sjsonnew.JsonFormat import sbt.internal.util.appmacro.StringTypeTag diff --git a/internal/util-logging/src/test/scala/ManagedLoggerSpec.scala b/internal/util-logging/src/test/scala/ManagedLoggerSpec.scala index 9d1c75172..ff3149005 100644 --- a/internal/util-logging/src/test/scala/ManagedLoggerSpec.scala +++ b/internal/util-logging/src/test/scala/ManagedLoggerSpec.scala @@ -47,14 +47,14 @@ class ManagedLoggerSpec extends AnyFlatSpec with Matchers { } it should "support logging Throwable out of the box" in { - import sbt.internal.util.codec.JsonProtocol.* + import sbt.internal.util.codec.JsonProtocol.given val log = newLogger("foo") context.addAppender("foo", asyncStdout -> Level.Info) log.infoEvent(SuccessEvent("yes")) } it should "allow registering Show[Int]" in { - import sjsonnew.BasicJsonProtocol.* + import sjsonnew.BasicJsonProtocol.given val log = newLogger("foo") context.addAppender("foo", asyncStdout -> Level.Info) given ShowLines[Int] = @@ -64,7 +64,7 @@ class ManagedLoggerSpec extends AnyFlatSpec with Matchers { } it should "allow registering Show[Array[Int]]" in { - import sjsonnew.BasicJsonProtocol.* + import sjsonnew.BasicJsonProtocol.given val log = newLogger("foo") context.addAppender("foo", asyncStdout -> Level.Info) given ShowLines[Array[Int]] = @@ -74,7 +74,7 @@ class ManagedLoggerSpec extends AnyFlatSpec with Matchers { } it should "allow registering Show[Vector[Vector[Int]]]" in { - import sjsonnew.BasicJsonProtocol.* + import sjsonnew.BasicJsonProtocol.given val log = newLogger("foo") context.addAppender("foo", asyncStdout -> Level.Info) given ShowLines[Vector[Vector[Int]]] = diff --git a/lm-core/src/main/contraband-scala/sbt/internal/librarymanagement/SemSelAndChunk.scala b/lm-core/src/main/contraband-scala/sbt/internal/librarymanagement/SemSelAndChunk.scala index 6d59ca185..aa604969c 100644 --- a/lm-core/src/main/contraband-scala/sbt/internal/librarymanagement/SemSelAndChunk.scala +++ b/lm-core/src/main/contraband-scala/sbt/internal/librarymanagement/SemSelAndChunk.scala @@ -19,7 +19,7 @@ final class SemSelAndChunk private ( override def toString: String = { comparators.map(_.toString).mkString(" ") } - private def copy(comparators: Seq[sbt.internal.librarymanagement.SemComparator] = comparators): SemSelAndChunk = { + private def copy(comparators: Seq[sbt.internal.librarymanagement.SemComparator]): SemSelAndChunk = { new SemSelAndChunk(comparators) } def withComparators(comparators: Seq[sbt.internal.librarymanagement.SemComparator]): SemSelAndChunk = { diff --git a/lm-core/src/main/contraband-scala/sbt/internal/librarymanagement/UpdateReportLite.scala b/lm-core/src/main/contraband-scala/sbt/internal/librarymanagement/UpdateReportLite.scala index 070f411dd..c6f52a4a3 100644 --- a/lm-core/src/main/contraband-scala/sbt/internal/librarymanagement/UpdateReportLite.scala +++ b/lm-core/src/main/contraband-scala/sbt/internal/librarymanagement/UpdateReportLite.scala @@ -19,7 +19,7 @@ final class UpdateReportLite private ( override def toString: String = { "UpdateReportLite(" + configurations + ")" } - private def copy(configurations: Vector[sbt.internal.librarymanagement.ConfigurationReportLite] = configurations): UpdateReportLite = { + private def copy(configurations: Vector[sbt.internal.librarymanagement.ConfigurationReportLite]): UpdateReportLite = { new UpdateReportLite(configurations) } def withConfigurations(configurations: Vector[sbt.internal.librarymanagement.ConfigurationReportLite]): UpdateReportLite = { diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ArtifactFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ArtifactFormats.scala index 708690498..2076e7385 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ArtifactFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ArtifactFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ArtifactFormats { self: sbt.librarymanagement.ConfigRefFormats & sbt.librarymanagement.ChecksumFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ArtifactFormat: JsonFormat[sbt.librarymanagement.Artifact] = new JsonFormat[sbt.librarymanagement.Artifact] { +given ArtifactFormat: JsonFormat[sbt.librarymanagement.Artifact] = new JsonFormat[sbt.librarymanagement.Artifact] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.Artifact = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ArtifactTypeFilterFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ArtifactTypeFilterFormats.scala index e04a51efb..b87866f97 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ArtifactTypeFilterFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ArtifactTypeFilterFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ArtifactTypeFilterFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val ArtifactTypeFilterFormat: JsonFormat[sbt.librarymanagement.ArtifactTypeFilter] = new JsonFormat[sbt.librarymanagement.ArtifactTypeFilter] { +given ArtifactTypeFilterFormat: JsonFormat[sbt.librarymanagement.ArtifactTypeFilter] = new JsonFormat[sbt.librarymanagement.ArtifactTypeFilter] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ArtifactTypeFilter = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/CallerFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/CallerFormats.scala index 6e743190d..efab505f7 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/CallerFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/CallerFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait CallerFormats { self: sbt.librarymanagement.ModuleIDFormats & sbt.librarymanagement.ArtifactFormats & sbt.librarymanagement.ConfigRefFormats & sbt.librarymanagement.ChecksumFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.InclExclRuleFormats & sbt.librarymanagement.CrossVersionFormats & sbt.librarymanagement.DisabledFormats & sbt.librarymanagement.BinaryFormats & sbt.librarymanagement.ConstantFormats & sbt.librarymanagement.PatchFormats & sbt.librarymanagement.FullFormats & sbt.librarymanagement.For3Use2_13Formats & sbt.librarymanagement.For2_13Use3Formats => -implicit lazy val CallerFormat: JsonFormat[sbt.librarymanagement.Caller] = new JsonFormat[sbt.librarymanagement.Caller] { +given CallerFormat: JsonFormat[sbt.librarymanagement.Caller] = new JsonFormat[sbt.librarymanagement.Caller] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.Caller = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolverFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolverFormats.scala index f2efd82f4..c626c9d36 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolverFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ChainedResolverFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ChainedResolverFormats { self: sbt.librarymanagement.ResolverFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ChainedResolverFormat: JsonFormat[sbt.librarymanagement.ChainedResolver] = new JsonFormat[sbt.librarymanagement.ChainedResolver] { +given 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 { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ChecksumFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ChecksumFormats.scala index c0d8ec705..c0d0a5007 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ChecksumFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ChecksumFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ChecksumFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val ChecksumFormat: JsonFormat[sbt.librarymanagement.Checksum] = new JsonFormat[sbt.librarymanagement.Checksum] { +given ChecksumFormat: JsonFormat[sbt.librarymanagement.Checksum] = new JsonFormat[sbt.librarymanagement.Checksum] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.Checksum = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportFormats.scala index fa0b5b208..60172727d 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ConfigurationReportFormats { self: sbt.librarymanagement.ConfigRefFormats & sbt.librarymanagement.ModuleReportFormats & sbt.librarymanagement.ModuleIDFormats & sbt.librarymanagement.ArtifactFormats & sbt.librarymanagement.ChecksumFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.InclExclRuleFormats & sbt.librarymanagement.CrossVersionFormats & sbt.librarymanagement.DisabledFormats & sbt.librarymanagement.BinaryFormats & sbt.librarymanagement.ConstantFormats & sbt.librarymanagement.PatchFormats & sbt.librarymanagement.FullFormats & sbt.librarymanagement.For3Use2_13Formats & sbt.librarymanagement.For2_13Use3Formats & sbt.librarymanagement.CallerFormats & sbt.librarymanagement.OrganizationArtifactReportFormats => -implicit lazy val ConfigurationReportFormat: JsonFormat[sbt.librarymanagement.ConfigurationReport] = new JsonFormat[sbt.librarymanagement.ConfigurationReport] { +given 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 { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportLiteFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportLiteFormats.scala index 8b396c8ba..fa5d8df7e 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportLiteFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ConfigurationReportLiteFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ConfigurationReportLiteFormats { self: sbt.librarymanagement.OrganizationArtifactReportFormats & sbt.librarymanagement.ModuleReportFormats & sbt.librarymanagement.ModuleIDFormats & sbt.librarymanagement.ArtifactFormats & sbt.librarymanagement.ConfigRefFormats & sbt.librarymanagement.ChecksumFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.InclExclRuleFormats & sbt.librarymanagement.CrossVersionFormats & sbt.librarymanagement.DisabledFormats & sbt.librarymanagement.BinaryFormats & sbt.librarymanagement.ConstantFormats & sbt.librarymanagement.PatchFormats & sbt.librarymanagement.FullFormats & sbt.librarymanagement.For3Use2_13Formats & sbt.librarymanagement.For2_13Use3Formats & sbt.librarymanagement.CallerFormats => -implicit lazy val ConfigurationReportLiteFormat: JsonFormat[sbt.internal.librarymanagement.ConfigurationReportLite] = new JsonFormat[sbt.internal.librarymanagement.ConfigurationReportLite] { +given ConfigurationReportLiteFormat: JsonFormat[sbt.internal.librarymanagement.ConfigurationReportLite] = new JsonFormat[sbt.internal.librarymanagement.ConfigurationReportLite] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.librarymanagement.ConfigurationReportLite = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ConflictManagerFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ConflictManagerFormats.scala index a9affc151..88645c64b 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ConflictManagerFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ConflictManagerFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ConflictManagerFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val ConflictManagerFormat: JsonFormat[sbt.librarymanagement.ConflictManager] = new JsonFormat[sbt.librarymanagement.ConflictManager] { +given ConflictManagerFormat: JsonFormat[sbt.librarymanagement.ConflictManager] = new JsonFormat[sbt.librarymanagement.ConflictManager] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ConflictManager = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/DeveloperFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/DeveloperFormats.scala index 3c4649e1d..23dcbb1c0 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/DeveloperFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/DeveloperFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait DeveloperFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val DeveloperFormat: JsonFormat[sbt.librarymanagement.Developer] = new JsonFormat[sbt.librarymanagement.Developer] { +given DeveloperFormat: JsonFormat[sbt.librarymanagement.Developer] = new JsonFormat[sbt.librarymanagement.Developer] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.Developer = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/FileConfigurationFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/FileConfigurationFormats.scala index 904c5333e..72b427b3d 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/FileConfigurationFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/FileConfigurationFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait FileConfigurationFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val FileConfigurationFormat: JsonFormat[sbt.librarymanagement.FileConfiguration] = new JsonFormat[sbt.librarymanagement.FileConfiguration] { +given FileConfigurationFormat: JsonFormat[sbt.librarymanagement.FileConfiguration] = new JsonFormat[sbt.librarymanagement.FileConfiguration] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.FileConfiguration = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/FileRepositoryFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/FileRepositoryFormats.scala index 3e4e65192..a58609fe8 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/FileRepositoryFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/FileRepositoryFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait FileRepositoryFormats { self: sbt.librarymanagement.PatternsFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.FileConfigurationFormats => -implicit lazy val FileRepositoryFormat: JsonFormat[sbt.librarymanagement.FileRepository] = new JsonFormat[sbt.librarymanagement.FileRepository] { +given FileRepositoryFormat: JsonFormat[sbt.librarymanagement.FileRepository] = new JsonFormat[sbt.librarymanagement.FileRepository] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.FileRepository = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersConfigurationFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersConfigurationFormats.scala index 84e12f373..4ac960bd9 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersConfigurationFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersConfigurationFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait GetClassifiersConfigurationFormats { self: sbt.librarymanagement.GetClassifiersModuleFormats & sbt.librarymanagement.ModuleIDFormats & sbt.librarymanagement.ArtifactFormats & sbt.librarymanagement.ConfigRefFormats & sbt.librarymanagement.ChecksumFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.InclExclRuleFormats & sbt.librarymanagement.CrossVersionFormats & sbt.librarymanagement.DisabledFormats & sbt.librarymanagement.BinaryFormats & sbt.librarymanagement.ConstantFormats & sbt.librarymanagement.PatchFormats & sbt.librarymanagement.FullFormats & sbt.librarymanagement.For3Use2_13Formats & sbt.librarymanagement.For2_13Use3Formats & sbt.librarymanagement.ScalaModuleInfoFormats & sbt.librarymanagement.ConfigurationFormats & sbt.librarymanagement.UpdateConfigurationFormats & sbt.librarymanagement.RetrieveConfigurationFormats & sbt.librarymanagement.UpdateLoggingFormats & sbt.internal.librarymanagement.formats.LogicalClockFormats & sbt.librarymanagement.ArtifactTypeFilterFormats => -implicit lazy val GetClassifiersConfigurationFormat: JsonFormat[sbt.librarymanagement.GetClassifiersConfiguration] = new JsonFormat[sbt.librarymanagement.GetClassifiersConfiguration] { +given GetClassifiersConfigurationFormat: JsonFormat[sbt.librarymanagement.GetClassifiersConfiguration] = new JsonFormat[sbt.librarymanagement.GetClassifiersConfiguration] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.GetClassifiersConfiguration = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersModuleFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersModuleFormats.scala index f92b83d9a..de2e23a91 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersModuleFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/GetClassifiersModuleFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait GetClassifiersModuleFormats { self: sbt.librarymanagement.ModuleIDFormats & sbt.librarymanagement.ArtifactFormats & sbt.librarymanagement.ConfigRefFormats & sbt.librarymanagement.ChecksumFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.InclExclRuleFormats & sbt.librarymanagement.CrossVersionFormats & sbt.librarymanagement.DisabledFormats & sbt.librarymanagement.BinaryFormats & sbt.librarymanagement.ConstantFormats & sbt.librarymanagement.PatchFormats & sbt.librarymanagement.FullFormats & sbt.librarymanagement.For3Use2_13Formats & sbt.librarymanagement.For2_13Use3Formats & sbt.librarymanagement.ScalaModuleInfoFormats & sbt.librarymanagement.ConfigurationFormats => -implicit lazy val GetClassifiersModuleFormat: JsonFormat[sbt.librarymanagement.GetClassifiersModule] = new JsonFormat[sbt.librarymanagement.GetClassifiersModule] { +given GetClassifiersModuleFormat: JsonFormat[sbt.librarymanagement.GetClassifiersModule] = new JsonFormat[sbt.librarymanagement.GetClassifiersModule] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.GetClassifiersModule = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/InclExclRuleFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/InclExclRuleFormats.scala index 9a00fbde5..427b8edf3 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/InclExclRuleFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/InclExclRuleFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait InclExclRuleFormats { self: sbt.librarymanagement.ConfigRefFormats & sbt.librarymanagement.CrossVersionFormats & sbt.librarymanagement.DisabledFormats & sbt.librarymanagement.BinaryFormats & sbt.librarymanagement.ConstantFormats & sbt.librarymanagement.PatchFormats & sbt.librarymanagement.FullFormats & sbt.librarymanagement.For3Use2_13Formats & sbt.librarymanagement.For2_13Use3Formats & sjsonnew.BasicJsonProtocol => -implicit lazy val InclExclRuleFormat: JsonFormat[sbt.librarymanagement.InclExclRule] = new JsonFormat[sbt.librarymanagement.InclExclRule] { +given InclExclRuleFormat: JsonFormat[sbt.librarymanagement.InclExclRule] = new JsonFormat[sbt.librarymanagement.InclExclRule] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.InclExclRule = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/IvyFileConfigurationFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/IvyFileConfigurationFormats.scala index cd9764b8c..5749bf416 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/IvyFileConfigurationFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/IvyFileConfigurationFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait IvyFileConfigurationFormats { self: sbt.librarymanagement.ScalaModuleInfoFormats & sbt.librarymanagement.ConfigurationFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val IvyFileConfigurationFormat: JsonFormat[sbt.librarymanagement.IvyFileConfiguration] = new JsonFormat[sbt.librarymanagement.IvyFileConfiguration] { +given IvyFileConfigurationFormat: JsonFormat[sbt.librarymanagement.IvyFileConfiguration] = new JsonFormat[sbt.librarymanagement.IvyFileConfiguration] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.IvyFileConfiguration = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/IvyPathsFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/IvyPathsFormats.scala index af35b58b0..7a1a61579 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/IvyPathsFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/IvyPathsFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait IvyPathsFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val IvyPathsFormat: JsonFormat[sbt.librarymanagement.IvyPaths] = new JsonFormat[sbt.librarymanagement.IvyPaths] { +given IvyPathsFormat: JsonFormat[sbt.librarymanagement.IvyPaths] = new JsonFormat[sbt.librarymanagement.IvyPaths] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.IvyPaths = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/KeyFileAuthenticationFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/KeyFileAuthenticationFormats.scala index 6f682043f..27cc498de 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/KeyFileAuthenticationFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/KeyFileAuthenticationFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait KeyFileAuthenticationFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val KeyFileAuthenticationFormat: JsonFormat[sbt.librarymanagement.KeyFileAuthentication] = new JsonFormat[sbt.librarymanagement.KeyFileAuthentication] { +given KeyFileAuthenticationFormat: JsonFormat[sbt.librarymanagement.KeyFileAuthentication] = new JsonFormat[sbt.librarymanagement.KeyFileAuthentication] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.KeyFileAuthentication = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/LicenseFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/LicenseFormats.scala index adb368bf6..98d96b52b 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/LicenseFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/LicenseFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait LicenseFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val LicenseFormat: JsonFormat[sbt.librarymanagement.License] = new JsonFormat[sbt.librarymanagement.License] { +given LicenseFormat: JsonFormat[sbt.librarymanagement.License] = new JsonFormat[sbt.librarymanagement.License] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.License = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/MavenCacheFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/MavenCacheFormats.scala index 800f797b5..834b86d24 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/MavenCacheFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/MavenCacheFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait MavenCacheFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val MavenCacheFormat: JsonFormat[sbt.librarymanagement.MavenCache] = new JsonFormat[sbt.librarymanagement.MavenCache] { +given MavenCacheFormat: JsonFormat[sbt.librarymanagement.MavenCache] = new JsonFormat[sbt.librarymanagement.MavenCache] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.MavenCache = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/MavenRepoFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/MavenRepoFormats.scala index df4a00341..e2869c592 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/MavenRepoFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/MavenRepoFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait MavenRepoFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val MavenRepoFormat: JsonFormat[sbt.librarymanagement.MavenRepo] = new JsonFormat[sbt.librarymanagement.MavenRepo] { +given MavenRepoFormat: JsonFormat[sbt.librarymanagement.MavenRepo] = new JsonFormat[sbt.librarymanagement.MavenRepo] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.MavenRepo = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/MavenRepositoryFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/MavenRepositoryFormats.scala index 599c269dd..a5f4b044e 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/MavenRepositoryFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/MavenRepositoryFormats.scala @@ -7,5 +7,5 @@ package sbt.librarymanagement import _root_.sjsonnew.JsonFormat trait MavenRepositoryFormats { self: sjsonnew.BasicJsonProtocol & sbt.librarymanagement.MavenRepoFormats & sbt.librarymanagement.MavenCacheFormats => -implicit lazy val MavenRepositoryFormat: JsonFormat[sbt.librarymanagement.MavenRepository] = flatUnionFormat2[sbt.librarymanagement.MavenRepository, sbt.librarymanagement.MavenRepo, sbt.librarymanagement.MavenCache]("type") +given MavenRepositoryFormat: JsonFormat[sbt.librarymanagement.MavenRepository] = flatUnionFormat2[sbt.librarymanagement.MavenRepository, sbt.librarymanagement.MavenRepo, sbt.librarymanagement.MavenCache]("type") } diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfigurationFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfigurationFormats.scala index 8cab63a8d..a784b2bc3 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfigurationFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleConfigurationFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ModuleConfigurationFormats { self: sbt.librarymanagement.ResolverFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ModuleConfigurationFormat: JsonFormat[sbt.librarymanagement.ModuleConfiguration] = new JsonFormat[sbt.librarymanagement.ModuleConfiguration] { +given 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 { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleDescriptorConfigurationFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleDescriptorConfigurationFormats.scala index aa9a04d0d..07cd75fef 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleDescriptorConfigurationFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleDescriptorConfigurationFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ModuleDescriptorConfigurationFormats { self: sbt.librarymanagement.ScalaModuleInfoFormats & sbt.librarymanagement.ConfigurationFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.ModuleIDFormats & sbt.librarymanagement.ArtifactFormats & sbt.librarymanagement.ConfigRefFormats & sbt.librarymanagement.ChecksumFormats & sbt.librarymanagement.InclExclRuleFormats & sbt.librarymanagement.CrossVersionFormats & sbt.librarymanagement.DisabledFormats & sbt.librarymanagement.BinaryFormats & sbt.librarymanagement.ConstantFormats & sbt.librarymanagement.PatchFormats & sbt.librarymanagement.FullFormats & sbt.librarymanagement.For3Use2_13Formats & sbt.librarymanagement.For2_13Use3Formats & sbt.librarymanagement.ModuleInfoFormats & sbt.librarymanagement.LicenseFormats & sbt.librarymanagement.ScmInfoFormats & sbt.librarymanagement.DeveloperFormats & sbt.internal.librarymanagement.formats.NodeSeqFormat & sbt.librarymanagement.ConflictManagerFormats => -implicit lazy val ModuleDescriptorConfigurationFormat: JsonFormat[sbt.librarymanagement.ModuleDescriptorConfiguration] = new JsonFormat[sbt.librarymanagement.ModuleDescriptorConfiguration] { +given ModuleDescriptorConfigurationFormat: JsonFormat[sbt.librarymanagement.ModuleDescriptorConfiguration] = new JsonFormat[sbt.librarymanagement.ModuleDescriptorConfiguration] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ModuleDescriptorConfiguration = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleIDFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleIDFormats.scala index 9d20df67c..f9a0783f5 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleIDFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleIDFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ModuleIDFormats { self: sbt.librarymanagement.ArtifactFormats & sbt.librarymanagement.ConfigRefFormats & sbt.librarymanagement.ChecksumFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.InclExclRuleFormats & sbt.librarymanagement.CrossVersionFormats & sbt.librarymanagement.DisabledFormats & sbt.librarymanagement.BinaryFormats & sbt.librarymanagement.ConstantFormats & sbt.librarymanagement.PatchFormats & sbt.librarymanagement.FullFormats & sbt.librarymanagement.For3Use2_13Formats & sbt.librarymanagement.For2_13Use3Formats => -implicit lazy val ModuleIDFormat: JsonFormat[sbt.librarymanagement.ModuleID] = new JsonFormat[sbt.librarymanagement.ModuleID] { +given ModuleIDFormat: JsonFormat[sbt.librarymanagement.ModuleID] = new JsonFormat[sbt.librarymanagement.ModuleID] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ModuleID = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfoFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfoFormats.scala index d2c1f39c0..b46a87b4a 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfoFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleInfoFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ModuleInfoFormats { self: sbt.librarymanagement.LicenseFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.ScmInfoFormats & sbt.librarymanagement.DeveloperFormats => -implicit lazy val ModuleInfoFormat: JsonFormat[sbt.librarymanagement.ModuleInfo] = new JsonFormat[sbt.librarymanagement.ModuleInfo] { +given ModuleInfoFormat: JsonFormat[sbt.librarymanagement.ModuleInfo] = new JsonFormat[sbt.librarymanagement.ModuleInfo] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ModuleInfo = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleReportFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleReportFormats.scala index ed958f114..f795a60e0 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleReportFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleReportFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ModuleReportFormats { self: sbt.librarymanagement.ModuleIDFormats & sbt.librarymanagement.ArtifactFormats & sbt.librarymanagement.ConfigRefFormats & sbt.librarymanagement.ChecksumFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.InclExclRuleFormats & sbt.librarymanagement.CrossVersionFormats & sbt.librarymanagement.DisabledFormats & sbt.librarymanagement.BinaryFormats & sbt.librarymanagement.ConstantFormats & sbt.librarymanagement.PatchFormats & sbt.librarymanagement.FullFormats & sbt.librarymanagement.For3Use2_13Formats & sbt.librarymanagement.For2_13Use3Formats & sbt.librarymanagement.CallerFormats => -implicit lazy val ModuleReportFormat: JsonFormat[sbt.librarymanagement.ModuleReport] = new JsonFormat[sbt.librarymanagement.ModuleReport] { +given ModuleReportFormat: JsonFormat[sbt.librarymanagement.ModuleReport] = new JsonFormat[sbt.librarymanagement.ModuleReport] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ModuleReport = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleSettingsFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleSettingsFormats.scala index 65024b92a..ea387f481 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleSettingsFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ModuleSettingsFormats.scala @@ -7,5 +7,5 @@ package sbt.librarymanagement import _root_.sjsonnew.JsonFormat trait ModuleSettingsFormats { self: sbt.librarymanagement.ScalaModuleInfoFormats & sbt.librarymanagement.ConfigurationFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.IvyFileConfigurationFormats & sbt.librarymanagement.PomConfigurationFormats & sbt.librarymanagement.ModuleIDFormats & sbt.librarymanagement.ArtifactFormats & sbt.librarymanagement.ConfigRefFormats & sbt.librarymanagement.ChecksumFormats & sbt.librarymanagement.InclExclRuleFormats & sbt.librarymanagement.CrossVersionFormats & sbt.librarymanagement.DisabledFormats & sbt.librarymanagement.BinaryFormats & sbt.librarymanagement.ConstantFormats & sbt.librarymanagement.PatchFormats & sbt.librarymanagement.FullFormats & sbt.librarymanagement.For3Use2_13Formats & sbt.librarymanagement.For2_13Use3Formats & sbt.librarymanagement.ModuleInfoFormats & sbt.librarymanagement.LicenseFormats & sbt.librarymanagement.ScmInfoFormats & sbt.librarymanagement.DeveloperFormats & sbt.internal.librarymanagement.formats.NodeSeqFormat & sbt.librarymanagement.ConflictManagerFormats & sbt.librarymanagement.ModuleDescriptorConfigurationFormats => -implicit lazy val ModuleSettingsFormat: JsonFormat[sbt.librarymanagement.ModuleSettings] = flatUnionFormat3[sbt.librarymanagement.ModuleSettings, sbt.librarymanagement.IvyFileConfiguration, sbt.librarymanagement.PomConfiguration, sbt.librarymanagement.ModuleDescriptorConfiguration]("type") +given ModuleSettingsFormat: JsonFormat[sbt.librarymanagement.ModuleSettings] = flatUnionFormat3[sbt.librarymanagement.ModuleSettings, sbt.librarymanagement.IvyFileConfiguration, sbt.librarymanagement.PomConfiguration, sbt.librarymanagement.ModuleDescriptorConfiguration]("type") } diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/OrganizationArtifactReportFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/OrganizationArtifactReportFormats.scala index 33681f5bd..f2d7ccac3 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/OrganizationArtifactReportFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/OrganizationArtifactReportFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait OrganizationArtifactReportFormats { self: sbt.librarymanagement.ModuleReportFormats & sbt.librarymanagement.ModuleIDFormats & sbt.librarymanagement.ArtifactFormats & sbt.librarymanagement.ConfigRefFormats & sbt.librarymanagement.ChecksumFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.InclExclRuleFormats & sbt.librarymanagement.CrossVersionFormats & sbt.librarymanagement.DisabledFormats & sbt.librarymanagement.BinaryFormats & sbt.librarymanagement.ConstantFormats & sbt.librarymanagement.PatchFormats & sbt.librarymanagement.FullFormats & sbt.librarymanagement.For3Use2_13Formats & sbt.librarymanagement.For2_13Use3Formats & sbt.librarymanagement.CallerFormats => -implicit lazy val OrganizationArtifactReportFormat: JsonFormat[sbt.librarymanagement.OrganizationArtifactReport] = new JsonFormat[sbt.librarymanagement.OrganizationArtifactReport] { +given OrganizationArtifactReportFormat: JsonFormat[sbt.librarymanagement.OrganizationArtifactReport] = new JsonFormat[sbt.librarymanagement.OrganizationArtifactReport] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.OrganizationArtifactReport = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/PasswordAuthenticationFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/PasswordAuthenticationFormats.scala index e88a93263..1bdeec58a 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/PasswordAuthenticationFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/PasswordAuthenticationFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait PasswordAuthenticationFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val PasswordAuthenticationFormat: JsonFormat[sbt.librarymanagement.PasswordAuthentication] = new JsonFormat[sbt.librarymanagement.PasswordAuthentication] { +given PasswordAuthenticationFormat: JsonFormat[sbt.librarymanagement.PasswordAuthentication] = new JsonFormat[sbt.librarymanagement.PasswordAuthentication] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.PasswordAuthentication = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepositoryFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepositoryFormats.scala index 92183a154..9f66ff457 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepositoryFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/PatternsBasedRepositoryFormats.scala @@ -7,5 +7,5 @@ package sbt.librarymanagement import _root_.sjsonnew.JsonFormat trait PatternsBasedRepositoryFormats { self: sbt.librarymanagement.PatternsFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.FileConfigurationFormats & sbt.librarymanagement.FileRepositoryFormats & sbt.librarymanagement.URLRepositoryFormats & sbt.librarymanagement.SshConnectionFormats & sbt.librarymanagement.SshAuthenticationFormats & sbt.librarymanagement.SshRepositoryFormats & 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") +given 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/lm-core/src/main/contraband-scala/sbt/librarymanagement/PatternsFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/PatternsFormats.scala index 371467cd2..741238c65 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/PatternsFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/PatternsFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait PatternsFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val PatternsFormat: JsonFormat[sbt.librarymanagement.Patterns] = new JsonFormat[sbt.librarymanagement.Patterns] { +given PatternsFormat: JsonFormat[sbt.librarymanagement.Patterns] = new JsonFormat[sbt.librarymanagement.Patterns] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.Patterns = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/PomConfigurationFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/PomConfigurationFormats.scala index 2720abd85..f39c9e200 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/PomConfigurationFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/PomConfigurationFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait PomConfigurationFormats { self: sbt.librarymanagement.ScalaModuleInfoFormats & sbt.librarymanagement.ConfigurationFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val PomConfigurationFormat: JsonFormat[sbt.librarymanagement.PomConfiguration] = new JsonFormat[sbt.librarymanagement.PomConfiguration] { +given PomConfigurationFormat: JsonFormat[sbt.librarymanagement.PomConfiguration] = new JsonFormat[sbt.librarymanagement.PomConfiguration] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.PomConfiguration = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/PublishConfigurationFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/PublishConfigurationFormats.scala index 1952cdaf8..a3f1702a9 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/PublishConfigurationFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/PublishConfigurationFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait PublishConfigurationFormats { self: sbt.librarymanagement.ConfigRefFormats & sbt.librarymanagement.ArtifactFormats & sbt.librarymanagement.UpdateLoggingFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val PublishConfigurationFormat: JsonFormat[sbt.librarymanagement.PublishConfiguration] = new JsonFormat[sbt.librarymanagement.PublishConfiguration] { +given 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 { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ResolverFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ResolverFormats.scala index e26588176..6489db8ef 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ResolverFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ResolverFormats.scala @@ -7,5 +7,5 @@ package sbt.librarymanagement import _root_.sjsonnew.JsonFormat trait ResolverFormats { self: sjsonnew.BasicJsonProtocol & sbt.librarymanagement.ChainedResolverFormats & sbt.librarymanagement.MavenRepoFormats & sbt.librarymanagement.MavenCacheFormats & sbt.librarymanagement.PatternsFormats & sbt.librarymanagement.FileConfigurationFormats & sbt.librarymanagement.FileRepositoryFormats & sbt.librarymanagement.URLRepositoryFormats & sbt.librarymanagement.SshConnectionFormats & sbt.librarymanagement.SshAuthenticationFormats & sbt.librarymanagement.SshRepositoryFormats & 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") +given 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/lm-core/src/main/contraband-scala/sbt/librarymanagement/RetrieveConfigurationFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/RetrieveConfigurationFormats.scala index d8a1efca0..f53f9b714 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/RetrieveConfigurationFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/RetrieveConfigurationFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait RetrieveConfigurationFormats { self: sbt.librarymanagement.ConfigRefFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val RetrieveConfigurationFormat: JsonFormat[sbt.librarymanagement.RetrieveConfiguration] = new JsonFormat[sbt.librarymanagement.RetrieveConfiguration] { +given RetrieveConfigurationFormat: JsonFormat[sbt.librarymanagement.RetrieveConfiguration] = new JsonFormat[sbt.librarymanagement.RetrieveConfiguration] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.RetrieveConfiguration = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ScalaModuleInfoFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ScalaModuleInfoFormats.scala index 0a2d2cd14..d40c4430c 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ScalaModuleInfoFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ScalaModuleInfoFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ScalaModuleInfoFormats { self: sbt.librarymanagement.ConfigurationFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ScalaModuleInfoFormat: JsonFormat[sbt.librarymanagement.ScalaModuleInfo] = new JsonFormat[sbt.librarymanagement.ScalaModuleInfo] { +given ScalaModuleInfoFormat: JsonFormat[sbt.librarymanagement.ScalaModuleInfo] = new JsonFormat[sbt.librarymanagement.ScalaModuleInfo] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ScalaModuleInfo = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ScmInfoFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ScmInfoFormats.scala index 6cc7e8931..b6937e2a9 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/ScmInfoFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/ScmInfoFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ScmInfoFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val ScmInfoFormat: JsonFormat[sbt.librarymanagement.ScmInfo] = new JsonFormat[sbt.librarymanagement.ScmInfo] { +given ScmInfoFormat: JsonFormat[sbt.librarymanagement.ScmInfo] = new JsonFormat[sbt.librarymanagement.ScmInfo] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ScmInfo = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/SemanticSelector.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/SemanticSelector.scala index b554446b2..64efe4dd5 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/SemanticSelector.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/SemanticSelector.scala @@ -73,7 +73,7 @@ final class SemanticSelector private ( override def toString: String = { selectors.map(_.toString).mkString(" || ") } - private def copy(selectors: Seq[sbt.internal.librarymanagement.SemSelAndChunk] = selectors): SemanticSelector = { + private def copy(selectors: Seq[sbt.internal.librarymanagement.SemSelAndChunk]): SemanticSelector = { new SemanticSelector(selectors) } def withSelectors(selectors: Seq[sbt.internal.librarymanagement.SemSelAndChunk]): SemanticSelector = { diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/SftpRepositoryFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/SftpRepositoryFormats.scala index a5a65589d..29db10206 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/SftpRepositoryFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/SftpRepositoryFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait SftpRepositoryFormats { self: sbt.librarymanagement.PatternsFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.SshConnectionFormats & sbt.librarymanagement.SshAuthenticationFormats => -implicit lazy val SftpRepositoryFormat: JsonFormat[sbt.librarymanagement.SftpRepository] = new JsonFormat[sbt.librarymanagement.SftpRepository] { +given 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 { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshAuthenticationFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshAuthenticationFormats.scala index 8c337e1df..3830067cb 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshAuthenticationFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshAuthenticationFormats.scala @@ -7,5 +7,5 @@ package sbt.librarymanagement import _root_.sjsonnew.JsonFormat trait SshAuthenticationFormats { self: sjsonnew.BasicJsonProtocol & sbt.librarymanagement.PasswordAuthenticationFormats & sbt.librarymanagement.KeyFileAuthenticationFormats => -implicit lazy val SshAuthenticationFormat: JsonFormat[sbt.librarymanagement.SshAuthentication] = flatUnionFormat2[sbt.librarymanagement.SshAuthentication, sbt.librarymanagement.PasswordAuthentication, sbt.librarymanagement.KeyFileAuthentication]("type") +given SshAuthenticationFormat: JsonFormat[sbt.librarymanagement.SshAuthentication] = flatUnionFormat2[sbt.librarymanagement.SshAuthentication, sbt.librarymanagement.PasswordAuthentication, sbt.librarymanagement.KeyFileAuthentication]("type") } diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepositoryFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepositoryFormats.scala index 6009930f2..7329f15a8 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepositoryFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshBasedRepositoryFormats.scala @@ -7,5 +7,5 @@ package sbt.librarymanagement import _root_.sjsonnew.JsonFormat trait SshBasedRepositoryFormats { self: sbt.librarymanagement.PatternsFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.SshConnectionFormats & sbt.librarymanagement.SshAuthenticationFormats & sbt.librarymanagement.SshRepositoryFormats & sbt.librarymanagement.SftpRepositoryFormats => -implicit lazy val SshBasedRepositoryFormat: JsonFormat[sbt.librarymanagement.SshBasedRepository] = flatUnionFormat2[sbt.librarymanagement.SshBasedRepository, sbt.librarymanagement.SshRepository, sbt.librarymanagement.SftpRepository]("type") +given SshBasedRepositoryFormat: JsonFormat[sbt.librarymanagement.SshBasedRepository] = flatUnionFormat2[sbt.librarymanagement.SshBasedRepository, sbt.librarymanagement.SshRepository, sbt.librarymanagement.SftpRepository]("type") } diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshConnectionFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshConnectionFormats.scala index 87dd650d2..1c67be466 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshConnectionFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshConnectionFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait SshConnectionFormats { self: sbt.librarymanagement.SshAuthenticationFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val SshConnectionFormat: JsonFormat[sbt.librarymanagement.SshConnection] = new JsonFormat[sbt.librarymanagement.SshConnection] { +given 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 { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshRepositoryFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshRepositoryFormats.scala index 64beccf6d..41177c410 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshRepositoryFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/SshRepositoryFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait SshRepositoryFormats { self: sbt.librarymanagement.PatternsFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.SshConnectionFormats & sbt.librarymanagement.SshAuthenticationFormats => -implicit lazy val SshRepositoryFormat: JsonFormat[sbt.librarymanagement.SshRepository] = new JsonFormat[sbt.librarymanagement.SshRepository] { +given 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 { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/URLRepositoryFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/URLRepositoryFormats.scala index 31a9ee0d3..58e3d1533 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/URLRepositoryFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/URLRepositoryFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait URLRepositoryFormats { self: sbt.librarymanagement.PatternsFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val URLRepositoryFormat: JsonFormat[sbt.librarymanagement.URLRepository] = new JsonFormat[sbt.librarymanagement.URLRepository] { +given URLRepositoryFormat: JsonFormat[sbt.librarymanagement.URLRepository] = new JsonFormat[sbt.librarymanagement.URLRepository] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.URLRepository = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateConfigurationFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateConfigurationFormats.scala index 681cdef42..8c7973e19 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateConfigurationFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateConfigurationFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait UpdateConfigurationFormats { self: sbt.librarymanagement.RetrieveConfigurationFormats & sbt.librarymanagement.ConfigRefFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.UpdateLoggingFormats & sbt.internal.librarymanagement.formats.LogicalClockFormats & sbt.librarymanagement.ArtifactTypeFilterFormats => -implicit lazy val UpdateConfigurationFormat: JsonFormat[sbt.librarymanagement.UpdateConfiguration] = new JsonFormat[sbt.librarymanagement.UpdateConfiguration] { +given UpdateConfigurationFormat: JsonFormat[sbt.librarymanagement.UpdateConfiguration] = new JsonFormat[sbt.librarymanagement.UpdateConfiguration] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.UpdateConfiguration = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateLogging.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateLogging.scala index 0448648e4..0f68a17da 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateLogging.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateLogging.scala @@ -11,12 +11,13 @@ package sbt.librarymanagement * `Quiet` only displays errors. * `Default` uses the current log level of `update` task. */ -sealed abstract class UpdateLogging extends Serializable +enum UpdateLogging { + + case Full + case DownloadOnly + case Quiet + case Default +} object UpdateLogging { - - case object Full extends UpdateLogging - case object DownloadOnly extends UpdateLogging - case object Quiet extends UpdateLogging - case object Default extends UpdateLogging } diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateLoggingFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateLoggingFormats.scala index 483456509..ec56d5fe1 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateLoggingFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateLoggingFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait UpdateLoggingFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val UpdateLoggingFormat: JsonFormat[sbt.librarymanagement.UpdateLogging] = new JsonFormat[sbt.librarymanagement.UpdateLogging] { +given UpdateLoggingFormat: JsonFormat[sbt.librarymanagement.UpdateLogging] = new JsonFormat[sbt.librarymanagement.UpdateLogging] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.UpdateLogging = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportFormats.scala index 7e017c2d8..ca5d6a447 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait UpdateReportFormats { self: sbt.librarymanagement.ConfigurationReportFormats & sbt.librarymanagement.ConfigRefFormats & sbt.librarymanagement.ModuleReportFormats & sbt.librarymanagement.ModuleIDFormats & sbt.librarymanagement.ArtifactFormats & sbt.librarymanagement.ChecksumFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.InclExclRuleFormats & sbt.librarymanagement.CrossVersionFormats & sbt.librarymanagement.DisabledFormats & sbt.librarymanagement.BinaryFormats & sbt.librarymanagement.ConstantFormats & sbt.librarymanagement.PatchFormats & sbt.librarymanagement.FullFormats & sbt.librarymanagement.For3Use2_13Formats & sbt.librarymanagement.For2_13Use3Formats & sbt.librarymanagement.CallerFormats & sbt.librarymanagement.OrganizationArtifactReportFormats & sbt.librarymanagement.UpdateStatsFormats => -implicit lazy val UpdateReportFormat: JsonFormat[sbt.librarymanagement.UpdateReport] = new JsonFormat[sbt.librarymanagement.UpdateReport] { +given UpdateReportFormat: JsonFormat[sbt.librarymanagement.UpdateReport] = new JsonFormat[sbt.librarymanagement.UpdateReport] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.UpdateReport = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportLiteFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportLiteFormats.scala index 88736ba83..e45f5356f 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportLiteFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateReportLiteFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait UpdateReportLiteFormats { self: sbt.librarymanagement.ConfigurationReportLiteFormats & sbt.librarymanagement.OrganizationArtifactReportFormats & sbt.librarymanagement.ModuleReportFormats & sbt.librarymanagement.ModuleIDFormats & sbt.librarymanagement.ArtifactFormats & sbt.librarymanagement.ConfigRefFormats & sbt.librarymanagement.ChecksumFormats & sjsonnew.BasicJsonProtocol & sbt.librarymanagement.InclExclRuleFormats & sbt.librarymanagement.CrossVersionFormats & sbt.librarymanagement.DisabledFormats & sbt.librarymanagement.BinaryFormats & sbt.librarymanagement.ConstantFormats & sbt.librarymanagement.PatchFormats & sbt.librarymanagement.FullFormats & sbt.librarymanagement.For3Use2_13Formats & sbt.librarymanagement.For2_13Use3Formats & sbt.librarymanagement.CallerFormats => -implicit lazy val UpdateReportLiteFormat: JsonFormat[sbt.internal.librarymanagement.UpdateReportLite] = new JsonFormat[sbt.internal.librarymanagement.UpdateReportLite] { +given UpdateReportLiteFormat: JsonFormat[sbt.internal.librarymanagement.UpdateReportLite] = new JsonFormat[sbt.internal.librarymanagement.UpdateReportLite] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.librarymanagement.UpdateReportLite = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateStatsFormats.scala b/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateStatsFormats.scala index 72ace0898..0f508e2e7 100644 --- a/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateStatsFormats.scala +++ b/lm-core/src/main/contraband-scala/sbt/librarymanagement/UpdateStatsFormats.scala @@ -6,7 +6,7 @@ package sbt.librarymanagement import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait UpdateStatsFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val UpdateStatsFormat: JsonFormat[sbt.librarymanagement.UpdateStats] = new JsonFormat[sbt.librarymanagement.UpdateStats] { +given UpdateStatsFormat: JsonFormat[sbt.librarymanagement.UpdateStats] = new JsonFormat[sbt.librarymanagement.UpdateStats] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.UpdateStats = { __jsOpt match { case Some(__js) => diff --git a/lm-core/src/main/scala/sbt/internal/librarymanagement/JsonUtil.scala b/lm-core/src/main/scala/sbt/internal/librarymanagement/JsonUtil.scala index f4f68bcf6..1ce59b721 100644 --- a/lm-core/src/main/scala/sbt/internal/librarymanagement/JsonUtil.scala +++ b/lm-core/src/main/scala/sbt/internal/librarymanagement/JsonUtil.scala @@ -2,7 +2,7 @@ package sbt.internal.librarymanagement import java.io.File import sbt.util.{ CacheStore, Logger } -import sbt.librarymanagement.*, LibraryManagementCodec.* +import sbt.librarymanagement.*, LibraryManagementCodec.given import sbt.io.IO private[sbt] object JsonUtil { diff --git a/lm-core/src/test/scala/sbt/librarymanagement/ModuleIdTest.scala b/lm-core/src/test/scala/sbt/librarymanagement/ModuleIdTest.scala index c610512e6..e5a063791 100644 --- a/lm-core/src/test/scala/sbt/librarymanagement/ModuleIdTest.scala +++ b/lm-core/src/test/scala/sbt/librarymanagement/ModuleIdTest.scala @@ -22,13 +22,13 @@ object ModuleIdTest extends verify.BasicTestSuite { } test("it should format itself into JSON") { - import LibraryManagementCodec.* + import LibraryManagementCodec.given val json = Converter.toJson(ModuleID("com.acme", "foo", "1")).get assert(CompactPrinter(json) == expectedJson) } test("it should thaw back from JSON") { - import LibraryManagementCodec.* + import LibraryManagementCodec.given val json = Parser.parseUnsafe(expectedJson) val m = Converter.fromJsonUnsafe[ModuleID](json) assert(m == ModuleID("com.acme", "foo", "1")) diff --git a/lm-ivy/src/main/contraband-scala/sbt/internal/librarymanagement/ivy/ExternalIvyConfigurationFormats.scala b/lm-ivy/src/main/contraband-scala/sbt/internal/librarymanagement/ivy/ExternalIvyConfigurationFormats.scala index 2e3b1db05..79e21f998 100644 --- a/lm-ivy/src/main/contraband-scala/sbt/internal/librarymanagement/ivy/ExternalIvyConfigurationFormats.scala +++ b/lm-ivy/src/main/contraband-scala/sbt/internal/librarymanagement/ivy/ExternalIvyConfigurationFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.librarymanagement.ivy import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ExternalIvyConfigurationFormats { self: sbt.internal.librarymanagement.formats.GlobalLockFormat & sbt.internal.librarymanagement.formats.LoggerFormat & sbt.internal.librarymanagement.ivy.formats.UpdateOptionsFormat & sbt.librarymanagement.ResolverFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ExternalIvyConfigurationFormat: JsonFormat[sbt.internal.librarymanagement.ivy.ExternalIvyConfiguration] = new JsonFormat[sbt.internal.librarymanagement.ivy.ExternalIvyConfiguration] { +given ExternalIvyConfigurationFormat: JsonFormat[sbt.internal.librarymanagement.ivy.ExternalIvyConfiguration] = new JsonFormat[sbt.internal.librarymanagement.ivy.ExternalIvyConfiguration] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.librarymanagement.ivy.ExternalIvyConfiguration = { __jsOpt match { case Some(__js) => diff --git a/lm-ivy/src/main/contraband-scala/sbt/internal/librarymanagement/ivy/InlineIvyConfigurationFormats.scala b/lm-ivy/src/main/contraband-scala/sbt/internal/librarymanagement/ivy/InlineIvyConfigurationFormats.scala index e2c04fd93..07c8346f8 100644 --- a/lm-ivy/src/main/contraband-scala/sbt/internal/librarymanagement/ivy/InlineIvyConfigurationFormats.scala +++ b/lm-ivy/src/main/contraband-scala/sbt/internal/librarymanagement/ivy/InlineIvyConfigurationFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.librarymanagement.ivy import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait InlineIvyConfigurationFormats { self: sbt.internal.librarymanagement.formats.GlobalLockFormat & sbt.internal.librarymanagement.formats.LoggerFormat & sbt.internal.librarymanagement.ivy.formats.UpdateOptionsFormat & sbt.librarymanagement.IvyPathsFormats & sbt.librarymanagement.ResolverFormats & sbt.librarymanagement.ModuleConfigurationFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val InlineIvyConfigurationFormat: JsonFormat[sbt.internal.librarymanagement.ivy.InlineIvyConfiguration] = new JsonFormat[sbt.internal.librarymanagement.ivy.InlineIvyConfiguration] { +given InlineIvyConfigurationFormat: JsonFormat[sbt.internal.librarymanagement.ivy.InlineIvyConfiguration] = new JsonFormat[sbt.internal.librarymanagement.ivy.InlineIvyConfiguration] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.librarymanagement.ivy.InlineIvyConfiguration = { __jsOpt match { case Some(__js) => diff --git a/lm-ivy/src/main/contraband-scala/sbt/internal/librarymanagement/ivy/IvyConfigurationFormats.scala b/lm-ivy/src/main/contraband-scala/sbt/internal/librarymanagement/ivy/IvyConfigurationFormats.scala index b6f39e148..c00441af4 100644 --- a/lm-ivy/src/main/contraband-scala/sbt/internal/librarymanagement/ivy/IvyConfigurationFormats.scala +++ b/lm-ivy/src/main/contraband-scala/sbt/internal/librarymanagement/ivy/IvyConfigurationFormats.scala @@ -7,5 +7,5 @@ package sbt.internal.librarymanagement.ivy import _root_.sjsonnew.JsonFormat trait IvyConfigurationFormats { self: sbt.internal.librarymanagement.formats.GlobalLockFormat & sbt.internal.librarymanagement.formats.LoggerFormat & sbt.internal.librarymanagement.ivy.formats.UpdateOptionsFormat & sbt.librarymanagement.IvyPathsFormats & sbt.librarymanagement.ResolverFormats & sbt.librarymanagement.ModuleConfigurationFormats & sjsonnew.BasicJsonProtocol & sbt.internal.librarymanagement.ivy.InlineIvyConfigurationFormats & sbt.internal.librarymanagement.ivy.ExternalIvyConfigurationFormats => -implicit lazy val IvyConfigurationFormat: JsonFormat[sbt.internal.librarymanagement.ivy.IvyConfiguration] = flatUnionFormat2[sbt.internal.librarymanagement.ivy.IvyConfiguration, sbt.internal.librarymanagement.ivy.InlineIvyConfiguration, sbt.internal.librarymanagement.ivy.ExternalIvyConfiguration]("type") +given IvyConfigurationFormat: JsonFormat[sbt.internal.librarymanagement.ivy.IvyConfiguration] = flatUnionFormat2[sbt.internal.librarymanagement.ivy.IvyConfiguration, sbt.internal.librarymanagement.ivy.InlineIvyConfiguration, sbt.internal.librarymanagement.ivy.ExternalIvyConfiguration]("type") } diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala index 8120f03ec..329444304 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala @@ -378,7 +378,15 @@ final class IvySbt( private def toURL(file: File) = file.toURI.toURL // Todo: We just need writing side of this codec. We can clean up the reads. - private[sbt] object AltLibraryManagementCodec extends IvyLibraryManagementCodec { + private[sbt] object AltLibraryManagementCodec + extends sjsonnew.BasicJsonProtocol + with sbt.librarymanagement.LibraryManagementCodec + with sbt.internal.librarymanagement.formats.GlobalLockFormat + with sbt.internal.librarymanagement.formats.LoggerFormat + with sbt.internal.librarymanagement.ivy.formats.UpdateOptionsFormat + with sbt.librarymanagement.IvyPathsFormats + with sbt.librarymanagement.ResolverFormats + with sbt.librarymanagement.ModuleConfigurationFormats: import sbt.io.Hash type InlineIvyHL = ( Option[IvyPaths], @@ -406,7 +414,7 @@ final class IvySbt( ) // Redefine to use a subset of properties, that are serializable - override given InlineIvyConfigurationFormat: JsonFormat[InlineIvyConfiguration] = { + given InlineIvyConfigurationFormat: JsonFormat[InlineIvyConfiguration] = { def hlToInlineIvy(i: InlineIvyHL): InlineIvyConfiguration = { val ( paths, @@ -428,7 +436,7 @@ final class IvySbt( } // Redefine to use a subset of properties, that are serializable - override given ExternalIvyConfigurationFormat: JsonFormat[ExternalIvyConfiguration] = { + given ExternalIvyConfigurationFormat: JsonFormat[ExternalIvyConfiguration] = { def hlToExternalIvy(e: ExternalIvyHL): ExternalIvyConfiguration = { val (baseDirectory, _) = e ExternalIvyConfiguration( @@ -444,7 +452,7 @@ final class IvySbt( } // Redefine to switch to unionFormat - override given IvyConfigurationFormat: JsonFormat[IvyConfiguration] = + given IvyConfigurationFormat: JsonFormat[IvyConfiguration] = unionFormat2[IvyConfiguration, InlineIvyConfiguration, ExternalIvyConfiguration] object NullLogger extends sbt.internal.util.BasicLogger { @@ -454,15 +462,13 @@ final class IvySbt( override def success(message: => String): Unit = () override def trace(t: => Throwable): Unit = () } - } + end AltLibraryManagementCodec - def extraInputHash: Long = { + def extraInputHash: Long = import AltLibraryManagementCodec.given - Hasher.hash(owner.configuration) match { + Hasher.hash(owner.configuration) match case Success(keyHash) => keyHash.toLong case Failure(_) => 0L - } - } } } diff --git a/main-actions/src/main/contraband-scala/sbt/internal/sona/DeploymentState.scala b/main-actions/src/main/contraband-scala/sbt/internal/sona/DeploymentState.scala index e695d34a2..d54b0da90 100644 --- a/main-actions/src/main/contraband-scala/sbt/internal/sona/DeploymentState.scala +++ b/main-actions/src/main/contraband-scala/sbt/internal/sona/DeploymentState.scala @@ -4,14 +4,15 @@ // DO NOT EDIT MANUALLY package sbt.internal.sona -sealed abstract class DeploymentState extends Serializable +enum DeploymentState { + + case PENDING + case VALIDATING + case VALIDATED + case PUBLISHING + case PUBLISHED + case FAILED +} object DeploymentState { - - case object PENDING extends DeploymentState - case object VALIDATING extends DeploymentState - case object VALIDATED extends DeploymentState - case object PUBLISHING extends DeploymentState - case object PUBLISHED extends DeploymentState - case object FAILED extends DeploymentState } diff --git a/main-actions/src/main/contraband-scala/sbt/internal/sona/codec/DeploymentStateFormats.scala b/main-actions/src/main/contraband-scala/sbt/internal/sona/codec/DeploymentStateFormats.scala index 7aafe6106..93c851096 100644 --- a/main-actions/src/main/contraband-scala/sbt/internal/sona/codec/DeploymentStateFormats.scala +++ b/main-actions/src/main/contraband-scala/sbt/internal/sona/codec/DeploymentStateFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.sona.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait DeploymentStateFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val DeploymentStateFormat: JsonFormat[sbt.internal.sona.DeploymentState] = new JsonFormat[sbt.internal.sona.DeploymentState] { +given DeploymentStateFormat: JsonFormat[sbt.internal.sona.DeploymentState] = new JsonFormat[sbt.internal.sona.DeploymentState] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.sona.DeploymentState = { __jsOpt match { case Some(__js) => diff --git a/main-actions/src/main/contraband-scala/sbt/internal/sona/codec/PublisherStatusFormats.scala b/main-actions/src/main/contraband-scala/sbt/internal/sona/codec/PublisherStatusFormats.scala index da0512827..1d18b31ce 100644 --- a/main-actions/src/main/contraband-scala/sbt/internal/sona/codec/PublisherStatusFormats.scala +++ b/main-actions/src/main/contraband-scala/sbt/internal/sona/codec/PublisherStatusFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.sona.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait PublisherStatusFormats { self: sbt.internal.sona.codec.DeploymentStateFormats & sjsonnew.BasicJsonProtocol & sbt.internal.util.codec.JValueFormats => -implicit lazy val PublisherStatusFormat: JsonFormat[sbt.internal.sona.PublisherStatus] = new JsonFormat[sbt.internal.sona.PublisherStatus] { +given PublisherStatusFormat: JsonFormat[sbt.internal.sona.PublisherStatus] = new JsonFormat[sbt.internal.sona.PublisherStatus] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.sona.PublisherStatus = { __jsOpt match { case Some(__js) => diff --git a/main-actions/src/main/scala/sbt/internal/sona/Sona.scala b/main-actions/src/main/scala/sbt/internal/sona/Sona.scala index 601221c11..b0b277676 100644 --- a/main-actions/src/main/scala/sbt/internal/sona/Sona.scala +++ b/main-actions/src/main/scala/sbt/internal/sona/Sona.scala @@ -195,7 +195,7 @@ object Sona { } object SonaClient { - import sbt.internal.sona.codec.JsonProtocol.* + import sbt.internal.sona.codec.JsonProtocol.given val host: String = "central.sonatype.com" val baseUrl: String = s"https://$host/api/v1" val asJson: FullResponse => JValue = (r: FullResponse) => diff --git a/main-actions/src/test/scala/sbt/CacheIvyTest.scala b/main-actions/src/test/scala/sbt/CacheIvyTest.scala index 963f97c51..3294d975d 100644 --- a/main-actions/src/test/scala/sbt/CacheIvyTest.scala +++ b/main-actions/src/test/scala/sbt/CacheIvyTest.scala @@ -130,7 +130,7 @@ class CacheIvyTest extends Properties("CacheIvy") { } } - import sbt.librarymanagement.LibraryManagementCodec.* + import sbt.librarymanagement.LibraryManagementCodec.given cachePreservesEquality(m, eq, str) } } diff --git a/main-command/src/main/contraband-scala/sbt/CommandSource.scala b/main-command/src/main/contraband-scala/sbt/CommandSource.scala index 4789f339a..1b3e5709e 100644 --- a/main-command/src/main/contraband-scala/sbt/CommandSource.scala +++ b/main-command/src/main/contraband-scala/sbt/CommandSource.scala @@ -19,7 +19,7 @@ final class CommandSource private ( override def toString: String = { "CommandSource(" + channelName + ")" } - private def copy(channelName: String = channelName): CommandSource = { + private def copy(channelName: String): CommandSource = { new CommandSource(channelName) } def withChannelName(channelName: String): CommandSource = { diff --git a/main-command/src/main/contraband-scala/sbt/ConnectionType.scala b/main-command/src/main/contraband-scala/sbt/ConnectionType.scala index 0e611a10c..bb54f3b4c 100644 --- a/main-command/src/main/contraband-scala/sbt/ConnectionType.scala +++ b/main-command/src/main/contraband-scala/sbt/ConnectionType.scala @@ -4,10 +4,11 @@ // DO NOT EDIT MANUALLY package sbt -sealed abstract class ConnectionType extends Serializable +enum ConnectionType { + /** This uses Unix domain socket on POSIX, and named pipe on Windows. */ + case Local + case Tcp +} object ConnectionType { - /** This uses Unix domain socket on POSIX, and named pipe on Windows. */ - case object Local extends ConnectionType - case object Tcp extends ConnectionType } diff --git a/main-command/src/main/contraband-scala/sbt/ServerAuthentication.scala b/main-command/src/main/contraband-scala/sbt/ServerAuthentication.scala index 9c8bb37ce..fefa670ac 100644 --- a/main-command/src/main/contraband-scala/sbt/ServerAuthentication.scala +++ b/main-command/src/main/contraband-scala/sbt/ServerAuthentication.scala @@ -4,9 +4,10 @@ // DO NOT EDIT MANUALLY package sbt -sealed abstract class ServerAuthentication extends Serializable +enum ServerAuthentication { + + case Token +} object ServerAuthentication { - - case object Token extends ServerAuthentication } diff --git a/main-command/src/main/contraband-scala/sbt/internal/CommandSourceFormats.scala b/main-command/src/main/contraband-scala/sbt/internal/CommandSourceFormats.scala index 0cb59cb2c..8eb0fa6a5 100644 --- a/main-command/src/main/contraband-scala/sbt/internal/CommandSourceFormats.scala +++ b/main-command/src/main/contraband-scala/sbt/internal/CommandSourceFormats.scala @@ -6,7 +6,7 @@ package sbt.internal import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait CommandSourceFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val CommandSourceFormat: JsonFormat[sbt.CommandSource] = new JsonFormat[sbt.CommandSource] { +given CommandSourceFormat: JsonFormat[sbt.CommandSource] = new JsonFormat[sbt.CommandSource] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.CommandSource = { __jsOpt match { case Some(__js) => diff --git a/main-command/src/main/contraband-scala/sbt/internal/ConnectionTypeFormats.scala b/main-command/src/main/contraband-scala/sbt/internal/ConnectionTypeFormats.scala index 76c8cb898..cf0b28a61 100644 --- a/main-command/src/main/contraband-scala/sbt/internal/ConnectionTypeFormats.scala +++ b/main-command/src/main/contraband-scala/sbt/internal/ConnectionTypeFormats.scala @@ -6,7 +6,7 @@ package sbt.internal import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ConnectionTypeFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val ConnectionTypeFormat: JsonFormat[sbt.ConnectionType] = new JsonFormat[sbt.ConnectionType] { +given ConnectionTypeFormat: JsonFormat[sbt.ConnectionType] = new JsonFormat[sbt.ConnectionType] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.ConnectionType = { __jsOpt match { case Some(__js) => diff --git a/main-command/src/main/contraband-scala/sbt/internal/ExecFormats.scala b/main-command/src/main/contraband-scala/sbt/internal/ExecFormats.scala index e1337d678..71aaba07b 100644 --- a/main-command/src/main/contraband-scala/sbt/internal/ExecFormats.scala +++ b/main-command/src/main/contraband-scala/sbt/internal/ExecFormats.scala @@ -6,7 +6,7 @@ package sbt.internal import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ExecFormats { self: sbt.internal.CommandSourceFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ExecFormat: JsonFormat[sbt.Exec] = new JsonFormat[sbt.Exec] { +given ExecFormat: JsonFormat[sbt.Exec] = new JsonFormat[sbt.Exec] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.Exec = { __jsOpt match { case Some(__js) => diff --git a/main-command/src/main/contraband-scala/sbt/internal/ServerAuthenticationFormats.scala b/main-command/src/main/contraband-scala/sbt/internal/ServerAuthenticationFormats.scala index b31a5a30e..e9f9055f9 100644 --- a/main-command/src/main/contraband-scala/sbt/internal/ServerAuthenticationFormats.scala +++ b/main-command/src/main/contraband-scala/sbt/internal/ServerAuthenticationFormats.scala @@ -6,7 +6,7 @@ package sbt.internal import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ServerAuthenticationFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val ServerAuthenticationFormat: JsonFormat[sbt.ServerAuthentication] = new JsonFormat[sbt.ServerAuthentication] { +given ServerAuthenticationFormat: JsonFormat[sbt.ServerAuthentication] = new JsonFormat[sbt.ServerAuthentication] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.ServerAuthentication = { __jsOpt match { case Some(__js) => diff --git a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala index b6b8b66fd..a646c18ce 100644 --- a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala +++ b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala @@ -641,7 +641,7 @@ class NetworkClient( (msg.method, msg.params) match { case ("build/logMessage", Some(json)) => if (!attached.get) { - import sbt.internal.langserver.codec.JsonProtocol.* + import sbt.internal.langserver.codec.JsonProtocol.given Converter.fromJson[LogMessageParams](json) match { case Success(params) => splitLogMessage(params) case Failure(_) => Vector() @@ -671,13 +671,13 @@ class NetworkClient( batchMode.set(false) Vector.empty case ("textDocument/publishDiagnostics", Some(json)) => - import sbt.internal.langserver.codec.JsonProtocol.* + import sbt.internal.langserver.codec.JsonProtocol.given Converter.fromJson[PublishDiagnosticsParams](json) match { case Success(params) => splitDiagnostics(params); Vector() case Failure(_) => Vector() } case (`clientJob`, Some(json)) => - import sbt.internal.worker.codec.JsonProtocol.* + import sbt.internal.worker.codec.JsonProtocol.given Converter.fromJson[ClientJobParams](json) match { case Success(params) => clientSideRun(params).get; Vector.empty case Failure(_) => Vector.empty @@ -782,7 +782,7 @@ class NetworkClient( } def onRequest(msg: JsonRpcRequestMessage): Unit = { - import sbt.protocol.codec.JsonProtocol.* + import sbt.protocol.codec.JsonProtocol.given (msg.method, msg.params) match { case (`terminalCapabilities`, Some(json)) => Converter.fromJson[TerminalCapabilitiesQuery](json) match { diff --git a/main-command/src/main/scala/sbt/internal/server/Server.scala b/main-command/src/main/scala/sbt/internal/server/Server.scala index 3d0f0e93b..6043ebd42 100644 --- a/main-command/src/main/scala/sbt/internal/server/Server.scala +++ b/main-command/src/main/scala/sbt/internal/server/Server.scala @@ -174,7 +174,7 @@ private[sbt] object Server { } private def writeTokenfile(): Unit = { - import JsonProtocol.* + import JsonProtocol.given val uri = connection.shortName val t = TokenFile(uri, token) @@ -209,7 +209,7 @@ private[sbt] object Server { // This file exists through the lifetime of the server. private def writePortfile(): Unit = { - import JsonProtocol.* + import JsonProtocol.given val uri = connection.shortName val p = diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 2261c97dc..fc64ba41a 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -3593,7 +3593,6 @@ object Classpaths { val moduleIdJsonKeyFormat: sjsonnew.JsonKeyFormat[ModuleID] = new sjsonnew.JsonKeyFormat[ModuleID] { - import LibraryManagementCodec.* import sjsonnew.support.scalajson.unsafe.* val moduleIdFormat: JsonFormat[ModuleID] = implicitly[JsonFormat[ModuleID]] def write(key: ModuleID): String = diff --git a/main/src/main/scala/sbt/RemoteCache.scala b/main/src/main/scala/sbt/RemoteCache.scala index cdd862309..9107a5b9e 100644 --- a/main/src/main/scala/sbt/RemoteCache.scala +++ b/main/src/main/scala/sbt/RemoteCache.scala @@ -54,7 +54,7 @@ object RemoteCache { mutable.Map.empty private[sbt] def artifactToStr(art: Artifact): String = { - import LibraryManagementCodec.* + import LibraryManagementCodec.given import sjsonnew.support.scalajson.unsafe.* val format: JsonFormat[Artifact] = summon[JsonFormat[Artifact]] CompactPrinter(Converter.toJsonUnsafe(art)(using format)) diff --git a/main/src/main/scala/sbt/internal/CommandExchange.scala b/main/src/main/scala/sbt/internal/CommandExchange.scala index 2ad00fe49..6ce1ce14e 100644 --- a/main/src/main/scala/sbt/internal/CommandExchange.scala +++ b/main/src/main/scala/sbt/internal/CommandExchange.scala @@ -355,7 +355,7 @@ private[sbt] final class CommandExchange { catch { case _: IOException => removeChannel(channel) } def respondStatus(event: ExecStatusEvent): Unit = { - import sbt.protocol.codec.JsonProtocol.* + import sbt.protocol.codec.JsonProtocol.given for { source <- event.channelName channel <- channels.collectFirst { diff --git a/main/src/main/scala/sbt/internal/LibraryManagement.scala b/main/src/main/scala/sbt/internal/LibraryManagement.scala index c8557ca29..a888c59fb 100644 --- a/main/src/main/scala/sbt/internal/LibraryManagement.scala +++ b/main/src/main/scala/sbt/internal/LibraryManagement.scala @@ -116,7 +116,7 @@ private[sbt] object LibraryManagement { /* Skip resolve if last output exists, otherwise error. */ def skipResolve(cache: CacheStore)(inputs: UpdateInputs): UpdateReport = { - import sbt.librarymanagement.LibraryManagementCodec.* + import sbt.librarymanagement.LibraryManagementCodec.given val cachedReport = Tracked .lastOutput[UpdateInputs, UpdateReport](cache) { case (_, Some(out)) => out @@ -134,7 +134,7 @@ private[sbt] object LibraryManagement { def doResolve(cache: CacheStore): UpdateInputs => UpdateReport = { val doCachedResolve = { (inChanged: Boolean, updateInputs: UpdateInputs) => - import sbt.librarymanagement.LibraryManagementCodec.* + import sbt.librarymanagement.LibraryManagementCodec.given try var isCached = false val report = Tracked @@ -158,7 +158,7 @@ private[sbt] object LibraryManagement { log.trace(t) resolvedAgain } - import LibraryManagementCodec.* + import LibraryManagementCodec.given Tracked.inputChanged(cacheStoreFactory.make("inputs"))(doCachedResolve) } @@ -238,7 +238,7 @@ private[sbt] object LibraryManagement { val moduleIdJsonKeyFormat: sjsonnew.JsonKeyFormat[ModuleID] = new sjsonnew.JsonKeyFormat[ModuleID] { - import LibraryManagementCodec.* + import LibraryManagementCodec.given import sjsonnew.support.scalajson.unsafe.* val moduleIdFormat: JsonFormat[ModuleID] = implicitly[JsonFormat[ModuleID]] def write(key: ModuleID): String = diff --git a/main/src/main/scala/sbt/internal/RunUtil.scala b/main/src/main/scala/sbt/internal/RunUtil.scala index e5448c935..c45e04697 100644 --- a/main/src/main/scala/sbt/internal/RunUtil.scala +++ b/main/src/main/scala/sbt/internal/RunUtil.scala @@ -137,7 +137,7 @@ object RunUtil: val result = ClientJobParams( runInfo = info ) - import sbt.internal.worker.codec.JsonProtocol.* + import sbt.internal.worker.codec.JsonProtocol.given state.notifyEvent(Serialization.clientJob, result) result else @@ -193,7 +193,7 @@ object RunUtil: val result = ClientJobParams( runInfo = info ) - import sbt.internal.worker.codec.JsonProtocol.* + import sbt.internal.worker.codec.JsonProtocol.given state.notifyEvent(Serialization.clientJob, result) result else diff --git a/main/src/main/scala/sbt/internal/server/BspCompileTask.scala b/main/src/main/scala/sbt/internal/server/BspCompileTask.scala index c2e4bc438..d0afe4d9d 100644 --- a/main/src/main/scala/sbt/internal/server/BspCompileTask.scala +++ b/main/src/main/scala/sbt/internal/server/BspCompileTask.scala @@ -41,7 +41,7 @@ case class BspCompileTask private ( inputs: Inputs, startTimeMillis: Long ) { - import sbt.internal.bsp.codec.JsonProtocol.* + import sbt.internal.bsp.codec.JsonProtocol.given private[sbt] def notifyStart(): Unit = { val message = s"Compiling $targetName" diff --git a/main/src/main/scala/sbt/internal/server/BuildServerEvalReporter.scala b/main/src/main/scala/sbt/internal/server/BuildServerEvalReporter.scala index 54fbfc828..c8ec33270 100644 --- a/main/src/main/scala/sbt/internal/server/BuildServerEvalReporter.scala +++ b/main/src/main/scala/sbt/internal/server/BuildServerEvalReporter.scala @@ -21,7 +21,7 @@ import sbt.internal.bsp.DiagnosticSeverity import sbt.internal.bsp.PublishDiagnosticsParams import sbt.internal.bsp.Range import sbt.internal.bsp.TextDocumentIdentifier -import sbt.internal.bsp.codec.JsonProtocol.* +import sbt.internal.bsp.codec.JsonProtocol.given import java.nio.file.Path import java.nio.file.Paths diff --git a/main/src/main/scala/sbt/internal/server/BuildServerReporter.scala b/main/src/main/scala/sbt/internal/server/BuildServerReporter.scala index 45c964272..895ad1477 100644 --- a/main/src/main/scala/sbt/internal/server/BuildServerReporter.scala +++ b/main/src/main/scala/sbt/internal/server/BuildServerReporter.scala @@ -85,7 +85,7 @@ final class BuildServerReporterImpl( protected override val logger: ManagedLogger, protected override val underlying: Reporter ) extends BuildServerReporter { - import sbt.internal.bsp.codec.JsonProtocol.* + import sbt.internal.bsp.codec.JsonProtocol.given import sbt.internal.inc.JavaInterfaceUtil.* private lazy val exchange = StandardMain.exchange diff --git a/main/src/main/scala/sbt/internal/server/Definition.scala b/main/src/main/scala/sbt/internal/server/Definition.scala index 02d8cb6a8..fd770d9a9 100644 --- a/main/src/main/scala/sbt/internal/server/Definition.scala +++ b/main/src/main/scala/sbt/internal/server/Definition.scala @@ -158,7 +158,7 @@ private[sbt] object Definition { } private def getDefinition(jsonDefinition: JValue): Option[TextDocumentPositionParams] = { - import langserver.codec.JsonProtocol.* + import langserver.codec.JsonProtocol.given Converter.fromJson[TextDocumentPositionParams](jsonDefinition).toOption } @@ -303,7 +303,7 @@ private[sbt] object Definition { } }.seq log.debug(s"$LspDefinitionLogHead locations $locations") - import langserver.codec.JsonProtocol.* + import langserver.codec.JsonProtocol.given send(commandSource, requestId)(locations.toArray) } .recover { case t => @@ -319,7 +319,7 @@ private[sbt] object Definition { () case None => log.info(s"Symbol not found in definition request $jsonDefinitionString") - import langserver.codec.JsonProtocol.* + import langserver.codec.JsonProtocol.given send(commandSource, requestId)(Array.empty[Location]) } } diff --git a/main/src/main/scala/sbt/internal/server/LanguageServerProtocol.scala b/main/src/main/scala/sbt/internal/server/LanguageServerProtocol.scala index 0b4f234e3..e5af5d4b6 100644 --- a/main/src/main/scala/sbt/internal/server/LanguageServerProtocol.scala +++ b/main/src/main/scala/sbt/internal/server/LanguageServerProtocol.scala @@ -27,7 +27,7 @@ private[sbt] object LanguageServerProtocol { with sjsonnew.BasicJsonProtocol with InitializeOptionFormats - import internalJsonProtocol.* + import internalJsonProtocol.given def json(r: JsonRpcRequestMessage): JValue = r.params.getOrElse( diff --git a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala index 225272713..34156d4bd 100644 --- a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala +++ b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala @@ -47,7 +47,7 @@ import scala.util.control.NonFatal import sbt.protocol.* import sbt.protocol.Serialization.{ attach, cancelReadSystemIn, readSystemIn, promptChannel } -import sbt.protocol.codec.JsonProtocol.* +import sbt.protocol.codec.JsonProtocol.given import sjsonnew.* import sjsonnew.support.scalajson.unsafe.{ CompactPrinter, Converter } @@ -626,7 +626,7 @@ final class NetworkChannel( } def logMessage(level: String, message: String): Unit = { - import sbt.internal.langserver.codec.JsonProtocol.* + import sbt.internal.langserver.codec.JsonProtocol.given jsonRpcNotify( "build/logMessage", LogMessageParams(MessageType.fromLevelString(level), message) diff --git a/main/src/main/scala/sbt/internal/server/VirtualTerminal.scala b/main/src/main/scala/sbt/internal/server/VirtualTerminal.scala index 385ec6ebe..b4850d4d0 100644 --- a/main/src/main/scala/sbt/internal/server/VirtualTerminal.scala +++ b/main/src/main/scala/sbt/internal/server/VirtualTerminal.scala @@ -44,7 +44,7 @@ import sbt.protocol.{ TerminalSetSizeCommand, TerminalSetRawModeCommand, } -import sbt.protocol.codec.JsonProtocol.* +import sbt.protocol.codec.JsonProtocol.given object VirtualTerminal { private val pendingTerminalProperties = diff --git a/project/plugins.sbt b/project/plugins.sbt index ceaf5d809..ba094b7e5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ scalacOptions ++= Seq("-feature", "-language:postfixOps", "-Ywarn-unused:_,-impo addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.1") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5") -addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.7.0") +addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.8.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.4") diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/BuildClientCapabilities.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/BuildClientCapabilities.scala index 2721190ca..f4cef8160 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/BuildClientCapabilities.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/BuildClientCapabilities.scala @@ -23,7 +23,7 @@ final class BuildClientCapabilities private ( override def toString: String = { "BuildClientCapabilities(" + languageIds + ")" } - private def copy(languageIds: Vector[String] = languageIds): BuildClientCapabilities = { + private def copy(languageIds: Vector[String]): BuildClientCapabilities = { new BuildClientCapabilities(languageIds) } def withLanguageIds(languageIds: Vector[String]): BuildClientCapabilities = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/BuildTargetIdentifier.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/BuildTargetIdentifier.scala index 38146322b..a726006f0 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/BuildTargetIdentifier.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/BuildTargetIdentifier.scala @@ -23,7 +23,7 @@ final class BuildTargetIdentifier private ( override def toString: String = { "BuildTargetIdentifier(" + uri + ")" } - private def copy(uri: java.net.URI = uri): BuildTargetIdentifier = { + private def copy(uri: java.net.URI): BuildTargetIdentifier = { new BuildTargetIdentifier(uri) } def withUri(uri: java.net.URI): BuildTargetIdentifier = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/CleanCacheParams.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/CleanCacheParams.scala index b5dc5a17b..70cfdcf4b 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/CleanCacheParams.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/CleanCacheParams.scala @@ -23,7 +23,7 @@ final class CleanCacheParams private ( override def toString: String = { "CleanCacheParams(" + targets + ")" } - private def copy(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier] = targets): CleanCacheParams = { + private def copy(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier]): CleanCacheParams = { new CleanCacheParams(targets) } def withTargets(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier]): CleanCacheParams = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/CompileProvider.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/CompileProvider.scala index d35b7f71e..a42579280 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/CompileProvider.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/CompileProvider.scala @@ -19,7 +19,7 @@ final class CompileProvider private ( override def toString: String = { "CompileProvider(" + languageIds + ")" } - private def copy(languageIds: Vector[String] = languageIds): CompileProvider = { + private def copy(languageIds: Vector[String]): CompileProvider = { new CompileProvider(languageIds) } def withLanguageIds(languageIds: Vector[String]): CompileProvider = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/CompileTask.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/CompileTask.scala index 313887511..244d36e65 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/CompileTask.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/CompileTask.scala @@ -20,7 +20,7 @@ final class CompileTask private ( override def toString: String = { "CompileTask(" + target + ")" } - private def copy(target: sbt.internal.bsp.BuildTargetIdentifier = target): CompileTask = { + private def copy(target: sbt.internal.bsp.BuildTargetIdentifier): CompileTask = { new CompileTask(target) } def withTarget(target: sbt.internal.bsp.BuildTargetIdentifier): CompileTask = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/DebugProvider.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/DebugProvider.scala index 1cdd6f3c0..6058f5257 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/DebugProvider.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/DebugProvider.scala @@ -19,7 +19,7 @@ final class DebugProvider private ( override def toString: String = { "DebugProvider(" + languageIds + ")" } - private def copy(languageIds: Vector[String] = languageIds): DebugProvider = { + private def copy(languageIds: Vector[String]): DebugProvider = { new DebugProvider(languageIds) } def withLanguageIds(languageIds: Vector[String]): DebugProvider = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/DebugSessionAddress.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/DebugSessionAddress.scala index 480d23e74..a4308b359 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/DebugSessionAddress.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/DebugSessionAddress.scala @@ -20,7 +20,7 @@ final class DebugSessionAddress private ( override def toString: String = { "DebugSessionAddress(" + uri + ")" } - private def copy(uri: java.net.URI = uri): DebugSessionAddress = { + private def copy(uri: java.net.URI): DebugSessionAddress = { new DebugSessionAddress(uri) } def withUri(uri: java.net.URI): DebugSessionAddress = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/DependencySourcesParams.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/DependencySourcesParams.scala index 959bcad55..7a1b5a3a9 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/DependencySourcesParams.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/DependencySourcesParams.scala @@ -20,7 +20,7 @@ final class DependencySourcesParams private ( override def toString: String = { "DependencySourcesParams(" + targets + ")" } - private def copy(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier] = targets): DependencySourcesParams = { + private def copy(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier]): DependencySourcesParams = { new DependencySourcesParams(targets) } def withTargets(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier]): DependencySourcesParams = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/DependencySourcesResult.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/DependencySourcesResult.scala index 72a17cacf..eeb53467b 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/DependencySourcesResult.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/DependencySourcesResult.scala @@ -20,7 +20,7 @@ final class DependencySourcesResult private ( override def toString: String = { "DependencySourcesResult(" + items + ")" } - private def copy(items: Vector[sbt.internal.bsp.DependencySourcesItem] = items): DependencySourcesResult = { + private def copy(items: Vector[sbt.internal.bsp.DependencySourcesItem]): DependencySourcesResult = { new DependencySourcesResult(items) } def withItems(items: Vector[sbt.internal.bsp.DependencySourcesItem]): DependencySourcesResult = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/JavacOptionsParams.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/JavacOptionsParams.scala index 57f9da32e..423a542e9 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/JavacOptionsParams.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/JavacOptionsParams.scala @@ -24,7 +24,7 @@ final class JavacOptionsParams private ( override def toString: String = { "JavacOptionsParams(" + targets + ")" } - private def copy(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier] = targets): JavacOptionsParams = { + private def copy(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier]): JavacOptionsParams = { new JavacOptionsParams(targets) } def withTargets(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier]): JavacOptionsParams = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/JavacOptionsResult.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/JavacOptionsResult.scala index 3db2a945e..d05e8eb42 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/JavacOptionsResult.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/JavacOptionsResult.scala @@ -19,7 +19,7 @@ final class JavacOptionsResult private ( override def toString: String = { "JavacOptionsResult(" + items + ")" } - private def copy(items: Vector[sbt.internal.bsp.JavacOptionsItem] = items): JavacOptionsResult = { + private def copy(items: Vector[sbt.internal.bsp.JavacOptionsItem]): JavacOptionsResult = { new JavacOptionsResult(items) } def withItems(items: Vector[sbt.internal.bsp.JavacOptionsItem]): JavacOptionsResult = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/OutputPathsParams.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/OutputPathsParams.scala index 79daa8926..c27c3311a 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/OutputPathsParams.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/OutputPathsParams.scala @@ -20,7 +20,7 @@ final class OutputPathsParams private ( override def toString: String = { "OutputPathsParams(" + targets + ")" } - private def copy(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier] = targets): OutputPathsParams = { + private def copy(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier]): OutputPathsParams = { new OutputPathsParams(targets) } def withTargets(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier]): OutputPathsParams = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/OutputPathsResult.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/OutputPathsResult.scala index abeb8b5d4..7f7f16ed1 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/OutputPathsResult.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/OutputPathsResult.scala @@ -20,7 +20,7 @@ final class OutputPathsResult private ( override def toString: String = { "OutputPathsResult(" + items + ")" } - private def copy(items: Vector[sbt.internal.bsp.OutputPathsItem] = items): OutputPathsResult = { + private def copy(items: Vector[sbt.internal.bsp.OutputPathsItem]): OutputPathsResult = { new OutputPathsResult(items) } def withItems(items: Vector[sbt.internal.bsp.OutputPathsItem]): OutputPathsResult = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/ResourcesParams.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/ResourcesParams.scala index b7ce63bf8..2030bc2eb 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/ResourcesParams.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/ResourcesParams.scala @@ -19,7 +19,7 @@ final class ResourcesParams private ( override def toString: String = { "ResourcesParams(" + targets + ")" } - private def copy(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier] = targets): ResourcesParams = { + private def copy(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier]): ResourcesParams = { new ResourcesParams(targets) } def withTargets(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier]): ResourcesParams = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/ResourcesResult.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/ResourcesResult.scala index a35829ee2..4cc6114f5 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/ResourcesResult.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/ResourcesResult.scala @@ -20,7 +20,7 @@ final class ResourcesResult private ( override def toString: String = { "ResourcesResult(" + items + ")" } - private def copy(items: Vector[sbt.internal.bsp.ResourcesItem] = items): ResourcesResult = { + private def copy(items: Vector[sbt.internal.bsp.ResourcesItem]): ResourcesResult = { new ResourcesResult(items) } def withItems(items: Vector[sbt.internal.bsp.ResourcesItem]): ResourcesResult = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/RunProvider.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/RunProvider.scala index 6d5420942..e4fca3779 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/RunProvider.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/RunProvider.scala @@ -19,7 +19,7 @@ final class RunProvider private ( override def toString: String = { "RunProvider(" + languageIds + ")" } - private def copy(languageIds: Vector[String] = languageIds): RunProvider = { + private def copy(languageIds: Vector[String]): RunProvider = { new RunProvider(languageIds) } def withLanguageIds(languageIds: Vector[String]): RunProvider = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalaDiagnostic.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalaDiagnostic.scala index e6d15857d..3e53a2481 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalaDiagnostic.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalaDiagnostic.scala @@ -27,7 +27,7 @@ final class ScalaDiagnostic private ( override def toString: String = { "ScalaDiagnostic(" + actions + ")" } - private def copy(actions: Vector[sbt.internal.bsp.ScalaAction] = actions): ScalaDiagnostic = { + private def copy(actions: Vector[sbt.internal.bsp.ScalaAction]): ScalaDiagnostic = { new ScalaDiagnostic(actions) } def withActions(actions: Vector[sbt.internal.bsp.ScalaAction]): ScalaDiagnostic = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalaTestParams.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalaTestParams.scala index ce9ebe34c..7818b7b7b 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalaTestParams.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalaTestParams.scala @@ -25,7 +25,7 @@ final class ScalaTestParams private ( override def toString: String = { "ScalaTestParams(" + testClasses + ")" } - private def copy(testClasses: Vector[sbt.internal.bsp.ScalaTestClassesItem] = testClasses): ScalaTestParams = { + private def copy(testClasses: Vector[sbt.internal.bsp.ScalaTestClassesItem]): ScalaTestParams = { new ScalaTestParams(testClasses) } def withTestClasses(testClasses: Vector[sbt.internal.bsp.ScalaTestClassesItem]): ScalaTestParams = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalaWorkspaceEdit.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalaWorkspaceEdit.scala index 9e6a46fed..d0f5bb586 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalaWorkspaceEdit.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalaWorkspaceEdit.scala @@ -20,7 +20,7 @@ final class ScalaWorkspaceEdit private ( override def toString: String = { "ScalaWorkspaceEdit(" + changes + ")" } - private def copy(changes: Vector[sbt.internal.bsp.ScalaTextEdit] = changes): ScalaWorkspaceEdit = { + private def copy(changes: Vector[sbt.internal.bsp.ScalaTextEdit]): ScalaWorkspaceEdit = { new ScalaWorkspaceEdit(changes) } def withChanges(changes: Vector[sbt.internal.bsp.ScalaTextEdit]): ScalaWorkspaceEdit = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalacOptionsParams.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalacOptionsParams.scala index 595b3d10b..4d4228405 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalacOptionsParams.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalacOptionsParams.scala @@ -24,7 +24,7 @@ final class ScalacOptionsParams private ( override def toString: String = { "ScalacOptionsParams(" + targets + ")" } - private def copy(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier] = targets): ScalacOptionsParams = { + private def copy(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier]): ScalacOptionsParams = { new ScalacOptionsParams(targets) } def withTargets(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier]): ScalacOptionsParams = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalacOptionsResult.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalacOptionsResult.scala index ab59e90ce..b164668a7 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalacOptionsResult.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/ScalacOptionsResult.scala @@ -19,7 +19,7 @@ final class ScalacOptionsResult private ( override def toString: String = { "ScalacOptionsResult(" + items + ")" } - private def copy(items: Vector[sbt.internal.bsp.ScalacOptionsItem] = items): ScalacOptionsResult = { + private def copy(items: Vector[sbt.internal.bsp.ScalacOptionsItem]): ScalacOptionsResult = { new ScalacOptionsResult(items) } def withItems(items: Vector[sbt.internal.bsp.ScalacOptionsItem]): ScalacOptionsResult = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/SourcesParams.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/SourcesParams.scala index fca632dd4..ca23d1316 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/SourcesParams.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/SourcesParams.scala @@ -20,7 +20,7 @@ final class SourcesParams private ( override def toString: String = { "SourcesParams(" + targets + ")" } - private def copy(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier] = targets): SourcesParams = { + private def copy(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier]): SourcesParams = { new SourcesParams(targets) } def withTargets(targets: Vector[sbt.internal.bsp.BuildTargetIdentifier]): SourcesParams = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/SourcesResult.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/SourcesResult.scala index 991a9f325..58f4756c0 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/SourcesResult.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/SourcesResult.scala @@ -20,7 +20,7 @@ final class SourcesResult private ( override def toString: String = { "SourcesResult(" + items + ")" } - private def copy(items: Vector[sbt.internal.bsp.SourcesItem] = items): SourcesResult = { + private def copy(items: Vector[sbt.internal.bsp.SourcesItem]): SourcesResult = { new SourcesResult(items) } def withItems(items: Vector[sbt.internal.bsp.SourcesItem]): SourcesResult = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/TestProvider.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/TestProvider.scala index 75477ab17..c8cd1d646 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/TestProvider.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/TestProvider.scala @@ -19,7 +19,7 @@ final class TestProvider private ( override def toString: String = { "TestProvider(" + languageIds + ")" } - private def copy(languageIds: Vector[String] = languageIds): TestProvider = { + private def copy(languageIds: Vector[String]): TestProvider = { new TestProvider(languageIds) } def withLanguageIds(languageIds: Vector[String]): TestProvider = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/TextDocumentIdentifier.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/TextDocumentIdentifier.scala index 4af572e7f..96f2ab28b 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/TextDocumentIdentifier.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/TextDocumentIdentifier.scala @@ -20,7 +20,7 @@ final class TextDocumentIdentifier private ( override def toString: String = { "TextDocumentIdentifier(" + uri + ")" } - private def copy(uri: java.net.URI = uri): TextDocumentIdentifier = { + private def copy(uri: java.net.URI): TextDocumentIdentifier = { new TextDocumentIdentifier(uri) } def withUri(uri: java.net.URI): TextDocumentIdentifier = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/WorkspaceBuildTargetsResult.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/WorkspaceBuildTargetsResult.scala index 6d8fe7ff4..80db30a1f 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/WorkspaceBuildTargetsResult.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/WorkspaceBuildTargetsResult.scala @@ -24,7 +24,7 @@ final class WorkspaceBuildTargetsResult private ( override def toString: String = { "WorkspaceBuildTargetsResult(" + targets + ")" } - private def copy(targets: Vector[sbt.internal.bsp.BuildTarget] = targets): WorkspaceBuildTargetsResult = { + private def copy(targets: Vector[sbt.internal.bsp.BuildTarget]): WorkspaceBuildTargetsResult = { new WorkspaceBuildTargetsResult(targets) } def withTargets(targets: Vector[sbt.internal.bsp.BuildTarget]): WorkspaceBuildTargetsResult = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BspCompileResultFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BspCompileResultFormats.scala index 099997b1f..bf37a611e 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BspCompileResultFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BspCompileResultFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait BspCompileResultFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val BspCompileResultFormat: JsonFormat[sbt.internal.bsp.BspCompileResult] = new JsonFormat[sbt.internal.bsp.BspCompileResult] { +given BspCompileResultFormat: JsonFormat[sbt.internal.bsp.BspCompileResult] = new JsonFormat[sbt.internal.bsp.BspCompileResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.BspCompileResult = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BspConnectionDetailsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BspConnectionDetailsFormats.scala index 72694d57b..ad044413e 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BspConnectionDetailsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BspConnectionDetailsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait BspConnectionDetailsFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val BspConnectionDetailsFormat: JsonFormat[sbt.internal.bsp.BspConnectionDetails] = new JsonFormat[sbt.internal.bsp.BspConnectionDetails] { +given BspConnectionDetailsFormat: JsonFormat[sbt.internal.bsp.BspConnectionDetails] = new JsonFormat[sbt.internal.bsp.BspConnectionDetails] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.BspConnectionDetails = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildClientCapabilitiesFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildClientCapabilitiesFormats.scala index 69f3e9a4c..16b220dd5 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildClientCapabilitiesFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildClientCapabilitiesFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait BuildClientCapabilitiesFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val BuildClientCapabilitiesFormat: JsonFormat[sbt.internal.bsp.BuildClientCapabilities] = new JsonFormat[sbt.internal.bsp.BuildClientCapabilities] { +given BuildClientCapabilitiesFormat: JsonFormat[sbt.internal.bsp.BuildClientCapabilities] = new JsonFormat[sbt.internal.bsp.BuildClientCapabilities] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.BuildClientCapabilities = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildServerCapabilitiesFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildServerCapabilitiesFormats.scala index 2eab34b13..797129a83 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildServerCapabilitiesFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildServerCapabilitiesFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait BuildServerCapabilitiesFormats { self: sbt.internal.bsp.codec.CompileProviderFormats & sjsonnew.BasicJsonProtocol & sbt.internal.bsp.codec.TestProviderFormats & sbt.internal.bsp.codec.RunProviderFormats & sbt.internal.bsp.codec.DebugProviderFormats => -implicit lazy val BuildServerCapabilitiesFormat: JsonFormat[sbt.internal.bsp.BuildServerCapabilities] = new JsonFormat[sbt.internal.bsp.BuildServerCapabilities] { +given BuildServerCapabilitiesFormat: JsonFormat[sbt.internal.bsp.BuildServerCapabilities] = new JsonFormat[sbt.internal.bsp.BuildServerCapabilities] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.BuildServerCapabilities = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildTargetCapabilitiesFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildTargetCapabilitiesFormats.scala index 2cd824ab1..fdf69494a 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildTargetCapabilitiesFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildTargetCapabilitiesFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait BuildTargetCapabilitiesFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val BuildTargetCapabilitiesFormat: JsonFormat[sbt.internal.bsp.BuildTargetCapabilities] = new JsonFormat[sbt.internal.bsp.BuildTargetCapabilities] { +given BuildTargetCapabilitiesFormat: JsonFormat[sbt.internal.bsp.BuildTargetCapabilities] = new JsonFormat[sbt.internal.bsp.BuildTargetCapabilities] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.BuildTargetCapabilities = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildTargetFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildTargetFormats.scala index d0cd2d66a..2b86467ea 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildTargetFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildTargetFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait BuildTargetFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol & sbt.internal.bsp.codec.BuildTargetCapabilitiesFormats & sbt.internal.util.codec.JValueFormats => -implicit lazy val BuildTargetFormat: JsonFormat[sbt.internal.bsp.BuildTarget] = new JsonFormat[sbt.internal.bsp.BuildTarget] { +given BuildTargetFormat: JsonFormat[sbt.internal.bsp.BuildTarget] = new JsonFormat[sbt.internal.bsp.BuildTarget] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.BuildTarget = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildTargetIdentifierFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildTargetIdentifierFormats.scala index c445633c0..187bef138 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildTargetIdentifierFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/BuildTargetIdentifierFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait BuildTargetIdentifierFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val BuildTargetIdentifierFormat: JsonFormat[sbt.internal.bsp.BuildTargetIdentifier] = new JsonFormat[sbt.internal.bsp.BuildTargetIdentifier] { +given BuildTargetIdentifierFormat: JsonFormat[sbt.internal.bsp.BuildTargetIdentifier] = new JsonFormat[sbt.internal.bsp.BuildTargetIdentifier] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.BuildTargetIdentifier = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CleanCacheParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CleanCacheParamsFormats.scala index f974b6d8d..9ebce2030 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CleanCacheParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CleanCacheParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait CleanCacheParamsFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val CleanCacheParamsFormat: JsonFormat[sbt.internal.bsp.CleanCacheParams] = new JsonFormat[sbt.internal.bsp.CleanCacheParams] { +given CleanCacheParamsFormat: JsonFormat[sbt.internal.bsp.CleanCacheParams] = new JsonFormat[sbt.internal.bsp.CleanCacheParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.CleanCacheParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CleanCacheResultFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CleanCacheResultFormats.scala index 7d9b74187..33c5e48d1 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CleanCacheResultFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CleanCacheResultFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait CleanCacheResultFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val CleanCacheResultFormat: JsonFormat[sbt.internal.bsp.CleanCacheResult] = new JsonFormat[sbt.internal.bsp.CleanCacheResult] { +given CleanCacheResultFormat: JsonFormat[sbt.internal.bsp.CleanCacheResult] = new JsonFormat[sbt.internal.bsp.CleanCacheResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.CleanCacheResult = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CompileParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CompileParamsFormats.scala index 6b9fff9ce..297c7f3f3 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CompileParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CompileParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait CompileParamsFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val CompileParamsFormat: JsonFormat[sbt.internal.bsp.CompileParams] = new JsonFormat[sbt.internal.bsp.CompileParams] { +given CompileParamsFormat: JsonFormat[sbt.internal.bsp.CompileParams] = new JsonFormat[sbt.internal.bsp.CompileParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.CompileParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CompileProviderFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CompileProviderFormats.scala index f721e36c6..cc1fad419 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CompileProviderFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CompileProviderFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait CompileProviderFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val CompileProviderFormat: JsonFormat[sbt.internal.bsp.CompileProvider] = new JsonFormat[sbt.internal.bsp.CompileProvider] { +given CompileProviderFormat: JsonFormat[sbt.internal.bsp.CompileProvider] = new JsonFormat[sbt.internal.bsp.CompileProvider] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.CompileProvider = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CompileReportFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CompileReportFormats.scala index d45b5c7ec..646f826b3 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CompileReportFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CompileReportFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait CompileReportFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val CompileReportFormat: JsonFormat[sbt.internal.bsp.CompileReport] = new JsonFormat[sbt.internal.bsp.CompileReport] { +given CompileReportFormat: JsonFormat[sbt.internal.bsp.CompileReport] = new JsonFormat[sbt.internal.bsp.CompileReport] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.CompileReport = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CompileTaskFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CompileTaskFormats.scala index b419c736f..953aeb735 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CompileTaskFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/CompileTaskFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait CompileTaskFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val CompileTaskFormat: JsonFormat[sbt.internal.bsp.CompileTask] = new JsonFormat[sbt.internal.bsp.CompileTask] { +given CompileTaskFormat: JsonFormat[sbt.internal.bsp.CompileTask] = new JsonFormat[sbt.internal.bsp.CompileTask] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.CompileTask = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DebugProviderFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DebugProviderFormats.scala index 5440de985..d3e8a0cd9 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DebugProviderFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DebugProviderFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait DebugProviderFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val DebugProviderFormat: JsonFormat[sbt.internal.bsp.DebugProvider] = new JsonFormat[sbt.internal.bsp.DebugProvider] { +given DebugProviderFormat: JsonFormat[sbt.internal.bsp.DebugProvider] = new JsonFormat[sbt.internal.bsp.DebugProvider] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.DebugProvider = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DebugSessionAddressFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DebugSessionAddressFormats.scala index d46b46655..08a76cb13 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DebugSessionAddressFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DebugSessionAddressFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait DebugSessionAddressFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val DebugSessionAddressFormat: JsonFormat[sbt.internal.bsp.DebugSessionAddress] = new JsonFormat[sbt.internal.bsp.DebugSessionAddress] { +given DebugSessionAddressFormat: JsonFormat[sbt.internal.bsp.DebugSessionAddress] = new JsonFormat[sbt.internal.bsp.DebugSessionAddress] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.DebugSessionAddress = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DebugSessionParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DebugSessionParamsFormats.scala index 281375a42..c4a26f6e6 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DebugSessionParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DebugSessionParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait DebugSessionParamsFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol & sbt.internal.util.codec.JValueFormats => -implicit lazy val DebugSessionParamsFormat: JsonFormat[sbt.internal.bsp.DebugSessionParams] = new JsonFormat[sbt.internal.bsp.DebugSessionParams] { +given DebugSessionParamsFormat: JsonFormat[sbt.internal.bsp.DebugSessionParams] = new JsonFormat[sbt.internal.bsp.DebugSessionParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.DebugSessionParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DependencySourcesItemFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DependencySourcesItemFormats.scala index 908e3b9f0..03be26f8c 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DependencySourcesItemFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DependencySourcesItemFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait DependencySourcesItemFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val DependencySourcesItemFormat: JsonFormat[sbt.internal.bsp.DependencySourcesItem] = new JsonFormat[sbt.internal.bsp.DependencySourcesItem] { +given DependencySourcesItemFormat: JsonFormat[sbt.internal.bsp.DependencySourcesItem] = new JsonFormat[sbt.internal.bsp.DependencySourcesItem] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.DependencySourcesItem = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DependencySourcesParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DependencySourcesParamsFormats.scala index 89ae9e041..4826f045f 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DependencySourcesParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DependencySourcesParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait DependencySourcesParamsFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val DependencySourcesParamsFormat: JsonFormat[sbt.internal.bsp.DependencySourcesParams] = new JsonFormat[sbt.internal.bsp.DependencySourcesParams] { +given DependencySourcesParamsFormat: JsonFormat[sbt.internal.bsp.DependencySourcesParams] = new JsonFormat[sbt.internal.bsp.DependencySourcesParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.DependencySourcesParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DependencySourcesResultFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DependencySourcesResultFormats.scala index 542763f60..dd4fe938c 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DependencySourcesResultFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DependencySourcesResultFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait DependencySourcesResultFormats { self: sbt.internal.bsp.codec.DependencySourcesItemFormats & sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val DependencySourcesResultFormat: JsonFormat[sbt.internal.bsp.DependencySourcesResult] = new JsonFormat[sbt.internal.bsp.DependencySourcesResult] { +given DependencySourcesResultFormat: JsonFormat[sbt.internal.bsp.DependencySourcesResult] = new JsonFormat[sbt.internal.bsp.DependencySourcesResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.DependencySourcesResult = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DiagnosticFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DiagnosticFormats.scala index 1ada35a55..3bf929a8a 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DiagnosticFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DiagnosticFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait DiagnosticFormats { self: sbt.internal.bsp.codec.RangeFormats & sbt.internal.bsp.codec.PositionFormats & sjsonnew.BasicJsonProtocol & sbt.internal.bsp.codec.DiagnosticRelatedInformationFormats & sbt.internal.bsp.codec.LocationFormats & sbt.internal.bsp.codec.ScalaDiagnosticFormats & sbt.internal.bsp.codec.ScalaActionFormats & sbt.internal.bsp.codec.ScalaWorkspaceEditFormats & sbt.internal.bsp.codec.ScalaTextEditFormats => -implicit lazy val DiagnosticFormat: JsonFormat[sbt.internal.bsp.Diagnostic] = new JsonFormat[sbt.internal.bsp.Diagnostic] { +given DiagnosticFormat: JsonFormat[sbt.internal.bsp.Diagnostic] = new JsonFormat[sbt.internal.bsp.Diagnostic] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.Diagnostic = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DiagnosticRelatedInformationFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DiagnosticRelatedInformationFormats.scala index 7c6ab7f81..5f2a5a79d 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DiagnosticRelatedInformationFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/DiagnosticRelatedInformationFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait DiagnosticRelatedInformationFormats { self: sbt.internal.bsp.codec.LocationFormats & sbt.internal.bsp.codec.RangeFormats & sbt.internal.bsp.codec.PositionFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val DiagnosticRelatedInformationFormat: JsonFormat[sbt.internal.bsp.DiagnosticRelatedInformation] = new JsonFormat[sbt.internal.bsp.DiagnosticRelatedInformation] { +given DiagnosticRelatedInformationFormat: JsonFormat[sbt.internal.bsp.DiagnosticRelatedInformation] = new JsonFormat[sbt.internal.bsp.DiagnosticRelatedInformation] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.DiagnosticRelatedInformation = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/InitializeBuildParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/InitializeBuildParamsFormats.scala index 911fbcddd..e73185d84 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/InitializeBuildParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/InitializeBuildParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait InitializeBuildParamsFormats { self: sbt.internal.bsp.codec.BuildClientCapabilitiesFormats & sjsonnew.BasicJsonProtocol & sbt.internal.util.codec.JValueFormats => -implicit lazy val InitializeBuildParamsFormat: JsonFormat[sbt.internal.bsp.InitializeBuildParams] = new JsonFormat[sbt.internal.bsp.InitializeBuildParams] { +given InitializeBuildParamsFormat: JsonFormat[sbt.internal.bsp.InitializeBuildParams] = new JsonFormat[sbt.internal.bsp.InitializeBuildParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.InitializeBuildParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/InitializeBuildResultFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/InitializeBuildResultFormats.scala index af10be3cd..24b4d439f 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/InitializeBuildResultFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/InitializeBuildResultFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait InitializeBuildResultFormats { self: sbt.internal.bsp.codec.BuildServerCapabilitiesFormats & sbt.internal.bsp.codec.CompileProviderFormats & sjsonnew.BasicJsonProtocol & sbt.internal.bsp.codec.TestProviderFormats & sbt.internal.bsp.codec.RunProviderFormats & sbt.internal.bsp.codec.DebugProviderFormats & sbt.internal.util.codec.JValueFormats => -implicit lazy val InitializeBuildResultFormat: JsonFormat[sbt.internal.bsp.InitializeBuildResult] = new JsonFormat[sbt.internal.bsp.InitializeBuildResult] { +given InitializeBuildResultFormat: JsonFormat[sbt.internal.bsp.InitializeBuildResult] = new JsonFormat[sbt.internal.bsp.InitializeBuildResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.InitializeBuildResult = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JavacOptionsItemFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JavacOptionsItemFormats.scala index f56a22234..36cb9ff0d 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JavacOptionsItemFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JavacOptionsItemFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait JavacOptionsItemFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val JavacOptionsItemFormat: JsonFormat[sbt.internal.bsp.JavacOptionsItem] = new JsonFormat[sbt.internal.bsp.JavacOptionsItem] { +given JavacOptionsItemFormat: JsonFormat[sbt.internal.bsp.JavacOptionsItem] = new JsonFormat[sbt.internal.bsp.JavacOptionsItem] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.JavacOptionsItem = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JavacOptionsParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JavacOptionsParamsFormats.scala index 0285c3c29..faef966fc 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JavacOptionsParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JavacOptionsParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait JavacOptionsParamsFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val JavacOptionsParamsFormat: JsonFormat[sbt.internal.bsp.JavacOptionsParams] = new JsonFormat[sbt.internal.bsp.JavacOptionsParams] { +given JavacOptionsParamsFormat: JsonFormat[sbt.internal.bsp.JavacOptionsParams] = new JsonFormat[sbt.internal.bsp.JavacOptionsParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.JavacOptionsParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JavacOptionsResultFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JavacOptionsResultFormats.scala index 5c7337b18..b77741281 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JavacOptionsResultFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JavacOptionsResultFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait JavacOptionsResultFormats { self: sbt.internal.bsp.codec.JavacOptionsItemFormats & sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val JavacOptionsResultFormat: JsonFormat[sbt.internal.bsp.JavacOptionsResult] = new JsonFormat[sbt.internal.bsp.JavacOptionsResult] { +given JavacOptionsResultFormat: JsonFormat[sbt.internal.bsp.JavacOptionsResult] = new JsonFormat[sbt.internal.bsp.JavacOptionsResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.JavacOptionsResult = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmBuildTargetFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmBuildTargetFormats.scala index ec7c26f9e..3f20653a2 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmBuildTargetFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmBuildTargetFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait JvmBuildTargetFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val JvmBuildTargetFormat: JsonFormat[sbt.internal.bsp.JvmBuildTarget] = new JsonFormat[sbt.internal.bsp.JvmBuildTarget] { +given JvmBuildTargetFormat: JsonFormat[sbt.internal.bsp.JvmBuildTarget] = new JsonFormat[sbt.internal.bsp.JvmBuildTarget] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.JvmBuildTarget = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmEnvironmentItemFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmEnvironmentItemFormats.scala index 47226b60b..38bcefc40 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmEnvironmentItemFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmEnvironmentItemFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait JvmEnvironmentItemFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val JvmEnvironmentItemFormat: JsonFormat[sbt.internal.bsp.JvmEnvironmentItem] = new JsonFormat[sbt.internal.bsp.JvmEnvironmentItem] { +given JvmEnvironmentItemFormat: JsonFormat[sbt.internal.bsp.JvmEnvironmentItem] = new JsonFormat[sbt.internal.bsp.JvmEnvironmentItem] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.JvmEnvironmentItem = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmRunEnvironmentParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmRunEnvironmentParamsFormats.scala index 556ef54c3..ea969014c 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmRunEnvironmentParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmRunEnvironmentParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait JvmRunEnvironmentParamsFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val JvmRunEnvironmentParamsFormat: JsonFormat[sbt.internal.bsp.JvmRunEnvironmentParams] = new JsonFormat[sbt.internal.bsp.JvmRunEnvironmentParams] { +given JvmRunEnvironmentParamsFormat: JsonFormat[sbt.internal.bsp.JvmRunEnvironmentParams] = new JsonFormat[sbt.internal.bsp.JvmRunEnvironmentParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.JvmRunEnvironmentParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmRunEnvironmentResultFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmRunEnvironmentResultFormats.scala index 28ef062b7..f97652939 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmRunEnvironmentResultFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmRunEnvironmentResultFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait JvmRunEnvironmentResultFormats { self: sbt.internal.bsp.codec.JvmEnvironmentItemFormats & sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val JvmRunEnvironmentResultFormat: JsonFormat[sbt.internal.bsp.JvmRunEnvironmentResult] = new JsonFormat[sbt.internal.bsp.JvmRunEnvironmentResult] { +given JvmRunEnvironmentResultFormat: JsonFormat[sbt.internal.bsp.JvmRunEnvironmentResult] = new JsonFormat[sbt.internal.bsp.JvmRunEnvironmentResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.JvmRunEnvironmentResult = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmTestEnvironmentParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmTestEnvironmentParamsFormats.scala index 91c9edd0e..98e1968fd 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmTestEnvironmentParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmTestEnvironmentParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait JvmTestEnvironmentParamsFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val JvmTestEnvironmentParamsFormat: JsonFormat[sbt.internal.bsp.JvmTestEnvironmentParams] = new JsonFormat[sbt.internal.bsp.JvmTestEnvironmentParams] { +given JvmTestEnvironmentParamsFormat: JsonFormat[sbt.internal.bsp.JvmTestEnvironmentParams] = new JsonFormat[sbt.internal.bsp.JvmTestEnvironmentParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.JvmTestEnvironmentParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmTestEnvironmentResultFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmTestEnvironmentResultFormats.scala index a03c01be7..6a5d5a74e 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmTestEnvironmentResultFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/JvmTestEnvironmentResultFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait JvmTestEnvironmentResultFormats { self: sbt.internal.bsp.codec.JvmEnvironmentItemFormats & sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val JvmTestEnvironmentResultFormat: JsonFormat[sbt.internal.bsp.JvmTestEnvironmentResult] = new JsonFormat[sbt.internal.bsp.JvmTestEnvironmentResult] { +given JvmTestEnvironmentResultFormat: JsonFormat[sbt.internal.bsp.JvmTestEnvironmentResult] = new JsonFormat[sbt.internal.bsp.JvmTestEnvironmentResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.JvmTestEnvironmentResult = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/LocationFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/LocationFormats.scala index 9d7d5d66f..68c40c6df 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/LocationFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/LocationFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait LocationFormats { self: sbt.internal.bsp.codec.RangeFormats & sbt.internal.bsp.codec.PositionFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val LocationFormat: JsonFormat[sbt.internal.bsp.Location] = new JsonFormat[sbt.internal.bsp.Location] { +given LocationFormat: JsonFormat[sbt.internal.bsp.Location] = new JsonFormat[sbt.internal.bsp.Location] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.Location = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/MetalsMetadataFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/MetalsMetadataFormats.scala index fb225b5bb..72ac705be 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/MetalsMetadataFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/MetalsMetadataFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait MetalsMetadataFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val MetalsMetadataFormat: JsonFormat[sbt.internal.bsp.MetalsMetadata] = new JsonFormat[sbt.internal.bsp.MetalsMetadata] { +given MetalsMetadataFormat: JsonFormat[sbt.internal.bsp.MetalsMetadata] = new JsonFormat[sbt.internal.bsp.MetalsMetadata] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.MetalsMetadata = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/OutputPathItemFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/OutputPathItemFormats.scala index 542a2286d..313e54083 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/OutputPathItemFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/OutputPathItemFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait OutputPathItemFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val OutputPathItemFormat: JsonFormat[sbt.internal.bsp.OutputPathItem] = new JsonFormat[sbt.internal.bsp.OutputPathItem] { +given OutputPathItemFormat: JsonFormat[sbt.internal.bsp.OutputPathItem] = new JsonFormat[sbt.internal.bsp.OutputPathItem] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.OutputPathItem = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/OutputPathsItemFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/OutputPathsItemFormats.scala index 85432c446..4a40bfd4f 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/OutputPathsItemFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/OutputPathsItemFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait OutputPathsItemFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol & sbt.internal.bsp.codec.OutputPathItemFormats => -implicit lazy val OutputPathsItemFormat: JsonFormat[sbt.internal.bsp.OutputPathsItem] = new JsonFormat[sbt.internal.bsp.OutputPathsItem] { +given OutputPathsItemFormat: JsonFormat[sbt.internal.bsp.OutputPathsItem] = new JsonFormat[sbt.internal.bsp.OutputPathsItem] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.OutputPathsItem = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/OutputPathsParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/OutputPathsParamsFormats.scala index 3fca0de67..fba743cbe 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/OutputPathsParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/OutputPathsParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait OutputPathsParamsFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val OutputPathsParamsFormat: JsonFormat[sbt.internal.bsp.OutputPathsParams] = new JsonFormat[sbt.internal.bsp.OutputPathsParams] { +given OutputPathsParamsFormat: JsonFormat[sbt.internal.bsp.OutputPathsParams] = new JsonFormat[sbt.internal.bsp.OutputPathsParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.OutputPathsParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/OutputPathsResultFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/OutputPathsResultFormats.scala index e79f1bef9..bffd5bbc5 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/OutputPathsResultFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/OutputPathsResultFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait OutputPathsResultFormats { self: sbt.internal.bsp.codec.OutputPathsItemFormats & sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol & sbt.internal.bsp.codec.OutputPathItemFormats => -implicit lazy val OutputPathsResultFormat: JsonFormat[sbt.internal.bsp.OutputPathsResult] = new JsonFormat[sbt.internal.bsp.OutputPathsResult] { +given OutputPathsResultFormat: JsonFormat[sbt.internal.bsp.OutputPathsResult] = new JsonFormat[sbt.internal.bsp.OutputPathsResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.OutputPathsResult = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/PositionFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/PositionFormats.scala index 1e399683a..f253ade9f 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/PositionFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/PositionFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait PositionFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val PositionFormat: JsonFormat[sbt.internal.bsp.Position] = new JsonFormat[sbt.internal.bsp.Position] { +given PositionFormat: JsonFormat[sbt.internal.bsp.Position] = new JsonFormat[sbt.internal.bsp.Position] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.Position = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/PublishDiagnosticsParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/PublishDiagnosticsParamsFormats.scala index a2f11f22e..ecf0a3b25 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/PublishDiagnosticsParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/PublishDiagnosticsParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait PublishDiagnosticsParamsFormats { self: sbt.internal.bsp.codec.TextDocumentIdentifierFormats & sjsonnew.BasicJsonProtocol & sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sbt.internal.bsp.codec.DiagnosticFormats & sbt.internal.bsp.codec.RangeFormats & sbt.internal.bsp.codec.PositionFormats & sbt.internal.bsp.codec.DiagnosticRelatedInformationFormats & sbt.internal.bsp.codec.LocationFormats & sbt.internal.bsp.codec.ScalaDiagnosticFormats & sbt.internal.bsp.codec.ScalaActionFormats & sbt.internal.bsp.codec.ScalaWorkspaceEditFormats & sbt.internal.bsp.codec.ScalaTextEditFormats => -implicit lazy val PublishDiagnosticsParamsFormat: JsonFormat[sbt.internal.bsp.PublishDiagnosticsParams] = new JsonFormat[sbt.internal.bsp.PublishDiagnosticsParams] { +given PublishDiagnosticsParamsFormat: JsonFormat[sbt.internal.bsp.PublishDiagnosticsParams] = new JsonFormat[sbt.internal.bsp.PublishDiagnosticsParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.PublishDiagnosticsParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/RangeFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/RangeFormats.scala index d44ba38fa..9e5b59325 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/RangeFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/RangeFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait RangeFormats { self: sbt.internal.bsp.codec.PositionFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val RangeFormat: JsonFormat[sbt.internal.bsp.Range] = new JsonFormat[sbt.internal.bsp.Range] { +given RangeFormat: JsonFormat[sbt.internal.bsp.Range] = new JsonFormat[sbt.internal.bsp.Range] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.Range = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ResourcesItemFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ResourcesItemFormats.scala index c3b60d399..e3a7a1021 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ResourcesItemFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ResourcesItemFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ResourcesItemFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ResourcesItemFormat: JsonFormat[sbt.internal.bsp.ResourcesItem] = new JsonFormat[sbt.internal.bsp.ResourcesItem] { +given ResourcesItemFormat: JsonFormat[sbt.internal.bsp.ResourcesItem] = new JsonFormat[sbt.internal.bsp.ResourcesItem] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ResourcesItem = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ResourcesParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ResourcesParamsFormats.scala index 3349ffc68..85373c90d 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ResourcesParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ResourcesParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ResourcesParamsFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ResourcesParamsFormat: JsonFormat[sbt.internal.bsp.ResourcesParams] = new JsonFormat[sbt.internal.bsp.ResourcesParams] { +given ResourcesParamsFormat: JsonFormat[sbt.internal.bsp.ResourcesParams] = new JsonFormat[sbt.internal.bsp.ResourcesParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ResourcesParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ResourcesResultFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ResourcesResultFormats.scala index 16bbf54af..2198b0e8b 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ResourcesResultFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ResourcesResultFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ResourcesResultFormats { self: sbt.internal.bsp.codec.ResourcesItemFormats & sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ResourcesResultFormat: JsonFormat[sbt.internal.bsp.ResourcesResult] = new JsonFormat[sbt.internal.bsp.ResourcesResult] { +given ResourcesResultFormat: JsonFormat[sbt.internal.bsp.ResourcesResult] = new JsonFormat[sbt.internal.bsp.ResourcesResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ResourcesResult = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/RunParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/RunParamsFormats.scala index 09bae4a3f..b20c4a76d 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/RunParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/RunParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait RunParamsFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol & sbt.internal.util.codec.JValueFormats => -implicit lazy val RunParamsFormat: JsonFormat[sbt.internal.bsp.RunParams] = new JsonFormat[sbt.internal.bsp.RunParams] { +given RunParamsFormat: JsonFormat[sbt.internal.bsp.RunParams] = new JsonFormat[sbt.internal.bsp.RunParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.RunParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/RunProviderFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/RunProviderFormats.scala index 37009ffec..21cfc3b23 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/RunProviderFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/RunProviderFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait RunProviderFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val RunProviderFormat: JsonFormat[sbt.internal.bsp.RunProvider] = new JsonFormat[sbt.internal.bsp.RunProvider] { +given RunProviderFormat: JsonFormat[sbt.internal.bsp.RunProvider] = new JsonFormat[sbt.internal.bsp.RunProvider] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.RunProvider = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/RunResultFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/RunResultFormats.scala index 3325f7796..4feaa7f53 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/RunResultFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/RunResultFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait RunResultFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val RunResultFormat: JsonFormat[sbt.internal.bsp.RunResult] = new JsonFormat[sbt.internal.bsp.RunResult] { +given RunResultFormat: JsonFormat[sbt.internal.bsp.RunResult] = new JsonFormat[sbt.internal.bsp.RunResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.RunResult = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SbtBuildTargetFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SbtBuildTargetFormats.scala index d5d5ab807..8ef272227 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SbtBuildTargetFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SbtBuildTargetFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait SbtBuildTargetFormats { self: sbt.internal.bsp.codec.ScalaBuildTargetFormats & sbt.internal.bsp.codec.JvmBuildTargetFormats & sjsonnew.BasicJsonProtocol & sbt.internal.bsp.codec.BuildTargetIdentifierFormats => -implicit lazy val SbtBuildTargetFormat: JsonFormat[sbt.internal.bsp.SbtBuildTarget] = new JsonFormat[sbt.internal.bsp.SbtBuildTarget] { +given SbtBuildTargetFormat: JsonFormat[sbt.internal.bsp.SbtBuildTarget] = new JsonFormat[sbt.internal.bsp.SbtBuildTarget] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.SbtBuildTarget = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaActionFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaActionFormats.scala index 0caa3a173..5bb2d58aa 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaActionFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaActionFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ScalaActionFormats { self: sbt.internal.bsp.codec.ScalaWorkspaceEditFormats & sbt.internal.bsp.codec.ScalaTextEditFormats & sbt.internal.bsp.codec.RangeFormats & sbt.internal.bsp.codec.PositionFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ScalaActionFormat: JsonFormat[sbt.internal.bsp.ScalaAction] = new JsonFormat[sbt.internal.bsp.ScalaAction] { +given ScalaActionFormat: JsonFormat[sbt.internal.bsp.ScalaAction] = new JsonFormat[sbt.internal.bsp.ScalaAction] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ScalaAction = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaBuildTargetFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaBuildTargetFormats.scala index 6e0eb9c88..97b2835f1 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaBuildTargetFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaBuildTargetFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ScalaBuildTargetFormats { self: sbt.internal.bsp.codec.JvmBuildTargetFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ScalaBuildTargetFormat: JsonFormat[sbt.internal.bsp.ScalaBuildTarget] = new JsonFormat[sbt.internal.bsp.ScalaBuildTarget] { +given ScalaBuildTargetFormat: JsonFormat[sbt.internal.bsp.ScalaBuildTarget] = new JsonFormat[sbt.internal.bsp.ScalaBuildTarget] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ScalaBuildTarget = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaDiagnosticFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaDiagnosticFormats.scala index a2e2cccfc..9df834d53 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaDiagnosticFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaDiagnosticFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ScalaDiagnosticFormats { self: sbt.internal.bsp.codec.ScalaActionFormats & sbt.internal.bsp.codec.ScalaWorkspaceEditFormats & sbt.internal.bsp.codec.ScalaTextEditFormats & sbt.internal.bsp.codec.RangeFormats & sbt.internal.bsp.codec.PositionFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ScalaDiagnosticFormat: JsonFormat[sbt.internal.bsp.ScalaDiagnostic] = new JsonFormat[sbt.internal.bsp.ScalaDiagnostic] { +given ScalaDiagnosticFormat: JsonFormat[sbt.internal.bsp.ScalaDiagnostic] = new JsonFormat[sbt.internal.bsp.ScalaDiagnostic] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ScalaDiagnostic = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaMainClassFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaMainClassFormats.scala index f4b132525..9b29661a7 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaMainClassFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaMainClassFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ScalaMainClassFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val ScalaMainClassFormat: JsonFormat[sbt.internal.bsp.ScalaMainClass] = new JsonFormat[sbt.internal.bsp.ScalaMainClass] { +given ScalaMainClassFormat: JsonFormat[sbt.internal.bsp.ScalaMainClass] = new JsonFormat[sbt.internal.bsp.ScalaMainClass] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ScalaMainClass = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaMainClassesItemFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaMainClassesItemFormats.scala index 634fe49bb..6d1087831 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaMainClassesItemFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaMainClassesItemFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ScalaMainClassesItemFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol & sbt.internal.bsp.codec.ScalaMainClassFormats => -implicit lazy val ScalaMainClassesItemFormat: JsonFormat[sbt.internal.bsp.ScalaMainClassesItem] = new JsonFormat[sbt.internal.bsp.ScalaMainClassesItem] { +given ScalaMainClassesItemFormat: JsonFormat[sbt.internal.bsp.ScalaMainClassesItem] = new JsonFormat[sbt.internal.bsp.ScalaMainClassesItem] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ScalaMainClassesItem = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaMainClassesParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaMainClassesParamsFormats.scala index 22a11edb8..2176de1d2 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaMainClassesParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaMainClassesParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ScalaMainClassesParamsFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ScalaMainClassesParamsFormat: JsonFormat[sbt.internal.bsp.ScalaMainClassesParams] = new JsonFormat[sbt.internal.bsp.ScalaMainClassesParams] { +given ScalaMainClassesParamsFormat: JsonFormat[sbt.internal.bsp.ScalaMainClassesParams] = new JsonFormat[sbt.internal.bsp.ScalaMainClassesParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ScalaMainClassesParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaMainClassesResultFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaMainClassesResultFormats.scala index 559a90a83..8d08ab8a6 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaMainClassesResultFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaMainClassesResultFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ScalaMainClassesResultFormats { self: sbt.internal.bsp.codec.ScalaMainClassesItemFormats & sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol & sbt.internal.bsp.codec.ScalaMainClassFormats => -implicit lazy val ScalaMainClassesResultFormat: JsonFormat[sbt.internal.bsp.ScalaMainClassesResult] = new JsonFormat[sbt.internal.bsp.ScalaMainClassesResult] { +given ScalaMainClassesResultFormat: JsonFormat[sbt.internal.bsp.ScalaMainClassesResult] = new JsonFormat[sbt.internal.bsp.ScalaMainClassesResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ScalaMainClassesResult = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTestClassesItemFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTestClassesItemFormats.scala index 855fb89c4..4eae70c97 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTestClassesItemFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTestClassesItemFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ScalaTestClassesItemFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ScalaTestClassesItemFormat: JsonFormat[sbt.internal.bsp.ScalaTestClassesItem] = new JsonFormat[sbt.internal.bsp.ScalaTestClassesItem] { +given ScalaTestClassesItemFormat: JsonFormat[sbt.internal.bsp.ScalaTestClassesItem] = new JsonFormat[sbt.internal.bsp.ScalaTestClassesItem] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ScalaTestClassesItem = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTestClassesParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTestClassesParamsFormats.scala index ca0ff6b9e..ec903657d 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTestClassesParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTestClassesParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ScalaTestClassesParamsFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ScalaTestClassesParamsFormat: JsonFormat[sbt.internal.bsp.ScalaTestClassesParams] = new JsonFormat[sbt.internal.bsp.ScalaTestClassesParams] { +given ScalaTestClassesParamsFormat: JsonFormat[sbt.internal.bsp.ScalaTestClassesParams] = new JsonFormat[sbt.internal.bsp.ScalaTestClassesParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ScalaTestClassesParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTestClassesResultFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTestClassesResultFormats.scala index 31f15e863..03dce1f53 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTestClassesResultFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTestClassesResultFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ScalaTestClassesResultFormats { self: sbt.internal.bsp.codec.ScalaTestClassesItemFormats & sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ScalaTestClassesResultFormat: JsonFormat[sbt.internal.bsp.ScalaTestClassesResult] = new JsonFormat[sbt.internal.bsp.ScalaTestClassesResult] { +given ScalaTestClassesResultFormat: JsonFormat[sbt.internal.bsp.ScalaTestClassesResult] = new JsonFormat[sbt.internal.bsp.ScalaTestClassesResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ScalaTestClassesResult = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTestParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTestParamsFormats.scala index 2f869d574..b681aba60 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTestParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTestParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ScalaTestParamsFormats { self: sbt.internal.bsp.codec.ScalaTestClassesItemFormats & sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ScalaTestParamsFormat: JsonFormat[sbt.internal.bsp.ScalaTestParams] = new JsonFormat[sbt.internal.bsp.ScalaTestParams] { +given ScalaTestParamsFormat: JsonFormat[sbt.internal.bsp.ScalaTestParams] = new JsonFormat[sbt.internal.bsp.ScalaTestParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ScalaTestParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTextEditFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTextEditFormats.scala index acbdeae38..97f4ee9cc 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTextEditFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaTextEditFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ScalaTextEditFormats { self: sbt.internal.bsp.codec.RangeFormats & sbt.internal.bsp.codec.PositionFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ScalaTextEditFormat: JsonFormat[sbt.internal.bsp.ScalaTextEdit] = new JsonFormat[sbt.internal.bsp.ScalaTextEdit] { +given ScalaTextEditFormat: JsonFormat[sbt.internal.bsp.ScalaTextEdit] = new JsonFormat[sbt.internal.bsp.ScalaTextEdit] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ScalaTextEdit = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaWorkspaceEditFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaWorkspaceEditFormats.scala index 002660afe..c20af39b4 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaWorkspaceEditFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalaWorkspaceEditFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ScalaWorkspaceEditFormats { self: sbt.internal.bsp.codec.ScalaTextEditFormats & sbt.internal.bsp.codec.RangeFormats & sbt.internal.bsp.codec.PositionFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ScalaWorkspaceEditFormat: JsonFormat[sbt.internal.bsp.ScalaWorkspaceEdit] = new JsonFormat[sbt.internal.bsp.ScalaWorkspaceEdit] { +given ScalaWorkspaceEditFormat: JsonFormat[sbt.internal.bsp.ScalaWorkspaceEdit] = new JsonFormat[sbt.internal.bsp.ScalaWorkspaceEdit] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ScalaWorkspaceEdit = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalacOptionsItemFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalacOptionsItemFormats.scala index 353b6f3f7..09c0f7f33 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalacOptionsItemFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalacOptionsItemFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ScalacOptionsItemFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ScalacOptionsItemFormat: JsonFormat[sbt.internal.bsp.ScalacOptionsItem] = new JsonFormat[sbt.internal.bsp.ScalacOptionsItem] { +given ScalacOptionsItemFormat: JsonFormat[sbt.internal.bsp.ScalacOptionsItem] = new JsonFormat[sbt.internal.bsp.ScalacOptionsItem] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ScalacOptionsItem = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalacOptionsParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalacOptionsParamsFormats.scala index d14d5fdaa..acf0f3410 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalacOptionsParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalacOptionsParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ScalacOptionsParamsFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ScalacOptionsParamsFormat: JsonFormat[sbt.internal.bsp.ScalacOptionsParams] = new JsonFormat[sbt.internal.bsp.ScalacOptionsParams] { +given ScalacOptionsParamsFormat: JsonFormat[sbt.internal.bsp.ScalacOptionsParams] = new JsonFormat[sbt.internal.bsp.ScalacOptionsParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ScalacOptionsParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalacOptionsResultFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalacOptionsResultFormats.scala index 078dc5f51..736db5031 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalacOptionsResultFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/ScalacOptionsResultFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ScalacOptionsResultFormats { self: sbt.internal.bsp.codec.ScalacOptionsItemFormats & sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ScalacOptionsResultFormat: JsonFormat[sbt.internal.bsp.ScalacOptionsResult] = new JsonFormat[sbt.internal.bsp.ScalacOptionsResult] { +given ScalacOptionsResultFormat: JsonFormat[sbt.internal.bsp.ScalacOptionsResult] = new JsonFormat[sbt.internal.bsp.ScalacOptionsResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.ScalacOptionsResult = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SourceItemFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SourceItemFormats.scala index 7cfc1dded..05078a235 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SourceItemFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SourceItemFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait SourceItemFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val SourceItemFormat: JsonFormat[sbt.internal.bsp.SourceItem] = new JsonFormat[sbt.internal.bsp.SourceItem] { +given SourceItemFormat: JsonFormat[sbt.internal.bsp.SourceItem] = new JsonFormat[sbt.internal.bsp.SourceItem] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.SourceItem = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SourcesItemFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SourcesItemFormats.scala index 45e8a6c8c..d3d5baa0b 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SourcesItemFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SourcesItemFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait SourcesItemFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol & sbt.internal.bsp.codec.SourceItemFormats => -implicit lazy val SourcesItemFormat: JsonFormat[sbt.internal.bsp.SourcesItem] = new JsonFormat[sbt.internal.bsp.SourcesItem] { +given SourcesItemFormat: JsonFormat[sbt.internal.bsp.SourcesItem] = new JsonFormat[sbt.internal.bsp.SourcesItem] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.SourcesItem = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SourcesParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SourcesParamsFormats.scala index 6479bbeb0..f47cd189b 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SourcesParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SourcesParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait SourcesParamsFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val SourcesParamsFormat: JsonFormat[sbt.internal.bsp.SourcesParams] = new JsonFormat[sbt.internal.bsp.SourcesParams] { +given SourcesParamsFormat: JsonFormat[sbt.internal.bsp.SourcesParams] = new JsonFormat[sbt.internal.bsp.SourcesParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.SourcesParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SourcesResultFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SourcesResultFormats.scala index 426a7e4fd..a9a56c19e 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SourcesResultFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/SourcesResultFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait SourcesResultFormats { self: sbt.internal.bsp.codec.SourcesItemFormats & sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol & sbt.internal.bsp.codec.SourceItemFormats => -implicit lazy val SourcesResultFormat: JsonFormat[sbt.internal.bsp.SourcesResult] = new JsonFormat[sbt.internal.bsp.SourcesResult] { +given SourcesResultFormat: JsonFormat[sbt.internal.bsp.SourcesResult] = new JsonFormat[sbt.internal.bsp.SourcesResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.SourcesResult = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TaskFinishParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TaskFinishParamsFormats.scala index c58e5e2cf..7fbc485b6 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TaskFinishParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TaskFinishParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TaskFinishParamsFormats { self: sbt.internal.bsp.codec.TaskIdFormats & sjsonnew.BasicJsonProtocol & sbt.internal.util.codec.JValueFormats => -implicit lazy val TaskFinishParamsFormat: JsonFormat[sbt.internal.bsp.TaskFinishParams] = new JsonFormat[sbt.internal.bsp.TaskFinishParams] { +given TaskFinishParamsFormat: JsonFormat[sbt.internal.bsp.TaskFinishParams] = new JsonFormat[sbt.internal.bsp.TaskFinishParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.TaskFinishParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TaskIdFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TaskIdFormats.scala index 12e20a6e7..141c21e6a 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TaskIdFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TaskIdFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TaskIdFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TaskIdFormat: JsonFormat[sbt.internal.bsp.TaskId] = new JsonFormat[sbt.internal.bsp.TaskId] { +given TaskIdFormat: JsonFormat[sbt.internal.bsp.TaskId] = new JsonFormat[sbt.internal.bsp.TaskId] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.TaskId = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TaskProgressParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TaskProgressParamsFormats.scala index 794bf2493..e40b5f027 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TaskProgressParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TaskProgressParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TaskProgressParamsFormats { self: sbt.internal.bsp.codec.TaskIdFormats & sjsonnew.BasicJsonProtocol & sbt.internal.util.codec.JValueFormats => -implicit lazy val TaskProgressParamsFormat: JsonFormat[sbt.internal.bsp.TaskProgressParams] = new JsonFormat[sbt.internal.bsp.TaskProgressParams] { +given TaskProgressParamsFormat: JsonFormat[sbt.internal.bsp.TaskProgressParams] = new JsonFormat[sbt.internal.bsp.TaskProgressParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.TaskProgressParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TaskStartParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TaskStartParamsFormats.scala index 4c2c4c127..d303e54dc 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TaskStartParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TaskStartParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TaskStartParamsFormats { self: sbt.internal.bsp.codec.TaskIdFormats & sjsonnew.BasicJsonProtocol & sbt.internal.util.codec.JValueFormats => -implicit lazy val TaskStartParamsFormat: JsonFormat[sbt.internal.bsp.TaskStartParams] = new JsonFormat[sbt.internal.bsp.TaskStartParams] { +given TaskStartParamsFormat: JsonFormat[sbt.internal.bsp.TaskStartParams] = new JsonFormat[sbt.internal.bsp.TaskStartParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.TaskStartParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TestParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TestParamsFormats.scala index 18998fd1f..fdb098963 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TestParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TestParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TestParamsFormats { self: sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol & sbt.internal.util.codec.JValueFormats => -implicit lazy val TestParamsFormat: JsonFormat[sbt.internal.bsp.TestParams] = new JsonFormat[sbt.internal.bsp.TestParams] { +given TestParamsFormat: JsonFormat[sbt.internal.bsp.TestParams] = new JsonFormat[sbt.internal.bsp.TestParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.TestParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TestProviderFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TestProviderFormats.scala index 8895a7ceb..30b37b4b2 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TestProviderFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TestProviderFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TestProviderFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TestProviderFormat: JsonFormat[sbt.internal.bsp.TestProvider] = new JsonFormat[sbt.internal.bsp.TestProvider] { +given TestProviderFormat: JsonFormat[sbt.internal.bsp.TestProvider] = new JsonFormat[sbt.internal.bsp.TestProvider] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.TestProvider = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TestResultFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TestResultFormats.scala index b8603e672..d6b0da8b5 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TestResultFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TestResultFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TestResultFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TestResultFormat: JsonFormat[sbt.internal.bsp.TestResult] = new JsonFormat[sbt.internal.bsp.TestResult] { +given TestResultFormat: JsonFormat[sbt.internal.bsp.TestResult] = new JsonFormat[sbt.internal.bsp.TestResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.TestResult = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TextDocumentIdentifierFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TextDocumentIdentifierFormats.scala index bb5fda8fc..45274da14 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TextDocumentIdentifierFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/TextDocumentIdentifierFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TextDocumentIdentifierFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TextDocumentIdentifierFormat: JsonFormat[sbt.internal.bsp.TextDocumentIdentifier] = new JsonFormat[sbt.internal.bsp.TextDocumentIdentifier] { +given TextDocumentIdentifierFormat: JsonFormat[sbt.internal.bsp.TextDocumentIdentifier] = new JsonFormat[sbt.internal.bsp.TextDocumentIdentifier] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.TextDocumentIdentifier = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/WorkspaceBuildTargetsResultFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/WorkspaceBuildTargetsResultFormats.scala index eaf3fee04..e5fe1ce44 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/WorkspaceBuildTargetsResultFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/bsp/codec/WorkspaceBuildTargetsResultFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.bsp.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait WorkspaceBuildTargetsResultFormats { self: sbt.internal.bsp.codec.BuildTargetFormats & sbt.internal.bsp.codec.BuildTargetIdentifierFormats & sjsonnew.BasicJsonProtocol & sbt.internal.bsp.codec.BuildTargetCapabilitiesFormats & sbt.internal.util.codec.JValueFormats => -implicit lazy val WorkspaceBuildTargetsResultFormat: JsonFormat[sbt.internal.bsp.WorkspaceBuildTargetsResult] = new JsonFormat[sbt.internal.bsp.WorkspaceBuildTargetsResult] { +given WorkspaceBuildTargetsResultFormat: JsonFormat[sbt.internal.bsp.WorkspaceBuildTargetsResult] = new JsonFormat[sbt.internal.bsp.WorkspaceBuildTargetsResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.bsp.WorkspaceBuildTargetsResult = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/graph/codec/ModuleModelFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/graph/codec/ModuleModelFormats.scala index 643842093..0abdfcdf1 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/graph/codec/ModuleModelFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/graph/codec/ModuleModelFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.graph.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ModuleModelFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val ModuleModelFormat: JsonFormat[sbt.internal.graph.ModuleModel] = new JsonFormat[sbt.internal.graph.ModuleModel] { +given ModuleModelFormat: JsonFormat[sbt.internal.graph.ModuleModel] = new JsonFormat[sbt.internal.graph.ModuleModel] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.graph.ModuleModel = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/CancelRequestParams.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/CancelRequestParams.scala index dc574fde6..9eb7bb03d 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/CancelRequestParams.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/CancelRequestParams.scala @@ -20,7 +20,7 @@ final class CancelRequestParams private ( override def toString: String = { "CancelRequestParams(" + id + ")" } - private def copy(id: String = id): CancelRequestParams = { + private def copy(id: String): CancelRequestParams = { new CancelRequestParams(id) } def withId(id: String): CancelRequestParams = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/ClientCapabilities.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/ClientCapabilities.scala index 1726b0b58..7f9ef1ed4 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/ClientCapabilities.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/ClientCapabilities.scala @@ -18,9 +18,7 @@ override def hashCode: Int = { override def toString: String = { "ClientCapabilities()" } -private def copy(): ClientCapabilities = { - new ClientCapabilities() -} + } object ClientCapabilities { diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/InitializeResult.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/InitializeResult.scala index 922c95673..4cf9c62c4 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/InitializeResult.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/InitializeResult.scala @@ -20,7 +20,7 @@ final class InitializeResult private ( override def toString: String = { "InitializeResult(" + capabilities + ")" } - private def copy(capabilities: sbt.internal.langserver.ServerCapabilities = capabilities): InitializeResult = { + private def copy(capabilities: sbt.internal.langserver.ServerCapabilities): InitializeResult = { new InitializeResult(capabilities) } def withCapabilities(capabilities: sbt.internal.langserver.ServerCapabilities): InitializeResult = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/SaveOptions.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/SaveOptions.scala index 56931c189..422564766 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/SaveOptions.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/SaveOptions.scala @@ -20,7 +20,7 @@ final class SaveOptions private ( override def toString: String = { "SaveOptions(" + includeText + ")" } - private def copy(includeText: Option[Boolean] = includeText): SaveOptions = { + private def copy(includeText: Option[Boolean]): SaveOptions = { new SaveOptions(includeText) } def withIncludeText(includeText: Option[Boolean]): SaveOptions = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/SbtExecParams.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/SbtExecParams.scala index bf73dddb2..d41f320b6 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/SbtExecParams.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/SbtExecParams.scala @@ -20,7 +20,7 @@ final class SbtExecParams private ( override def toString: String = { "SbtExecParams(" + commandLine + ")" } - private def copy(commandLine: String = commandLine): SbtExecParams = { + private def copy(commandLine: String): SbtExecParams = { new SbtExecParams(commandLine) } def withCommandLine(commandLine: String): SbtExecParams = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/TextDocumentIdentifier.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/TextDocumentIdentifier.scala index 60f0639c5..77ba4c023 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/TextDocumentIdentifier.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/TextDocumentIdentifier.scala @@ -23,7 +23,7 @@ final class TextDocumentIdentifier private ( override def toString: String = { "TextDocumentIdentifier(" + uri + ")" } - private def copy(uri: String = uri): TextDocumentIdentifier = { + private def copy(uri: String): TextDocumentIdentifier = { new TextDocumentIdentifier(uri) } def withUri(uri: String): TextDocumentIdentifier = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/CancelRequestParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/CancelRequestParamsFormats.scala index 5dc733d76..594fb6bdd 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/CancelRequestParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/CancelRequestParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.langserver.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait CancelRequestParamsFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val CancelRequestParamsFormat: JsonFormat[sbt.internal.langserver.CancelRequestParams] = new JsonFormat[sbt.internal.langserver.CancelRequestParams] { +given CancelRequestParamsFormat: JsonFormat[sbt.internal.langserver.CancelRequestParams] = new JsonFormat[sbt.internal.langserver.CancelRequestParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.langserver.CancelRequestParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/ClientCapabilitiesFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/ClientCapabilitiesFormats.scala index ca13c790c..8a6cec1a0 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/ClientCapabilitiesFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/ClientCapabilitiesFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.langserver.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ClientCapabilitiesFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val ClientCapabilitiesFormat: JsonFormat[sbt.internal.langserver.ClientCapabilities] = new JsonFormat[sbt.internal.langserver.ClientCapabilities] { +given ClientCapabilitiesFormat: JsonFormat[sbt.internal.langserver.ClientCapabilities] = new JsonFormat[sbt.internal.langserver.ClientCapabilities] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.langserver.ClientCapabilities = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/DiagnosticFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/DiagnosticFormats.scala index a61e3a1b9..c98d08a8e 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/DiagnosticFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/DiagnosticFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.langserver.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait DiagnosticFormats { self: sbt.internal.langserver.codec.RangeFormats & sbt.internal.langserver.codec.PositionFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val DiagnosticFormat: JsonFormat[sbt.internal.langserver.Diagnostic] = new JsonFormat[sbt.internal.langserver.Diagnostic] { +given DiagnosticFormat: JsonFormat[sbt.internal.langserver.Diagnostic] = new JsonFormat[sbt.internal.langserver.Diagnostic] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.langserver.Diagnostic = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/InitializeParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/InitializeParamsFormats.scala index 260db817b..2fe3efb7e 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/InitializeParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/InitializeParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.langserver.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait InitializeParamsFormats { self: sbt.internal.util.codec.JValueFormats & sbt.internal.langserver.codec.ClientCapabilitiesFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val InitializeParamsFormat: JsonFormat[sbt.internal.langserver.InitializeParams] = new JsonFormat[sbt.internal.langserver.InitializeParams] { +given InitializeParamsFormat: JsonFormat[sbt.internal.langserver.InitializeParams] = new JsonFormat[sbt.internal.langserver.InitializeParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.langserver.InitializeParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/InitializeResultFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/InitializeResultFormats.scala index 5b92bf021..ec6de2e30 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/InitializeResultFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/InitializeResultFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.langserver.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait InitializeResultFormats { self: sbt.internal.langserver.codec.ServerCapabilitiesFormats & sbt.internal.langserver.codec.TextDocumentSyncOptionsFormats & sbt.internal.langserver.codec.SaveOptionsFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val InitializeResultFormat: JsonFormat[sbt.internal.langserver.InitializeResult] = new JsonFormat[sbt.internal.langserver.InitializeResult] { +given InitializeResultFormat: JsonFormat[sbt.internal.langserver.InitializeResult] = new JsonFormat[sbt.internal.langserver.InitializeResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.langserver.InitializeResult = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/LocationFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/LocationFormats.scala index 407681c97..228640a3d 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/LocationFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/LocationFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.langserver.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait LocationFormats { self: sbt.internal.langserver.codec.RangeFormats & sbt.internal.langserver.codec.PositionFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val LocationFormat: JsonFormat[sbt.internal.langserver.Location] = new JsonFormat[sbt.internal.langserver.Location] { +given LocationFormat: JsonFormat[sbt.internal.langserver.Location] = new JsonFormat[sbt.internal.langserver.Location] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.langserver.Location = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/LogMessageParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/LogMessageParamsFormats.scala index 2e55dbc47..a94141bbc 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/LogMessageParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/LogMessageParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.langserver.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait LogMessageParamsFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val LogMessageParamsFormat: JsonFormat[sbt.internal.langserver.LogMessageParams] = new JsonFormat[sbt.internal.langserver.LogMessageParams] { +given LogMessageParamsFormat: JsonFormat[sbt.internal.langserver.LogMessageParams] = new JsonFormat[sbt.internal.langserver.LogMessageParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.langserver.LogMessageParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/PositionFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/PositionFormats.scala index da2a4c42a..6f168a6e1 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/PositionFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/PositionFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.langserver.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait PositionFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val PositionFormat: JsonFormat[sbt.internal.langserver.Position] = new JsonFormat[sbt.internal.langserver.Position] { +given PositionFormat: JsonFormat[sbt.internal.langserver.Position] = new JsonFormat[sbt.internal.langserver.Position] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.langserver.Position = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/PublishDiagnosticsParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/PublishDiagnosticsParamsFormats.scala index 38478ac7a..d2507fe48 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/PublishDiagnosticsParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/PublishDiagnosticsParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.langserver.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait PublishDiagnosticsParamsFormats { self: sbt.internal.langserver.codec.DiagnosticFormats & sbt.internal.langserver.codec.RangeFormats & sbt.internal.langserver.codec.PositionFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val PublishDiagnosticsParamsFormat: JsonFormat[sbt.internal.langserver.PublishDiagnosticsParams] = new JsonFormat[sbt.internal.langserver.PublishDiagnosticsParams] { +given PublishDiagnosticsParamsFormat: JsonFormat[sbt.internal.langserver.PublishDiagnosticsParams] = new JsonFormat[sbt.internal.langserver.PublishDiagnosticsParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.langserver.PublishDiagnosticsParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/RangeFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/RangeFormats.scala index aeaadb526..438ee2561 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/RangeFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/RangeFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.langserver.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait RangeFormats { self: sbt.internal.langserver.codec.PositionFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val RangeFormat: JsonFormat[sbt.internal.langserver.Range] = new JsonFormat[sbt.internal.langserver.Range] { +given RangeFormat: JsonFormat[sbt.internal.langserver.Range] = new JsonFormat[sbt.internal.langserver.Range] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.langserver.Range = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/SaveOptionsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/SaveOptionsFormats.scala index 33316ebfe..1556cc920 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/SaveOptionsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/SaveOptionsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.langserver.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait SaveOptionsFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val SaveOptionsFormat: JsonFormat[sbt.internal.langserver.SaveOptions] = new JsonFormat[sbt.internal.langserver.SaveOptions] { +given SaveOptionsFormat: JsonFormat[sbt.internal.langserver.SaveOptions] = new JsonFormat[sbt.internal.langserver.SaveOptions] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.langserver.SaveOptions = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/SbtExecParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/SbtExecParamsFormats.scala index 516f4e923..f51758ee7 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/SbtExecParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/SbtExecParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.langserver.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait SbtExecParamsFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val SbtExecParamsFormat: JsonFormat[sbt.internal.langserver.SbtExecParams] = new JsonFormat[sbt.internal.langserver.SbtExecParams] { +given SbtExecParamsFormat: JsonFormat[sbt.internal.langserver.SbtExecParams] = new JsonFormat[sbt.internal.langserver.SbtExecParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.langserver.SbtExecParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/ServerCapabilitiesFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/ServerCapabilitiesFormats.scala index 03bce794e..0505f2ae0 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/ServerCapabilitiesFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/ServerCapabilitiesFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.langserver.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ServerCapabilitiesFormats { self: sbt.internal.langserver.codec.TextDocumentSyncOptionsFormats & sbt.internal.langserver.codec.SaveOptionsFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ServerCapabilitiesFormat: JsonFormat[sbt.internal.langserver.ServerCapabilities] = new JsonFormat[sbt.internal.langserver.ServerCapabilities] { +given ServerCapabilitiesFormat: JsonFormat[sbt.internal.langserver.ServerCapabilities] = new JsonFormat[sbt.internal.langserver.ServerCapabilities] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.langserver.ServerCapabilities = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/TextDocumentIdentifierFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/TextDocumentIdentifierFormats.scala index c91151e92..f4bfa3951 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/TextDocumentIdentifierFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/TextDocumentIdentifierFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.langserver.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TextDocumentIdentifierFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TextDocumentIdentifierFormat: JsonFormat[sbt.internal.langserver.TextDocumentIdentifier] = new JsonFormat[sbt.internal.langserver.TextDocumentIdentifier] { +given TextDocumentIdentifierFormat: JsonFormat[sbt.internal.langserver.TextDocumentIdentifier] = new JsonFormat[sbt.internal.langserver.TextDocumentIdentifier] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.langserver.TextDocumentIdentifier = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/TextDocumentPositionParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/TextDocumentPositionParamsFormats.scala index 326e0ad27..a227c267b 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/TextDocumentPositionParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/TextDocumentPositionParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.langserver.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TextDocumentPositionParamsFormats { self: sbt.internal.langserver.codec.TextDocumentIdentifierFormats & sjsonnew.BasicJsonProtocol & sbt.internal.langserver.codec.PositionFormats => -implicit lazy val TextDocumentPositionParamsFormat: JsonFormat[sbt.internal.langserver.TextDocumentPositionParams] = new JsonFormat[sbt.internal.langserver.TextDocumentPositionParams] { +given TextDocumentPositionParamsFormat: JsonFormat[sbt.internal.langserver.TextDocumentPositionParams] = new JsonFormat[sbt.internal.langserver.TextDocumentPositionParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.langserver.TextDocumentPositionParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/TextDocumentPositionParamsInterfaceFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/TextDocumentPositionParamsInterfaceFormats.scala index 878e7e57a..6ce9cbcd9 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/TextDocumentPositionParamsInterfaceFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/TextDocumentPositionParamsInterfaceFormats.scala @@ -7,5 +7,5 @@ package sbt.internal.langserver.codec import _root_.sjsonnew.JsonFormat trait TextDocumentPositionParamsInterfaceFormats { self: sbt.internal.langserver.codec.TextDocumentIdentifierFormats & sjsonnew.BasicJsonProtocol & sbt.internal.langserver.codec.PositionFormats & sbt.internal.langserver.codec.TextDocumentPositionParamsFormats => -implicit lazy val TextDocumentPositionParamsInterfaceFormat: JsonFormat[sbt.internal.langserver.TextDocumentPositionParamsInterface] = flatUnionFormat1[sbt.internal.langserver.TextDocumentPositionParamsInterface, sbt.internal.langserver.TextDocumentPositionParams]("type") +given TextDocumentPositionParamsInterfaceFormat: JsonFormat[sbt.internal.langserver.TextDocumentPositionParamsInterface] = flatUnionFormat1[sbt.internal.langserver.TextDocumentPositionParamsInterface, sbt.internal.langserver.TextDocumentPositionParams]("type") } diff --git a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/TextDocumentSyncOptionsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/TextDocumentSyncOptionsFormats.scala index c5ada71e9..3809db449 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/TextDocumentSyncOptionsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/langserver/codec/TextDocumentSyncOptionsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.langserver.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TextDocumentSyncOptionsFormats { self: sbt.internal.langserver.codec.SaveOptionsFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val TextDocumentSyncOptionsFormat: JsonFormat[sbt.internal.langserver.TextDocumentSyncOptions] = new JsonFormat[sbt.internal.langserver.TextDocumentSyncOptions] { +given TextDocumentSyncOptionsFormat: JsonFormat[sbt.internal.langserver.TextDocumentSyncOptions] = new JsonFormat[sbt.internal.langserver.TextDocumentSyncOptions] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.langserver.TextDocumentSyncOptions = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/protocol/codec/InitializeOptionFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/protocol/codec/InitializeOptionFormats.scala index a21234871..061d00af9 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/protocol/codec/InitializeOptionFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/protocol/codec/InitializeOptionFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait InitializeOptionFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val InitializeOptionFormat: JsonFormat[sbt.internal.protocol.InitializeOption] = new JsonFormat[sbt.internal.protocol.InitializeOption] { +given InitializeOptionFormat: JsonFormat[sbt.internal.protocol.InitializeOption] = new JsonFormat[sbt.internal.protocol.InitializeOption] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.protocol.InitializeOption = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/protocol/codec/PortFileFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/protocol/codec/PortFileFormats.scala index 995aa6ccc..27dcf477e 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/protocol/codec/PortFileFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/protocol/codec/PortFileFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait PortFileFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val PortFileFormat: JsonFormat[sbt.internal.protocol.PortFile] = new JsonFormat[sbt.internal.protocol.PortFile] { +given PortFileFormat: JsonFormat[sbt.internal.protocol.PortFile] = new JsonFormat[sbt.internal.protocol.PortFile] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.protocol.PortFile = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/protocol/codec/TokenFileFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/protocol/codec/TokenFileFormats.scala index 5dbeab8c3..25f8d3d4a 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/protocol/codec/TokenFileFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/protocol/codec/TokenFileFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TokenFileFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TokenFileFormat: JsonFormat[sbt.internal.protocol.TokenFile] = new JsonFormat[sbt.internal.protocol.TokenFile] { +given TokenFileFormat: JsonFormat[sbt.internal.protocol.TokenFile] = new JsonFormat[sbt.internal.protocol.TokenFile] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.protocol.TokenFile = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/worker/ClientJobParams.scala b/protocol/src/main/contraband-scala/sbt/internal/worker/ClientJobParams.scala index e6098a08d..6789e1b83 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/worker/ClientJobParams.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/worker/ClientJobParams.scala @@ -28,7 +28,7 @@ final class ClientJobParams private ( override def toString: String = { "ClientJobParams(" + runInfo + ")" } - private def copy(runInfo: Option[sbt.internal.worker.RunInfo] = runInfo): ClientJobParams = { + private def copy(runInfo: Option[sbt.internal.worker.RunInfo]): ClientJobParams = { new ClientJobParams(runInfo) } def withRunInfo(runInfo: Option[sbt.internal.worker.RunInfo]): ClientJobParams = { diff --git a/protocol/src/main/contraband-scala/sbt/internal/worker/codec/ClientJobParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/worker/codec/ClientJobParamsFormats.scala index 2b3cd198c..0bd484721 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/worker/codec/ClientJobParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/worker/codec/ClientJobParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.worker.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ClientJobParamsFormats { self: sbt.internal.worker.codec.RunInfoFormats & sbt.internal.worker.codec.JvmRunInfoFormats & sbt.internal.worker.codec.FilePathFormats & sjsonnew.BasicJsonProtocol & sbt.internal.worker.codec.NativeRunInfoFormats => -implicit lazy val ClientJobParamsFormat: JsonFormat[sbt.internal.worker.ClientJobParams] = new JsonFormat[sbt.internal.worker.ClientJobParams] { +given ClientJobParamsFormat: JsonFormat[sbt.internal.worker.ClientJobParams] = new JsonFormat[sbt.internal.worker.ClientJobParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.worker.ClientJobParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/worker/codec/FilePathFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/worker/codec/FilePathFormats.scala index ac480e68e..7474f7b55 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/worker/codec/FilePathFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/worker/codec/FilePathFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.worker.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait FilePathFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val FilePathFormat: JsonFormat[sbt.internal.worker.FilePath] = new JsonFormat[sbt.internal.worker.FilePath] { +given FilePathFormat: JsonFormat[sbt.internal.worker.FilePath] = new JsonFormat[sbt.internal.worker.FilePath] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.worker.FilePath = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/worker/codec/JvmRunInfoFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/worker/codec/JvmRunInfoFormats.scala index 69db798a3..9acb5ed5f 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/worker/codec/JvmRunInfoFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/worker/codec/JvmRunInfoFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.worker.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait JvmRunInfoFormats { self: sbt.internal.worker.codec.FilePathFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val JvmRunInfoFormat: JsonFormat[sbt.internal.worker.JvmRunInfo] = new JsonFormat[sbt.internal.worker.JvmRunInfo] { +given JvmRunInfoFormat: JsonFormat[sbt.internal.worker.JvmRunInfo] = new JsonFormat[sbt.internal.worker.JvmRunInfo] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.worker.JvmRunInfo = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/worker/codec/NativeRunInfoFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/worker/codec/NativeRunInfoFormats.scala index 53a69ccf5..b72ab41c8 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/worker/codec/NativeRunInfoFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/worker/codec/NativeRunInfoFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.worker.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait NativeRunInfoFormats { self: sbt.internal.worker.codec.FilePathFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val NativeRunInfoFormat: JsonFormat[sbt.internal.worker.NativeRunInfo] = new JsonFormat[sbt.internal.worker.NativeRunInfo] { +given NativeRunInfoFormat: JsonFormat[sbt.internal.worker.NativeRunInfo] = new JsonFormat[sbt.internal.worker.NativeRunInfo] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.worker.NativeRunInfo = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/internal/worker/codec/RunInfoFormats.scala b/protocol/src/main/contraband-scala/sbt/internal/worker/codec/RunInfoFormats.scala index 1946363bc..d406e035a 100644 --- a/protocol/src/main/contraband-scala/sbt/internal/worker/codec/RunInfoFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/internal/worker/codec/RunInfoFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.worker.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait RunInfoFormats { self: sbt.internal.worker.codec.JvmRunInfoFormats & sbt.internal.worker.codec.FilePathFormats & sjsonnew.BasicJsonProtocol & sbt.internal.worker.codec.NativeRunInfoFormats => -implicit lazy val RunInfoFormat: JsonFormat[sbt.internal.worker.RunInfo] = new JsonFormat[sbt.internal.worker.RunInfo] { +given RunInfoFormat: JsonFormat[sbt.internal.worker.RunInfo] = new JsonFormat[sbt.internal.worker.RunInfo] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.internal.worker.RunInfo = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/Attach.scala b/protocol/src/main/contraband-scala/sbt/protocol/Attach.scala index 50655cd4d..e45d65d2b 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/Attach.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/Attach.scala @@ -19,7 +19,7 @@ final class Attach private ( override def toString: String = { "Attach(" + interactive + ")" } - private def copy(interactive: Boolean = interactive): Attach = { + private def copy(interactive: Boolean): Attach = { new Attach(interactive) } def withInteractive(interactive: Boolean): Attach = { diff --git a/protocol/src/main/contraband-scala/sbt/protocol/ChannelAcceptedEvent.scala b/protocol/src/main/contraband-scala/sbt/protocol/ChannelAcceptedEvent.scala index c225e89ae..80386f9a4 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/ChannelAcceptedEvent.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/ChannelAcceptedEvent.scala @@ -19,7 +19,7 @@ final class ChannelAcceptedEvent private ( override def toString: String = { "ChannelAcceptedEvent(" + channelName + ")" } - private def copy(channelName: String = channelName): ChannelAcceptedEvent = { + private def copy(channelName: String): ChannelAcceptedEvent = { new ChannelAcceptedEvent(channelName) } def withChannelName(channelName: String): ChannelAcceptedEvent = { diff --git a/protocol/src/main/contraband-scala/sbt/protocol/SettingQuery.scala b/protocol/src/main/contraband-scala/sbt/protocol/SettingQuery.scala index 37221ef76..f346ddec1 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/SettingQuery.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/SettingQuery.scala @@ -19,7 +19,7 @@ final class SettingQuery private ( override def toString: String = { "SettingQuery(" + setting + ")" } - private def copy(setting: String = setting): SettingQuery = { + private def copy(setting: String): SettingQuery = { new SettingQuery(setting) } def withSetting(setting: String): SettingQuery = { diff --git a/protocol/src/main/contraband-scala/sbt/protocol/SettingQueryFailure.scala b/protocol/src/main/contraband-scala/sbt/protocol/SettingQueryFailure.scala index a9fa7b088..5311b0e70 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/SettingQueryFailure.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/SettingQueryFailure.scala @@ -19,7 +19,7 @@ final class SettingQueryFailure private ( override def toString: String = { "SettingQueryFailure(" + message + ")" } - private def copy(message: String = message): SettingQueryFailure = { + private def copy(message: String): SettingQueryFailure = { new SettingQueryFailure(message) } def withMessage(message: String): SettingQueryFailure = { diff --git a/protocol/src/main/contraband-scala/sbt/protocol/TerminalAttributesQuery.scala b/protocol/src/main/contraband-scala/sbt/protocol/TerminalAttributesQuery.scala index c465d2d0b..e5bab6fb0 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/TerminalAttributesQuery.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/TerminalAttributesQuery.scala @@ -18,9 +18,7 @@ override def hashCode: Int = { override def toString: String = { "TerminalAttributesQuery()" } -private def copy(): TerminalAttributesQuery = { - new TerminalAttributesQuery() -} + } object TerminalAttributesQuery { diff --git a/protocol/src/main/contraband-scala/sbt/protocol/TerminalGetSizeQuery.scala b/protocol/src/main/contraband-scala/sbt/protocol/TerminalGetSizeQuery.scala index 099e604d8..781ff1a9b 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/TerminalGetSizeQuery.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/TerminalGetSizeQuery.scala @@ -18,9 +18,7 @@ override def hashCode: Int = { override def toString: String = { "TerminalGetSizeQuery()" } -private def copy(): TerminalGetSizeQuery = { - new TerminalGetSizeQuery() -} + } object TerminalGetSizeQuery { diff --git a/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetAttributesResponse.scala b/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetAttributesResponse.scala index 7cf6bd641..f58e64eec 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetAttributesResponse.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetAttributesResponse.scala @@ -18,9 +18,7 @@ override def hashCode: Int = { override def toString: String = { "TerminalSetAttributesResponse()" } -private def copy(): TerminalSetAttributesResponse = { - new TerminalSetAttributesResponse() -} + } object TerminalSetAttributesResponse { diff --git a/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetEchoCommand.scala b/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetEchoCommand.scala index 90ca13680..6ea5de387 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetEchoCommand.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetEchoCommand.scala @@ -19,7 +19,7 @@ final class TerminalSetEchoCommand private ( override def toString: String = { "TerminalSetEchoCommand(" + toggle + ")" } - private def copy(toggle: Boolean = toggle): TerminalSetEchoCommand = { + private def copy(toggle: Boolean): TerminalSetEchoCommand = { new TerminalSetEchoCommand(toggle) } def withToggle(toggle: Boolean): TerminalSetEchoCommand = { diff --git a/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetEchoResponse.scala b/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetEchoResponse.scala index bb0e90396..62cac8127 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetEchoResponse.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetEchoResponse.scala @@ -18,9 +18,7 @@ override def hashCode: Int = { override def toString: String = { "TerminalSetEchoResponse()" } -private def copy(): TerminalSetEchoResponse = { - new TerminalSetEchoResponse() -} + } object TerminalSetEchoResponse { diff --git a/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetRawModeCommand.scala b/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetRawModeCommand.scala index b79e34070..b3c53d0b8 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetRawModeCommand.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetRawModeCommand.scala @@ -19,7 +19,7 @@ final class TerminalSetRawModeCommand private ( override def toString: String = { "TerminalSetRawModeCommand(" + toggle + ")" } - private def copy(toggle: Boolean = toggle): TerminalSetRawModeCommand = { + private def copy(toggle: Boolean): TerminalSetRawModeCommand = { new TerminalSetRawModeCommand(toggle) } def withToggle(toggle: Boolean): TerminalSetRawModeCommand = { diff --git a/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetRawModeResponse.scala b/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetRawModeResponse.scala index e97969a9d..ece24c972 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetRawModeResponse.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetRawModeResponse.scala @@ -18,9 +18,7 @@ override def hashCode: Int = { override def toString: String = { "TerminalSetRawModeResponse()" } -private def copy(): TerminalSetRawModeResponse = { - new TerminalSetRawModeResponse() -} + } object TerminalSetRawModeResponse { diff --git a/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetSizeResponse.scala b/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetSizeResponse.scala index df3bbeb81..19f0f3a44 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetSizeResponse.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/TerminalSetSizeResponse.scala @@ -18,9 +18,7 @@ override def hashCode: Int = { override def toString: String = { "TerminalSetSizeResponse()" } -private def copy(): TerminalSetSizeResponse = { - new TerminalSetSizeResponse() -} + } object TerminalSetSizeResponse { diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/AttachFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/AttachFormats.scala index da5d3e4a8..62676de3f 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/AttachFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/AttachFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait AttachFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val AttachFormat: JsonFormat[sbt.protocol.Attach] = new JsonFormat[sbt.protocol.Attach] { +given AttachFormat: JsonFormat[sbt.protocol.Attach] = new JsonFormat[sbt.protocol.Attach] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.Attach = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/ChannelAcceptedEventFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/ChannelAcceptedEventFormats.scala index aae53e598..b90eea690 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/ChannelAcceptedEventFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/ChannelAcceptedEventFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ChannelAcceptedEventFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val ChannelAcceptedEventFormat: JsonFormat[sbt.protocol.ChannelAcceptedEvent] = new JsonFormat[sbt.protocol.ChannelAcceptedEvent] { +given ChannelAcceptedEventFormat: JsonFormat[sbt.protocol.ChannelAcceptedEvent] = new JsonFormat[sbt.protocol.ChannelAcceptedEvent] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.ChannelAcceptedEvent = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/CommandMessageFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/CommandMessageFormats.scala index 8d506f1e7..ac7de6422 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/CommandMessageFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/CommandMessageFormats.scala @@ -7,5 +7,5 @@ package sbt.protocol.codec import _root_.sjsonnew.JsonFormat trait CommandMessageFormats { self: sbt.internal.protocol.codec.InitializeOptionFormats & sjsonnew.BasicJsonProtocol & sbt.protocol.codec.InitCommandFormats & sbt.protocol.codec.ExecCommandFormats & sbt.protocol.codec.SettingQueryFormats & sbt.protocol.codec.AttachFormats & sbt.protocol.codec.TerminalCapabilitiesQueryFormats & sbt.protocol.codec.TerminalSetAttributesCommandFormats & sbt.protocol.codec.TerminalAttributesQueryFormats & sbt.protocol.codec.TerminalGetSizeQueryFormats & sbt.protocol.codec.TerminalSetSizeCommandFormats & sbt.protocol.codec.TerminalSetEchoCommandFormats & sbt.protocol.codec.TerminalSetRawModeCommandFormats => -implicit lazy val CommandMessageFormat: JsonFormat[sbt.protocol.CommandMessage] = flatUnionFormat11[sbt.protocol.CommandMessage, sbt.protocol.InitCommand, sbt.protocol.ExecCommand, sbt.protocol.SettingQuery, sbt.protocol.Attach, sbt.protocol.TerminalCapabilitiesQuery, sbt.protocol.TerminalSetAttributesCommand, sbt.protocol.TerminalAttributesQuery, sbt.protocol.TerminalGetSizeQuery, sbt.protocol.TerminalSetSizeCommand, sbt.protocol.TerminalSetEchoCommand, sbt.protocol.TerminalSetRawModeCommand]("type") +given CommandMessageFormat: JsonFormat[sbt.protocol.CommandMessage] = flatUnionFormat11[sbt.protocol.CommandMessage, sbt.protocol.InitCommand, sbt.protocol.ExecCommand, sbt.protocol.SettingQuery, sbt.protocol.Attach, sbt.protocol.TerminalCapabilitiesQuery, sbt.protocol.TerminalSetAttributesCommand, sbt.protocol.TerminalAttributesQuery, sbt.protocol.TerminalGetSizeQuery, sbt.protocol.TerminalSetSizeCommand, sbt.protocol.TerminalSetEchoCommand, sbt.protocol.TerminalSetRawModeCommand]("type") } diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/CompletionParamsFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/CompletionParamsFormats.scala index de83b4f11..574438603 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/CompletionParamsFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/CompletionParamsFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait CompletionParamsFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val CompletionParamsFormat: JsonFormat[sbt.protocol.CompletionParams] = new JsonFormat[sbt.protocol.CompletionParams] { +given CompletionParamsFormat: JsonFormat[sbt.protocol.CompletionParams] = new JsonFormat[sbt.protocol.CompletionParams] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.CompletionParams = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/CompletionResponseFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/CompletionResponseFormats.scala index b15f392ff..b4b5d6da2 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/CompletionResponseFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/CompletionResponseFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait CompletionResponseFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val CompletionResponseFormat: JsonFormat[sbt.protocol.CompletionResponse] = new JsonFormat[sbt.protocol.CompletionResponse] { +given CompletionResponseFormat: JsonFormat[sbt.protocol.CompletionResponse] = new JsonFormat[sbt.protocol.CompletionResponse] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.CompletionResponse = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/EventMessageFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/EventMessageFormats.scala index 7752c01ec..d79e2d84c 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/EventMessageFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/EventMessageFormats.scala @@ -7,5 +7,5 @@ package sbt.protocol.codec import _root_.sjsonnew.JsonFormat trait EventMessageFormats { self: sjsonnew.BasicJsonProtocol & sbt.protocol.codec.ChannelAcceptedEventFormats & sbt.protocol.codec.LogEventFormats & sbt.protocol.codec.ExecStatusEventFormats & sbt.internal.util.codec.JValueFormats & sbt.protocol.codec.SettingQuerySuccessFormats & sbt.protocol.codec.SettingQueryFailureFormats & sbt.protocol.codec.TerminalPropertiesResponseFormats & sbt.protocol.codec.TerminalCapabilitiesResponseFormats & sbt.protocol.codec.TerminalSetAttributesResponseFormats & sbt.protocol.codec.TerminalAttributesResponseFormats & sbt.protocol.codec.TerminalGetSizeResponseFormats & sbt.protocol.codec.TerminalSetSizeResponseFormats & sbt.protocol.codec.TerminalSetEchoResponseFormats & sbt.protocol.codec.TerminalSetRawModeResponseFormats => -implicit lazy val EventMessageFormat: JsonFormat[sbt.protocol.EventMessage] = flatUnionFormat13[sbt.protocol.EventMessage, sbt.protocol.ChannelAcceptedEvent, sbt.protocol.LogEvent, sbt.protocol.ExecStatusEvent, sbt.protocol.SettingQuerySuccess, sbt.protocol.SettingQueryFailure, sbt.protocol.TerminalPropertiesResponse, sbt.protocol.TerminalCapabilitiesResponse, sbt.protocol.TerminalSetAttributesResponse, sbt.protocol.TerminalAttributesResponse, sbt.protocol.TerminalGetSizeResponse, sbt.protocol.TerminalSetSizeResponse, sbt.protocol.TerminalSetEchoResponse, sbt.protocol.TerminalSetRawModeResponse]("type") +given EventMessageFormat: JsonFormat[sbt.protocol.EventMessage] = flatUnionFormat13[sbt.protocol.EventMessage, sbt.protocol.ChannelAcceptedEvent, sbt.protocol.LogEvent, sbt.protocol.ExecStatusEvent, sbt.protocol.SettingQuerySuccess, sbt.protocol.SettingQueryFailure, sbt.protocol.TerminalPropertiesResponse, sbt.protocol.TerminalCapabilitiesResponse, sbt.protocol.TerminalSetAttributesResponse, sbt.protocol.TerminalAttributesResponse, sbt.protocol.TerminalGetSizeResponse, sbt.protocol.TerminalSetSizeResponse, sbt.protocol.TerminalSetEchoResponse, sbt.protocol.TerminalSetRawModeResponse]("type") } diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/ExecCommandFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/ExecCommandFormats.scala index c543b6b83..48a95584c 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/ExecCommandFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/ExecCommandFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ExecCommandFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val ExecCommandFormat: JsonFormat[sbt.protocol.ExecCommand] = new JsonFormat[sbt.protocol.ExecCommand] { +given ExecCommandFormat: JsonFormat[sbt.protocol.ExecCommand] = new JsonFormat[sbt.protocol.ExecCommand] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.ExecCommand = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/ExecStatusEventFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/ExecStatusEventFormats.scala index 9948eae32..6c271f663 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/ExecStatusEventFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/ExecStatusEventFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ExecStatusEventFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val ExecStatusEventFormat: JsonFormat[sbt.protocol.ExecStatusEvent] = new JsonFormat[sbt.protocol.ExecStatusEvent] { +given ExecStatusEventFormat: JsonFormat[sbt.protocol.ExecStatusEvent] = new JsonFormat[sbt.protocol.ExecStatusEvent] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.ExecStatusEvent = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/ExecutionEventFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/ExecutionEventFormats.scala index 6b97c077b..78dc0eeef 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/ExecutionEventFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/ExecutionEventFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ExecutionEventFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val ExecutionEventFormat: JsonFormat[sbt.protocol.ExecutionEvent] = new JsonFormat[sbt.protocol.ExecutionEvent] { +given ExecutionEventFormat: JsonFormat[sbt.protocol.ExecutionEvent] = new JsonFormat[sbt.protocol.ExecutionEvent] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.ExecutionEvent = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/InitCommandFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/InitCommandFormats.scala index d23519e4d..a67599903 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/InitCommandFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/InitCommandFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait InitCommandFormats { self: sbt.internal.protocol.codec.InitializeOptionFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val InitCommandFormat: JsonFormat[sbt.protocol.InitCommand] = new JsonFormat[sbt.protocol.InitCommand] { +given InitCommandFormat: JsonFormat[sbt.protocol.InitCommand] = new JsonFormat[sbt.protocol.InitCommand] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.InitCommand = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/LogEventFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/LogEventFormats.scala index 10c7ef11d..5d89cfcfd 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/LogEventFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/LogEventFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait LogEventFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val LogEventFormat: JsonFormat[sbt.protocol.LogEvent] = new JsonFormat[sbt.protocol.LogEvent] { +given LogEventFormat: JsonFormat[sbt.protocol.LogEvent] = new JsonFormat[sbt.protocol.LogEvent] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.LogEvent = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/SettingQueryFailureFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/SettingQueryFailureFormats.scala index 56068d6cf..448a2a6ce 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/SettingQueryFailureFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/SettingQueryFailureFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait SettingQueryFailureFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val SettingQueryFailureFormat: JsonFormat[sbt.protocol.SettingQueryFailure] = new JsonFormat[sbt.protocol.SettingQueryFailure] { +given SettingQueryFailureFormat: JsonFormat[sbt.protocol.SettingQueryFailure] = new JsonFormat[sbt.protocol.SettingQueryFailure] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.SettingQueryFailure = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/SettingQueryFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/SettingQueryFormats.scala index 1919ad750..2c0fc1bb7 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/SettingQueryFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/SettingQueryFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait SettingQueryFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val SettingQueryFormat: JsonFormat[sbt.protocol.SettingQuery] = new JsonFormat[sbt.protocol.SettingQuery] { +given SettingQueryFormat: JsonFormat[sbt.protocol.SettingQuery] = new JsonFormat[sbt.protocol.SettingQuery] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.SettingQuery = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/SettingQueryResponseFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/SettingQueryResponseFormats.scala index b724f0fb7..6fe8a17c7 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/SettingQueryResponseFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/SettingQueryResponseFormats.scala @@ -7,5 +7,5 @@ package sbt.protocol.codec import _root_.sjsonnew.JsonFormat trait SettingQueryResponseFormats { self: sbt.internal.util.codec.JValueFormats & sjsonnew.BasicJsonProtocol & sbt.protocol.codec.SettingQuerySuccessFormats & sbt.protocol.codec.SettingQueryFailureFormats => -implicit lazy val SettingQueryResponseFormat: JsonFormat[sbt.protocol.SettingQueryResponse] = flatUnionFormat2[sbt.protocol.SettingQueryResponse, sbt.protocol.SettingQuerySuccess, sbt.protocol.SettingQueryFailure]("type") +given SettingQueryResponseFormat: JsonFormat[sbt.protocol.SettingQueryResponse] = flatUnionFormat2[sbt.protocol.SettingQueryResponse, sbt.protocol.SettingQuerySuccess, sbt.protocol.SettingQueryFailure]("type") } diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/SettingQuerySuccessFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/SettingQuerySuccessFormats.scala index 21d102bef..68d3430fa 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/SettingQuerySuccessFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/SettingQuerySuccessFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait SettingQuerySuccessFormats { self: sbt.internal.util.codec.JValueFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val SettingQuerySuccessFormat: JsonFormat[sbt.protocol.SettingQuerySuccess] = new JsonFormat[sbt.protocol.SettingQuerySuccess] { +given SettingQuerySuccessFormat: JsonFormat[sbt.protocol.SettingQuerySuccess] = new JsonFormat[sbt.protocol.SettingQuerySuccess] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.SettingQuerySuccess = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalAttributesQueryFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalAttributesQueryFormats.scala index c4aef7b53..4e14120ba 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalAttributesQueryFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalAttributesQueryFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TerminalAttributesQueryFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TerminalAttributesQueryFormat: JsonFormat[sbt.protocol.TerminalAttributesQuery] = new JsonFormat[sbt.protocol.TerminalAttributesQuery] { +given TerminalAttributesQueryFormat: JsonFormat[sbt.protocol.TerminalAttributesQuery] = new JsonFormat[sbt.protocol.TerminalAttributesQuery] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.TerminalAttributesQuery = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalAttributesResponseFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalAttributesResponseFormats.scala index 232a87d66..4f453750e 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalAttributesResponseFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalAttributesResponseFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TerminalAttributesResponseFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TerminalAttributesResponseFormat: JsonFormat[sbt.protocol.TerminalAttributesResponse] = new JsonFormat[sbt.protocol.TerminalAttributesResponse] { +given TerminalAttributesResponseFormat: JsonFormat[sbt.protocol.TerminalAttributesResponse] = new JsonFormat[sbt.protocol.TerminalAttributesResponse] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.TerminalAttributesResponse = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalCapabilitiesQueryFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalCapabilitiesQueryFormats.scala index 907612055..b9008cd17 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalCapabilitiesQueryFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalCapabilitiesQueryFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TerminalCapabilitiesQueryFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TerminalCapabilitiesQueryFormat: JsonFormat[sbt.protocol.TerminalCapabilitiesQuery] = new JsonFormat[sbt.protocol.TerminalCapabilitiesQuery] { +given TerminalCapabilitiesQueryFormat: JsonFormat[sbt.protocol.TerminalCapabilitiesQuery] = new JsonFormat[sbt.protocol.TerminalCapabilitiesQuery] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.TerminalCapabilitiesQuery = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalCapabilitiesResponseFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalCapabilitiesResponseFormats.scala index fd2da9ee8..e6d6e54ce 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalCapabilitiesResponseFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalCapabilitiesResponseFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TerminalCapabilitiesResponseFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TerminalCapabilitiesResponseFormat: JsonFormat[sbt.protocol.TerminalCapabilitiesResponse] = new JsonFormat[sbt.protocol.TerminalCapabilitiesResponse] { +given TerminalCapabilitiesResponseFormat: JsonFormat[sbt.protocol.TerminalCapabilitiesResponse] = new JsonFormat[sbt.protocol.TerminalCapabilitiesResponse] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.TerminalCapabilitiesResponse = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalGetSizeQueryFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalGetSizeQueryFormats.scala index 89b9aa6af..0f7e14f50 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalGetSizeQueryFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalGetSizeQueryFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TerminalGetSizeQueryFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TerminalGetSizeQueryFormat: JsonFormat[sbt.protocol.TerminalGetSizeQuery] = new JsonFormat[sbt.protocol.TerminalGetSizeQuery] { +given TerminalGetSizeQueryFormat: JsonFormat[sbt.protocol.TerminalGetSizeQuery] = new JsonFormat[sbt.protocol.TerminalGetSizeQuery] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.TerminalGetSizeQuery = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalGetSizeResponseFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalGetSizeResponseFormats.scala index aa048b111..d5af7b1b9 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalGetSizeResponseFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalGetSizeResponseFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TerminalGetSizeResponseFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TerminalGetSizeResponseFormat: JsonFormat[sbt.protocol.TerminalGetSizeResponse] = new JsonFormat[sbt.protocol.TerminalGetSizeResponse] { +given TerminalGetSizeResponseFormat: JsonFormat[sbt.protocol.TerminalGetSizeResponse] = new JsonFormat[sbt.protocol.TerminalGetSizeResponse] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.TerminalGetSizeResponse = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalPropertiesResponseFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalPropertiesResponseFormats.scala index 64c0b4ef6..0ab5f5a10 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalPropertiesResponseFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalPropertiesResponseFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TerminalPropertiesResponseFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TerminalPropertiesResponseFormat: JsonFormat[sbt.protocol.TerminalPropertiesResponse] = new JsonFormat[sbt.protocol.TerminalPropertiesResponse] { +given TerminalPropertiesResponseFormat: JsonFormat[sbt.protocol.TerminalPropertiesResponse] = new JsonFormat[sbt.protocol.TerminalPropertiesResponse] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.TerminalPropertiesResponse = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetAttributesCommandFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetAttributesCommandFormats.scala index a69be82bd..f000cbab3 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetAttributesCommandFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetAttributesCommandFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TerminalSetAttributesCommandFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TerminalSetAttributesCommandFormat: JsonFormat[sbt.protocol.TerminalSetAttributesCommand] = new JsonFormat[sbt.protocol.TerminalSetAttributesCommand] { +given TerminalSetAttributesCommandFormat: JsonFormat[sbt.protocol.TerminalSetAttributesCommand] = new JsonFormat[sbt.protocol.TerminalSetAttributesCommand] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.TerminalSetAttributesCommand = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetAttributesResponseFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetAttributesResponseFormats.scala index 386976187..171b2c251 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetAttributesResponseFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetAttributesResponseFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TerminalSetAttributesResponseFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TerminalSetAttributesResponseFormat: JsonFormat[sbt.protocol.TerminalSetAttributesResponse] = new JsonFormat[sbt.protocol.TerminalSetAttributesResponse] { +given TerminalSetAttributesResponseFormat: JsonFormat[sbt.protocol.TerminalSetAttributesResponse] = new JsonFormat[sbt.protocol.TerminalSetAttributesResponse] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.TerminalSetAttributesResponse = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetEchoCommandFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetEchoCommandFormats.scala index 6c2d6266c..54efec9b4 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetEchoCommandFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetEchoCommandFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TerminalSetEchoCommandFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TerminalSetEchoCommandFormat: JsonFormat[sbt.protocol.TerminalSetEchoCommand] = new JsonFormat[sbt.protocol.TerminalSetEchoCommand] { +given TerminalSetEchoCommandFormat: JsonFormat[sbt.protocol.TerminalSetEchoCommand] = new JsonFormat[sbt.protocol.TerminalSetEchoCommand] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.TerminalSetEchoCommand = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetEchoResponseFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetEchoResponseFormats.scala index e7b84f331..d11b1c7b1 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetEchoResponseFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetEchoResponseFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TerminalSetEchoResponseFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TerminalSetEchoResponseFormat: JsonFormat[sbt.protocol.TerminalSetEchoResponse] = new JsonFormat[sbt.protocol.TerminalSetEchoResponse] { +given TerminalSetEchoResponseFormat: JsonFormat[sbt.protocol.TerminalSetEchoResponse] = new JsonFormat[sbt.protocol.TerminalSetEchoResponse] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.TerminalSetEchoResponse = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetRawModeCommandFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetRawModeCommandFormats.scala index 2d8e065e7..07f70cdb4 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetRawModeCommandFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetRawModeCommandFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TerminalSetRawModeCommandFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TerminalSetRawModeCommandFormat: JsonFormat[sbt.protocol.TerminalSetRawModeCommand] = new JsonFormat[sbt.protocol.TerminalSetRawModeCommand] { +given TerminalSetRawModeCommandFormat: JsonFormat[sbt.protocol.TerminalSetRawModeCommand] = new JsonFormat[sbt.protocol.TerminalSetRawModeCommand] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.TerminalSetRawModeCommand = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetRawModeResponseFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetRawModeResponseFormats.scala index d237cf412..9f72aae23 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetRawModeResponseFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetRawModeResponseFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TerminalSetRawModeResponseFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TerminalSetRawModeResponseFormat: JsonFormat[sbt.protocol.TerminalSetRawModeResponse] = new JsonFormat[sbt.protocol.TerminalSetRawModeResponse] { +given TerminalSetRawModeResponseFormat: JsonFormat[sbt.protocol.TerminalSetRawModeResponse] = new JsonFormat[sbt.protocol.TerminalSetRawModeResponse] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.TerminalSetRawModeResponse = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetSizeCommandFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetSizeCommandFormats.scala index c7ff3439d..eb93bb2e3 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetSizeCommandFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetSizeCommandFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TerminalSetSizeCommandFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TerminalSetSizeCommandFormat: JsonFormat[sbt.protocol.TerminalSetSizeCommand] = new JsonFormat[sbt.protocol.TerminalSetSizeCommand] { +given TerminalSetSizeCommandFormat: JsonFormat[sbt.protocol.TerminalSetSizeCommand] = new JsonFormat[sbt.protocol.TerminalSetSizeCommand] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.TerminalSetSizeCommand = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetSizeResponseFormats.scala b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetSizeResponseFormats.scala index ad34f4fe3..a3a09e66e 100644 --- a/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetSizeResponseFormats.scala +++ b/protocol/src/main/contraband-scala/sbt/protocol/codec/TerminalSetSizeResponseFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TerminalSetSizeResponseFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TerminalSetSizeResponseFormat: JsonFormat[sbt.protocol.TerminalSetSizeResponse] = new JsonFormat[sbt.protocol.TerminalSetSizeResponse] { +given TerminalSetSizeResponseFormat: JsonFormat[sbt.protocol.TerminalSetSizeResponse] = new JsonFormat[sbt.protocol.TerminalSetSizeResponse] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.TerminalSetSizeResponse = { __jsOpt match { case Some(__js) => diff --git a/protocol/src/main/scala/sbt/protocol/ClientSocket.scala b/protocol/src/main/scala/sbt/protocol/ClientSocket.scala index 56a69ee1f..79f333cc5 100644 --- a/protocol/src/main/scala/sbt/protocol/ClientSocket.scala +++ b/protocol/src/main/scala/sbt/protocol/ClientSocket.scala @@ -24,7 +24,7 @@ object ClientSocket { def socket(portfile: File): (Socket, Option[String]) = socket(portfile, false) def socket(portfile: File, useJNI: Boolean): (Socket, Option[String]) = { - import fileFormats.* + import fileFormats.given val json: JValue = Parser.parseFromString(sbt.io.IO.read(portfile)).get val p = Converter.fromJson[PortFile](json).get val uri = new URI(p.uri) diff --git a/protocol/src/main/scala/sbt/protocol/Serialization.scala b/protocol/src/main/scala/sbt/protocol/Serialization.scala index 744c48232..525e8c592 100644 --- a/protocol/src/main/scala/sbt/protocol/Serialization.scala +++ b/protocol/src/main/scala/sbt/protocol/Serialization.scala @@ -57,19 +57,19 @@ object Serialization { @deprecated("unused", since = "1.4.0") def serializeCommand(command: CommandMessage): Array[Byte] = { - import codec.JsonProtocol.* + import codec.JsonProtocol.given val json: JValue = Converter.toJson[CommandMessage](command).get CompactPrinter(json).getBytes("UTF-8") } private[sbt] def serializeCommandAsJsonMessage(command: CommandMessage): String = { - import sjsonnew.BasicJsonProtocol.* + import sjsonnew.BasicJsonProtocol.given command match { case x: InitCommand => val execId = x.execId.getOrElse(UUID.randomUUID.toString) val opts = x.initializationOptions.getOrElse(sys.error("expected initializationOptions")) - import sbt.protocol.codec.JsonProtocol.* + import sbt.protocol.codec.JsonProtocol.given val optsJson = CompactPrinter(Converter.toJson(opts).get) s"""{ "jsonrpc": "2.0", "id": "$execId", "method": "initialize", "params": { "initializationOptions": $optsJson } }""" case x: ExecCommand => @@ -93,7 +93,7 @@ object Serialization { } def serializeEventMessage(event: EventMessage): Array[Byte] = { - import codec.JsonProtocol.* + import codec.JsonProtocol.given val json: JValue = Converter.toJson[EventMessage](event).get CompactPrinter(json).getBytes("UTF-8") } @@ -140,7 +140,7 @@ object Serialization { val buffer = ByteBuffer.wrap(bytes.toArray) Parser.parseFromByteBuffer(buffer) match { case Success(json) => - import codec.JsonProtocol.* + import codec.JsonProtocol.given Converter.fromJson[CommandMessage](json) match { case Success(command) => Right(command) case Failure(e) => Left(e.getMessage) @@ -161,13 +161,13 @@ object Serialization { case Success(json) => detectType(json) match { case Some("StringEvent") => - import sbt.internal.util.codec.JsonProtocol.* + import sbt.internal.util.codec.JsonProtocol.given Converter.fromJson[StringEvent](json) match { case Success(event) => Right(event) case Failure(e) => Left(e.getMessage) } case _ => - import codec.JsonProtocol.* + import codec.JsonProtocol.given Converter.fromJson[EventMessage](json) match { case Success(event) => Right(event) case Failure(e) => Left(e.getMessage) @@ -197,7 +197,7 @@ object Serialization { val buffer = ByteBuffer.wrap(bytes.toArray) Parser.parseFromByteBuffer(buffer) match { case Success(json) => - import codec.JsonProtocol.* + import codec.JsonProtocol.given Converter.fromJson[EventMessage](json) match { case Success(event) => Right(event) case Failure(e) => Left(e.getMessage) diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/StartTestGroupEvent.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/StartTestGroupEvent.scala index 37f89b820..7acba04f1 100644 --- a/testing/src/main/contraband-scala/sbt/protocol/testing/StartTestGroupEvent.scala +++ b/testing/src/main/contraband-scala/sbt/protocol/testing/StartTestGroupEvent.scala @@ -20,7 +20,7 @@ final class StartTestGroupEvent private ( override def toString: String = { "StartTestGroupEvent(" + name + ")" } - private def copy(name: String = name): StartTestGroupEvent = { + private def copy(name: String): StartTestGroupEvent = { new StartTestGroupEvent(name) } def withName(name: String): StartTestGroupEvent = { diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/TestCompleteEvent.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/TestCompleteEvent.scala index 2c3b450c7..ca4e55c77 100644 --- a/testing/src/main/contraband-scala/sbt/protocol/testing/TestCompleteEvent.scala +++ b/testing/src/main/contraband-scala/sbt/protocol/testing/TestCompleteEvent.scala @@ -20,7 +20,7 @@ final class TestCompleteEvent private ( override def toString: String = { "TestCompleteEvent(" + result + ")" } - private def copy(result: sbt.protocol.testing.TestResult = result): TestCompleteEvent = { + private def copy(result: sbt.protocol.testing.TestResult): TestCompleteEvent = { new TestCompleteEvent(result) } def withResult(result: sbt.protocol.testing.TestResult): TestCompleteEvent = { diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/TestInitEvent.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/TestInitEvent.scala index 6a80b2b9a..c479f5801 100644 --- a/testing/src/main/contraband-scala/sbt/protocol/testing/TestInitEvent.scala +++ b/testing/src/main/contraband-scala/sbt/protocol/testing/TestInitEvent.scala @@ -19,9 +19,7 @@ override def hashCode: Int = { override def toString: String = { "TestInitEvent()" } -private def copy(): TestInitEvent = { - new TestInitEvent() -} + } object TestInitEvent { diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/TestResult.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/TestResult.scala index 334e85986..876857c80 100644 --- a/testing/src/main/contraband-scala/sbt/protocol/testing/TestResult.scala +++ b/testing/src/main/contraband-scala/sbt/protocol/testing/TestResult.scala @@ -5,12 +5,13 @@ // DO NOT EDIT MANUALLY package sbt.protocol.testing /** Testing result */ -sealed abstract class TestResult extends Serializable +enum TestResult { + + case Empty + case Passed + case Failed + case Error +} object TestResult { - - case object Empty extends TestResult - case object Passed extends TestResult - case object Failed extends TestResult - case object Error extends TestResult } diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/TestStringEvent.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/TestStringEvent.scala index f6c669df0..a84668537 100644 --- a/testing/src/main/contraband-scala/sbt/protocol/testing/TestStringEvent.scala +++ b/testing/src/main/contraband-scala/sbt/protocol/testing/TestStringEvent.scala @@ -19,7 +19,7 @@ final class TestStringEvent private ( override def toString: String = { value } - private def copy(value: String = value): TestStringEvent = { + private def copy(value: String): TestStringEvent = { new TestStringEvent(value) } def withValue(value: String): TestStringEvent = { diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/EndTestGroupErrorEventFormats.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/EndTestGroupErrorEventFormats.scala index 193e96912..50dc00f29 100644 --- a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/EndTestGroupErrorEventFormats.scala +++ b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/EndTestGroupErrorEventFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.testing.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait EndTestGroupErrorEventFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val EndTestGroupErrorEventFormat: JsonFormat[sbt.protocol.testing.EndTestGroupErrorEvent] = new JsonFormat[sbt.protocol.testing.EndTestGroupErrorEvent] { +given EndTestGroupErrorEventFormat: JsonFormat[sbt.protocol.testing.EndTestGroupErrorEvent] = new JsonFormat[sbt.protocol.testing.EndTestGroupErrorEvent] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.testing.EndTestGroupErrorEvent = { __jsOpt match { case Some(__js) => diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/EndTestGroupEventFormats.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/EndTestGroupEventFormats.scala index 418a465a4..942cdb0e0 100644 --- a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/EndTestGroupEventFormats.scala +++ b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/EndTestGroupEventFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.testing.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait EndTestGroupEventFormats { self: sbt.protocol.testing.codec.TestResultFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val EndTestGroupEventFormat: JsonFormat[sbt.protocol.testing.EndTestGroupEvent] = new JsonFormat[sbt.protocol.testing.EndTestGroupEvent] { +given EndTestGroupEventFormat: JsonFormat[sbt.protocol.testing.EndTestGroupEvent] = new JsonFormat[sbt.protocol.testing.EndTestGroupEvent] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.testing.EndTestGroupEvent = { __jsOpt match { case Some(__js) => diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/StartTestGroupEventFormats.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/StartTestGroupEventFormats.scala index e007d8c70..ebda14d8c 100644 --- a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/StartTestGroupEventFormats.scala +++ b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/StartTestGroupEventFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.testing.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait StartTestGroupEventFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val StartTestGroupEventFormat: JsonFormat[sbt.protocol.testing.StartTestGroupEvent] = new JsonFormat[sbt.protocol.testing.StartTestGroupEvent] { +given StartTestGroupEventFormat: JsonFormat[sbt.protocol.testing.StartTestGroupEvent] = new JsonFormat[sbt.protocol.testing.StartTestGroupEvent] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.testing.StartTestGroupEvent = { __jsOpt match { case Some(__js) => diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestCompleteEventFormats.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestCompleteEventFormats.scala index 22ffc52f9..64fa10df4 100644 --- a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestCompleteEventFormats.scala +++ b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestCompleteEventFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.testing.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TestCompleteEventFormats { self: sbt.protocol.testing.codec.TestResultFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val TestCompleteEventFormat: JsonFormat[sbt.protocol.testing.TestCompleteEvent] = new JsonFormat[sbt.protocol.testing.TestCompleteEvent] { +given TestCompleteEventFormat: JsonFormat[sbt.protocol.testing.TestCompleteEvent] = new JsonFormat[sbt.protocol.testing.TestCompleteEvent] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.testing.TestCompleteEvent = { __jsOpt match { case Some(__js) => diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestInitEventFormats.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestInitEventFormats.scala index 90165a34e..48e0a8978 100644 --- a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestInitEventFormats.scala +++ b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestInitEventFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.testing.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TestInitEventFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TestInitEventFormat: JsonFormat[sbt.protocol.testing.TestInitEvent] = new JsonFormat[sbt.protocol.testing.TestInitEvent] { +given TestInitEventFormat: JsonFormat[sbt.protocol.testing.TestInitEvent] = new JsonFormat[sbt.protocol.testing.TestInitEvent] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.testing.TestInitEvent = { __jsOpt match { case Some(__js) => diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestItemDetailFormats.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestItemDetailFormats.scala index 16775dce0..f82b7b378 100644 --- a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestItemDetailFormats.scala +++ b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestItemDetailFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.testing.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TestItemDetailFormats { self: sbt.internal.testing.StatusFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val TestItemDetailFormat: JsonFormat[sbt.protocol.testing.TestItemDetail] = new JsonFormat[sbt.protocol.testing.TestItemDetail] { +given TestItemDetailFormat: JsonFormat[sbt.protocol.testing.TestItemDetail] = new JsonFormat[sbt.protocol.testing.TestItemDetail] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.testing.TestItemDetail = { __jsOpt match { case Some(__js) => diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestItemEventFormats.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestItemEventFormats.scala index 00e90f42e..25c8bda30 100644 --- a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestItemEventFormats.scala +++ b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestItemEventFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.testing.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TestItemEventFormats { self: sbt.protocol.testing.codec.TestResultFormats & sjsonnew.BasicJsonProtocol & sbt.protocol.testing.codec.TestItemDetailFormats & sbt.internal.testing.StatusFormats => -implicit lazy val TestItemEventFormat: JsonFormat[sbt.protocol.testing.TestItemEvent] = new JsonFormat[sbt.protocol.testing.TestItemEvent] { +given TestItemEventFormat: JsonFormat[sbt.protocol.testing.TestItemEvent] = new JsonFormat[sbt.protocol.testing.TestItemEvent] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.testing.TestItemEvent = { __jsOpt match { case Some(__js) => diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestMessageFormats.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestMessageFormats.scala index cb68c2347..1da51018c 100644 --- a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestMessageFormats.scala +++ b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestMessageFormats.scala @@ -7,5 +7,5 @@ package sbt.protocol.testing.codec import _root_.sjsonnew.JsonFormat trait TestMessageFormats { self: sjsonnew.BasicJsonProtocol & sbt.protocol.testing.codec.TestStringEventFormats & sbt.protocol.testing.codec.TestInitEventFormats & sbt.protocol.testing.codec.TestResultFormats & sbt.protocol.testing.codec.TestCompleteEventFormats & sbt.protocol.testing.codec.StartTestGroupEventFormats & sbt.protocol.testing.codec.EndTestGroupEventFormats & sbt.protocol.testing.codec.EndTestGroupErrorEventFormats & sbt.protocol.testing.codec.TestItemDetailFormats & sbt.internal.testing.StatusFormats & sbt.protocol.testing.codec.TestItemEventFormats => -implicit lazy val TestMessageFormat: JsonFormat[sbt.protocol.testing.TestMessage] = flatUnionFormat7[sbt.protocol.testing.TestMessage, sbt.protocol.testing.TestStringEvent, sbt.protocol.testing.TestInitEvent, sbt.protocol.testing.TestCompleteEvent, sbt.protocol.testing.StartTestGroupEvent, sbt.protocol.testing.EndTestGroupEvent, sbt.protocol.testing.EndTestGroupErrorEvent, sbt.protocol.testing.TestItemEvent]("type") +given TestMessageFormat: JsonFormat[sbt.protocol.testing.TestMessage] = flatUnionFormat7[sbt.protocol.testing.TestMessage, sbt.protocol.testing.TestStringEvent, sbt.protocol.testing.TestInitEvent, sbt.protocol.testing.TestCompleteEvent, sbt.protocol.testing.StartTestGroupEvent, sbt.protocol.testing.EndTestGroupEvent, sbt.protocol.testing.EndTestGroupErrorEvent, sbt.protocol.testing.TestItemEvent]("type") } diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestResultFormats.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestResultFormats.scala index e1c2fc270..ffa11bdf7 100644 --- a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestResultFormats.scala +++ b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestResultFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.testing.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TestResultFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TestResultFormat: JsonFormat[sbt.protocol.testing.TestResult] = new JsonFormat[sbt.protocol.testing.TestResult] { +given TestResultFormat: JsonFormat[sbt.protocol.testing.TestResult] = new JsonFormat[sbt.protocol.testing.TestResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.testing.TestResult = { __jsOpt match { case Some(__js) => diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestStringEventFormats.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestStringEventFormats.scala index 237ab61e8..967d8180c 100644 --- a/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestStringEventFormats.scala +++ b/testing/src/main/contraband-scala/sbt/protocol/testing/codec/TestStringEventFormats.scala @@ -6,7 +6,7 @@ package sbt.protocol.testing.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait TestStringEventFormats { self: sjsonnew.BasicJsonProtocol => -implicit lazy val TestStringEventFormat: JsonFormat[sbt.protocol.testing.TestStringEvent] = new JsonFormat[sbt.protocol.testing.TestStringEvent] { +given TestStringEventFormat: JsonFormat[sbt.protocol.testing.TestStringEvent] = new JsonFormat[sbt.protocol.testing.TestStringEvent] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.protocol.testing.TestStringEvent = { __jsOpt match { case Some(__js) => diff --git a/testing/src/main/scala/sbt/internal/testing/TestLogger.scala b/testing/src/main/scala/sbt/internal/testing/TestLogger.scala index fbc5e94d6..86764eb9a 100644 --- a/testing/src/main/scala/sbt/internal/testing/TestLogger.scala +++ b/testing/src/main/scala/sbt/internal/testing/TestLogger.scala @@ -16,7 +16,7 @@ import sbt.protocol.testing.* import java.util.concurrent.atomic.AtomicInteger object TestLogger { - import sbt.protocol.testing.codec.JsonProtocol.* + import sbt.protocol.testing.codec.JsonProtocol.given given testStringEventShowLines: ShowLines[TestStringEvent] = ShowLines[TestStringEvent]({ case a: TestStringEvent => @@ -118,7 +118,7 @@ final class TestLogging( class TestLogger(val logging: TestLogging) extends TestsListener { import TestLogger.* import logging.{ global, logTest, managed } - import sbt.protocol.testing.codec.JsonProtocol.* + import sbt.protocol.testing.codec.JsonProtocol.given def doInit(): Unit = managed.logEvent(Level.Info, TestInitEvent()) diff --git a/util-cache/src/main/contraband-scala/sbt/internal/util/codec/ActionResultFormats.scala b/util-cache/src/main/contraband-scala/sbt/internal/util/codec/ActionResultFormats.scala index 72dd9658e..18e9b8d6e 100644 --- a/util-cache/src/main/contraband-scala/sbt/internal/util/codec/ActionResultFormats.scala +++ b/util-cache/src/main/contraband-scala/sbt/internal/util/codec/ActionResultFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.util.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ActionResultFormats { self: sbt.internal.util.codec.HashedVirtualFileRefFormats & sbt.internal.util.codec.ByteBufferFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ActionResultFormat: JsonFormat[sbt.util.ActionResult] = new JsonFormat[sbt.util.ActionResult] { +given ActionResultFormat: JsonFormat[sbt.util.ActionResult] = new JsonFormat[sbt.util.ActionResult] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.util.ActionResult = { __jsOpt match { case Some(__js) => diff --git a/util-cache/src/main/contraband-scala/sbt/internal/util/codec/ManifestFormats.scala b/util-cache/src/main/contraband-scala/sbt/internal/util/codec/ManifestFormats.scala index a9bb8be9f..573f15c93 100644 --- a/util-cache/src/main/contraband-scala/sbt/internal/util/codec/ManifestFormats.scala +++ b/util-cache/src/main/contraband-scala/sbt/internal/util/codec/ManifestFormats.scala @@ -6,7 +6,7 @@ package sbt.internal.util.codec import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError } trait ManifestFormats { self: sbt.internal.util.codec.HashedVirtualFileRefFormats & sjsonnew.BasicJsonProtocol => -implicit lazy val ManifestFormat: JsonFormat[sbt.util.Manifest] = new JsonFormat[sbt.util.Manifest] { +given ManifestFormat: JsonFormat[sbt.util.Manifest] = new JsonFormat[sbt.util.Manifest] { override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.util.Manifest = { __jsOpt match { case Some(__js) =>