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

Merge pull request #7864 from xuwei-k/delete-deprecated-since-0-x

This commit is contained in:
eugene yokota 2024-11-04 10:00:36 -05:00 committed by GitHub
parent 8c8cc430a8 07ae450e14
commit af22a5cf0f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 0 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala
View File

@ -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`.

5
lm-ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala
View File

@ -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. */

6
lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyRetrieve.scala
View File

@ -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]) = {

94
lm-ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala
View File

@ -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, "<?xml version='1.0' encoding='" + IO.utf8.name + "'?>" + 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) {
}
</dependencies>
@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) {
</dependency>
}
@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) => <scope>{s}</scope>
@ -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)