From 07ae450e145d5985e14a18319224ebc8bab6dfcd Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Mon, 4 Nov 2024 17:17:55 +0900 Subject: [PATCH] delete deprecated methods --- .../sbt/internal/util/ConsoleAppender.scala | 13 --- .../librarymanagement/ConvertResolver.scala | 5 - .../librarymanagement/IvyRetrieve.scala | 6 -- .../internal/librarymanagement/MakePom.scala | 94 ------------------- 4 files changed, 118 deletions(-) diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala index 0b7d38720..5c48ee833 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala @@ -24,19 +24,6 @@ import org.apache.logging.log4j.message.SimpleMessageFactory import java.util.concurrent.atomic.AtomicReference object ConsoleLogger { - // These are provided so other modules do not break immediately. - @deprecated("Use EscHelpers.ESC instead", "0.13.x") - final val ESC = EscHelpers.ESC - @deprecated("Use EscHelpers.isEscapeTerminator instead", "0.13.x") - private[sbt] def isEscapeTerminator(c: Char): Boolean = EscHelpers.isEscapeTerminator(c) - @deprecated("Use EscHelpers.hasEscapeSequence instead", "0.13.x") - def hasEscapeSequence(s: String): Boolean = EscHelpers.hasEscapeSequence(s) - @deprecated("Use EscHelpers.removeEscapeSequences instead", "0.13.x") - def removeEscapeSequences(s: String): String = EscHelpers.removeEscapeSequences(s) - @deprecated("Use ConsoleAppender.formatEnabledInEnv instead", "0.13.x") - lazy val formatEnabled = ConsoleAppender.formatEnabledInEnv - @deprecated("Use ConsoleAppender.noSuppressedMessage instead", "0.13.x") - val noSuppressedMessage = ConsoleAppender.noSuppressedMessage /** * A new `ConsoleLogger` that logs to `out`. diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala index 64d5c9922..c94938df9 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala @@ -135,11 +135,6 @@ private[sbt] object ConvertResolver { } } - /** Converts the given sbt resolver into an Ivy resolver. */ - @deprecated("Use the variant with updateOptions", "0.13.8") - def apply(r: Resolver, settings: IvySettings, log: Logger): DependencyResolver = - apply(r, settings, UpdateOptions(), log) - private[librarymanagement] val ManagedChecksums = "sbt.managedChecksums" /** Converts the given sbt resolver into an Ivy resolver. */ diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyRetrieve.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyRetrieve.scala index 578fec0a3..ac9e43fd5 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyRetrieve.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyRetrieve.scala @@ -27,12 +27,6 @@ object IvyRetrieve { } } yield moduleRevisionDetail(confReport, confReport.getDependency(revId)) - @deprecated("Internal only. No longer in use.", "0.13.6") - def artifactReports(mid: ModuleID, artReport: Seq[ArtifactDownloadReport]): ModuleReport = { - val (resolved, missing) = artifacts(artReport) - ModuleReport(mid, resolved, missing) - } - private[sbt] def artifacts( artReport: Seq[ArtifactDownloadReport] ): (Vector[(Artifact, File)], Vector[Artifact]) = { diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala index aed855d3b..97354df58 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala @@ -43,33 +43,6 @@ object MakePom { } class MakePom(val log: Logger) { import MakePom._ - @deprecated( - "Use `write(Ivy, ModuleDescriptor, ModuleInfo, Option[Iterable[Configuration]], Set[String], NodeSeq, XNode => XNode, MavenRepository => Boolean, Boolean, File)` instead", - "0.11.2" - ) - def write( - ivy: Ivy, - module: ModuleDescriptor, - moduleInfo: ModuleInfo, - configurations: Option[Iterable[Configuration]], - extra: NodeSeq, - process: XNode => XNode, - filterRepositories: MavenRepository => Boolean, - allRepositories: Boolean, - output: File - ): Unit = - write( - ivy, - module, - moduleInfo: ModuleInfo, - configurations: Option[Iterable[Configuration]], - Set(Artifact.DefaultType), - extra, - process, - filterRepositories, - allRepositories, - output - ) def write( ivy: Ivy, module: ModuleDescriptor, @@ -103,29 +76,6 @@ class MakePom(val log: Logger) { IO.write(output, "" + newline + xmlString) def toString(node: XNode): String = new PrettyPrinter(1000, 4).format(node) - @deprecated( - "Use `toPom(Ivy, ModuleDescriptor, ModuleInfo, Option[Iterable[Configuration]], Set[String], NodeSeq, MavenRepository => Boolean, Boolean)` instead", - "0.11.2" - ) - def toPom( - ivy: Ivy, - module: ModuleDescriptor, - moduleInfo: ModuleInfo, - configurations: Option[Iterable[Configuration]], - extra: NodeSeq, - filterRepositories: MavenRepository => Boolean, - allRepositories: Boolean - ): XNode = - toPom( - ivy, - module, - moduleInfo, - configurations, - Set(Artifact.DefaultType), - extra, - filterRepositories, - allRepositories - ) def toPom( ivy: Ivy, module: ModuleDescriptor, @@ -288,13 +238,6 @@ class MakePom(val log: Logger) { } val IgnoreTypes: Set[String] = Set(Artifact.SourceType, Artifact.DocType, Artifact.PomType) - @deprecated("Use `makeDependencies` variant which takes excludes", "0.13.9") - def makeDependencies( - dependencies: Seq[DependencyDescriptor], - includeTypes: Set[String] - ): NodeSeq = - makeDependencies(dependencies, includeTypes, Nil) - def makeDependencies( dependencies: Seq[DependencyDescriptor], includeTypes: Set[String], @@ -309,10 +252,6 @@ class MakePom(val log: Logger) { } - @deprecated("Use `makeDependency` variant which takes excludes", "0.13.9") - def makeDependency(dependency: DependencyDescriptor, includeTypes: Set[String]): NodeSeq = - makeDependency(dependency, includeTypes, Nil) - def makeDependency( dependency: DependencyDescriptor, includeTypes: Set[String], @@ -332,13 +271,6 @@ class MakePom(val log: Logger) { NodeSeq.fromSeq(artifacts.flatMap(a => makeDependencyElem(dependency, a, excludes))) } - @deprecated("Use `makeDependencyElem` variant which takes excludes", "0.13.9") - def makeDependencyElem( - dependency: DependencyDescriptor, - artifact: DependencyArtifactDescriptor - ): Option[Elem] = - makeDependencyElem(dependency, artifact, Nil) - def makeDependencyElem( dependency: DependencyDescriptor, artifact: DependencyArtifactDescriptor, @@ -360,16 +292,6 @@ class MakePom(val log: Logger) { } else None } - @deprecated("Use `makeDependencyElem` variant which takes excludes", "0.13.9") - def makeDependencyElem( - dependency: DependencyDescriptor, - scope: Option[String], - optional: Boolean, - classifier: Option[String], - tpe: Option[String] - ): Elem = - makeDependencyElem(dependency, scope, optional, classifier, tpe, Nil) - def makeDependencyElem( dependency: DependencyDescriptor, scope: Option[String], @@ -391,14 +313,6 @@ class MakePom(val log: Logger) { } - @deprecated("No longer used and will be removed.", "0.12.1") - def classifier(dependency: DependencyDescriptor, includeTypes: Set[String]): NodeSeq = { - val jarDep = dependency.getAllDependencyArtifacts.find(d => includeTypes(d.getType)) - jarDep match { - case Some(a) => classifierElem(artifactClassifier(a)) - case None => NodeSeq.Empty - } - } def artifactType(artifact: DependencyArtifactDescriptor): Option[String] = Option(artifact.getType).flatMap { tpe => if (tpe == "jar") None else Some(tpe) @@ -417,11 +331,6 @@ class MakePom(val log: Logger) { case None => NodeSeq.Empty } - @deprecated("No longer used and will be removed.", "0.12.1") - def scopeAndOptional(dependency: DependencyDescriptor): NodeSeq = { - val (scope, opt) = getScopeAndOptional(dependency.getModuleConfigurations) - scopeElem(scope) ++ optionalElem(opt) - } def scopeElem(scope: Option[String]): NodeSeq = scope match { case None | Some(Configurations.Compile.name) => NodeSeq.Empty case Some(s) => {s} @@ -439,9 +348,6 @@ class MakePom(val log: Logger) { (scope, opt.nonEmpty) } - @deprecated("Use `exclusions` variant which takes excludes", "0.13.9") - def exclusions(dependency: DependencyDescriptor): NodeSeq = exclusions(dependency, Nil) - def exclusions(dependency: DependencyDescriptor, excludes: Seq[ExcludeRule]): NodeSeq = { val excl = ArraySeq.unsafeWrapArray( dependency.getExcludeRules(dependency.getModuleConfigurations)