mirror of https://github.com/sbt/sbt.git
remove unused private val and def
This commit is contained in:
parent
52d36653da
commit
614d9ce985
|
|
@ -46,9 +46,6 @@ private object WindowsSupport {
|
||||||
*/
|
*/
|
||||||
private[util] class WindowsInputStream(term: org.jline.terminal.Terminal, in: InputStream)
|
private[util] class WindowsInputStream(term: org.jline.terminal.Terminal, in: InputStream)
|
||||||
extends SimpleInputStream {
|
extends SimpleInputStream {
|
||||||
private val SHIFT_FLAG = 0x01;
|
|
||||||
private val ALT_FLAG = 0x02;
|
|
||||||
private val CTRL_FLAG = 0x04;
|
|
||||||
|
|
||||||
private val RIGHT_ALT_PRESSED = 0x0001;
|
private val RIGHT_ALT_PRESSED = 0x0001;
|
||||||
private val LEFT_ALT_PRESSED = 0x0002;
|
private val LEFT_ALT_PRESSED = 0x0002;
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,6 @@ object CrossVersionUtil {
|
||||||
private val ReleaseV = raw"""$basicVersion(-\d+)?""".r
|
private val ReleaseV = raw"""$basicVersion(-\d+)?""".r
|
||||||
private[sbt] val BinCompatV = raw"""$basicVersion(-$tagPattern)?-bin(-.*)?""".r
|
private[sbt] val BinCompatV = raw"""$basicVersion(-$tagPattern)?-bin(-.*)?""".r
|
||||||
private val CandidateV = raw"""$basicVersion(-RC\d+)""".r
|
private val CandidateV = raw"""$basicVersion(-RC\d+)""".r
|
||||||
private val MilestonV = raw"""$basicVersion(-M$tagPattern)""".r
|
|
||||||
private val NonReleaseV_n =
|
private val NonReleaseV_n =
|
||||||
raw"""$basicVersion((?:-$tagPattern)*)""".r // 0-n word suffixes, with leading dashes
|
raw"""$basicVersion((?:-$tagPattern)*)""".r // 0-n word suffixes, with leading dashes
|
||||||
private val NonReleaseV_1 = raw"""$basicVersion(-$tagPattern)""".r // 1 word suffix, after a dash
|
private val NonReleaseV_1 = raw"""$basicVersion(-$tagPattern)""".r // 1 word suffix, after a dash
|
||||||
|
|
|
||||||
|
|
@ -10,12 +10,6 @@ object ToCoursier {
|
||||||
def configuration(configuration: Configuration): coursier.core.Configuration =
|
def configuration(configuration: Configuration): coursier.core.Configuration =
|
||||||
coursier.core.Configuration(configuration.value)
|
coursier.core.Configuration(configuration.value)
|
||||||
|
|
||||||
private def attributes(attributes: Attributes): coursier.core.Attributes =
|
|
||||||
coursier.core.Attributes(
|
|
||||||
coursier.core.Type(attributes.`type`.value),
|
|
||||||
coursier.core.Classifier(attributes.classifier.value)
|
|
||||||
)
|
|
||||||
|
|
||||||
def publication(publication: Publication): coursier.core.Publication =
|
def publication(publication: Publication): coursier.core.Publication =
|
||||||
coursier.core.Publication(
|
coursier.core.Publication(
|
||||||
publication.name,
|
publication.name,
|
||||||
|
|
|
||||||
|
|
@ -2842,23 +2842,11 @@ object Classpaths {
|
||||||
s: Setting[Task[Classpath]]
|
s: Setting[Task[Classpath]]
|
||||||
): Setting[Task[Classpath]] =
|
): Setting[Task[Classpath]] =
|
||||||
s.mapInitialize(init => Def.task { exportVirtualClasspath(streams.value, init.value) })
|
s.mapInitialize(init => Def.task { exportVirtualClasspath(streams.value, init.value) })
|
||||||
private def exportClasspath(
|
|
||||||
s: Setting[Task[Seq[Attributed[File]]]]
|
|
||||||
): Setting[Task[Seq[Attributed[File]]]] =
|
|
||||||
s.mapInitialize(init => Def.task { exportClasspath(streams.value, init.value) })
|
|
||||||
private def exportVirtualClasspath(s: TaskStreams, cp: Classpath): Classpath =
|
private def exportVirtualClasspath(s: TaskStreams, cp: Classpath): Classpath =
|
||||||
val w = s.text(ExportStream)
|
val w = s.text(ExportStream)
|
||||||
try w.println(data(cp).toString)
|
try w.println(data(cp).toString)
|
||||||
finally w.close() // workaround for #937
|
finally w.close() // workaround for #937
|
||||||
cp
|
cp
|
||||||
private def exportClasspath(
|
|
||||||
s: TaskStreams,
|
|
||||||
cp: Seq[Attributed[File]]
|
|
||||||
): Seq[Attributed[File]] =
|
|
||||||
val w = s.text(ExportStream)
|
|
||||||
try w.println(Path.makeString(data(cp)))
|
|
||||||
finally w.close() // workaround for #937
|
|
||||||
cp
|
|
||||||
|
|
||||||
def defaultPackageKeys = Seq(packageBin, packageSrc, packageDoc)
|
def defaultPackageKeys = Seq(packageBin, packageSrc, packageDoc)
|
||||||
lazy val defaultPackages: Seq[TaskKey[HashedVirtualFileRef]] =
|
lazy val defaultPackages: Seq[TaskKey[HashedVirtualFileRef]] =
|
||||||
|
|
|
||||||
|
|
@ -728,22 +728,6 @@ object BuildServerProtocol {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
private def scalacOptionsBuildItem(
|
|
||||||
sbtJars: Seq[File],
|
|
||||||
targetId: BuildTargetIdentifier,
|
|
||||||
build: LoadedBuildUnit
|
|
||||||
): ScalacOptionsItem = {
|
|
||||||
val plugins: LoadedPlugins = build.unit.plugins
|
|
||||||
val scalacOptions = plugins.pluginData.scalacOptions.toVector
|
|
||||||
val converter = plugins.pluginData.converter
|
|
||||||
val classpath =
|
|
||||||
plugins.classpath.map(f => converter.toPath(f).toFile.toURI).toVector ++
|
|
||||||
sbtJars.map(_.toURI).toVector
|
|
||||||
val classDirectory = new File(build.localBase, "project/target").toURI
|
|
||||||
val item = ScalacOptionsItem(targetId, scalacOptions, classpath, classDirectory)
|
|
||||||
item
|
|
||||||
}
|
|
||||||
|
|
||||||
private def javacOptionsBuildItem(
|
private def javacOptionsBuildItem(
|
||||||
sbtJars: Array[File],
|
sbtJars: Array[File],
|
||||||
targetId: BuildTargetIdentifier,
|
targetId: BuildTargetIdentifier,
|
||||||
|
|
|
||||||
|
|
@ -174,7 +174,6 @@ private[sbt] object Settings {
|
||||||
}) :: fileStamps(scopedKey) :: allFilesImpl(scope) :: changedInputFilesImpl(scope)
|
}) :: fileStamps(scopedKey) :: allFilesImpl(scope) :: changedInputFilesImpl(scope)
|
||||||
}
|
}
|
||||||
|
|
||||||
private val seqClass = classOf[Seq[?]]
|
|
||||||
private val pathClass = classOf[Path]
|
private val pathClass = classOf[Path]
|
||||||
private val fileClass = classOf[File]
|
private val fileClass = classOf[File]
|
||||||
private val virtualFileRefClass = classOf[VirtualFileRef]
|
private val virtualFileRefClass = classOf[VirtualFileRef]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue