From 72edbfa177e01c3ea3645d924518d2ce3aeb8a6c Mon Sep 17 00:00:00 2001 From: Martin Duhem Date: Tue, 29 Sep 2015 10:37:49 +0200 Subject: [PATCH] Create `object Import` for source compat --- main/src/main/scala/sbt/BuildUtil.scala | 2 +- sbt/src/main/scala/Import.scala | 418 ++++++++++++++++++ .../actions/aggregate/project/Marker.scala | 3 +- .../actions/eval-is-safe-and-sound/build.sbt | 4 +- .../update-state-fail/project/Build.scala | 1 + .../api/show-circular-structure/build.sbt | 2 +- .../artifact/project/ArtifactTest.scala | 1 + .../project/TestProject.scala | 1 + .../force/project/TestProject.scala | 1 + .../info/project/InfoTest.scala | 3 +- .../ivy-settings-c/project/P.scala | 3 +- .../ivy-settings-multi-a/project/P.scala | 2 +- .../make-pom/project/MakePomTest.scala | 3 +- .../pom-advanced/project/PomRepoTest.scala | 3 +- .../pom-classpaths/project/Build.scala | 3 +- .../provided/project/TestProject.scala | 3 +- .../publish-local/changes/RetrieveTest.scala | 1 + .../project/MultiPublishTest.scala | 3 +- .../sources/project/Test.scala | 3 +- .../url/project/TestProject.scala | 3 +- .../project/auto-plugins/project/A.scala | 2 +- .../project/auto-plugins/project/Q.scala | 1 + .../delegate_config/project/Build.scala | 1 + .../project/delegates/project/Build.scala | 1 + .../external-conflict/changes/Build.scala | 1 + .../project/flatten/project/Flat.scala | 1 + .../project/global-plugin/changes/Build.scala | 1 + .../sbt-test/project/provided/project/P.scala | 3 +- .../transitive-plugins/project/Build.scala | 3 +- .../transitive-memberRef/build.sbt | 2 +- .../typeref-only/build.sbt | 2 +- 31 files changed, 461 insertions(+), 20 deletions(-) create mode 100644 sbt/src/main/scala/Import.scala diff --git a/main/src/main/scala/sbt/BuildUtil.scala b/main/src/main/scala/sbt/BuildUtil.scala index 85514aecd..98e96d89c 100644 --- a/main/src/main/scala/sbt/BuildUtil.scala +++ b/main/src/main/scala/sbt/BuildUtil.scala @@ -71,7 +71,7 @@ object BuildUtil { } } - def baseImports: Seq[String] = "import sbt._, Keys._, dsl._" :: Nil + def baseImports: Seq[String] = "import sbt._, Keys._, dsl._, Import._" :: Nil def getImports(unit: BuildUnit): Seq[String] = unit.plugins.detected.imports ++ unit.definitions.dslDefinitions.imports diff --git a/sbt/src/main/scala/Import.scala b/sbt/src/main/scala/Import.scala new file mode 100644 index 000000000..1b4f1c032 --- /dev/null +++ b/sbt/src/main/scala/Import.scala @@ -0,0 +1,418 @@ +package sbt + +object Import { + + // sbt.io + val AllPassFilter = sbt.io.AllPassFilter + val DirectoryFilter = sbt.io.DirectoryFilter + type ExactFilter = sbt.io.ExactFilter + val ExistsFileFilter = sbt.io.ExistsFileFilter + val FileFilter = sbt.io.FileFilter + type FileFilter = sbt.io.FileFilter + val GlobFilter = sbt.io.GlobFilter + val Hash = sbt.io.Hash + val HiddenFileFilter = sbt.io.HiddenFileFilter + val IO = sbt.io.IO + type Mapper = sbt.io.Mapper + val NameFilter = sbt.io.NameFilter + type NameFilter = sbt.io.NameFilter + val NothingFilter = sbt.io.NothingFilter + val Path = sbt.io.Path + type PathExtra = sbt.io.PathExtra + val PathFinder = sbt.io.PathFinder + type PathFinder = sbt.io.PathFinder + type PathLow = sbt.io.PathLow + type PatternFilter = sbt.io.PatternFilter + type RichFile = sbt.io.RichFile + type SimpleFileFilter = sbt.io.SimpleFileFilter + type SimpleFilter = sbt.io.SimpleFilter + type TestError = sbt.io.TestError + type TestException = sbt.io.TestException + type TestRuntimeException = sbt.io.TestRuntimeException + + // sbt.util + type AbstractLogger = sbt.util.AbstractLogger + val ControlEvent = sbt.util.ControlEvent + type ControlEvent = sbt.util.ControlEvent + val Level = sbt.util.Level + type Log = sbt.util.Log + type LogEvent = sbt.util.LogEvent + val Logger = sbt.util.Logger + type Logger = sbt.util.Logger + type SetLevel = sbt.util.SetLevel + type SetSuccess = sbt.util.SetSuccess + type SetTrace = sbt.util.SetTrace + type Success = sbt.util.Success + type Trace = sbt.util.Trace + + // sbt.internal.util + val AList = sbt.internal.util.AList + type AbstractRMap[K[_], V[_]] = sbt.internal.util.AbstractRMap[K, V] + type AlreadyHandledException = sbt.internal.util.AlreadyHandledException + val AttributeEntry = sbt.internal.util.AttributeEntry + type AttributeEntry[T] = sbt.internal.util.AttributeEntry[T] + val AttributeKey = sbt.internal.util.AttributeKey + type AttributeKey[T] = sbt.internal.util.AttributeKey[T] + val AttributeMap = sbt.internal.util.AttributeMap + type AttributeMap = sbt.internal.util.AttributeMap + val Attributed = sbt.internal.util.Attributed + type Attributed[D] = sbt.internal.util.Attributed[D] + type BasicCache[I, O] = sbt.internal.util.BasicCache[I, O] + type BasicCacheImplicits = sbt.internal.util.BasicCacheImplicits + type BasicLogger = sbt.internal.util.BasicLogger + type BufferedLogger = sbt.internal.util.BufferedLogger + val Cache = sbt.internal.util.Cache + type Cache[I, O] = sbt.internal.util.Cache[I, O] + val CacheIO = sbt.internal.util.CacheIO + type CacheImplicits = sbt.internal.util.CacheImplicits + val ChangeReport = sbt.internal.util.ChangeReport + type ChangeReport[T] = sbt.internal.util.ChangeReport[T] + type Changed[O] = sbt.internal.util.Changed[O] + val Classes = sbt.internal.util.Classes + val ConsoleLogger = sbt.internal.util.ConsoleLogger + type ConsoleLogger = sbt.internal.util.ConsoleLogger + val ConsoleOut = sbt.internal.util.ConsoleOut + type ConsoleOut = sbt.internal.util.ConsoleOut + val Dag = sbt.internal.util.Dag + type Dag[Node <: Dag[Node]] = sbt.internal.util.Dag[Node] + type DelegatingPMap[K[_], V[_]] = sbt.internal.util.DelegatingPMap[K, V] + val Difference = sbt.internal.util.Difference + type Difference = sbt.internal.util.Difference + type EmptyChangeReport[T] = sbt.internal.util.EmptyChangeReport[T] + val ErrorHandling = sbt.internal.util.ErrorHandling + type EvaluateSettings[Scope] = sbt.internal.util.EvaluateSettings[Scope] + val EvaluationState = sbt.internal.util.EvaluationState + val ExitHook = sbt.internal.util.ExitHook + type ExitHook = sbt.internal.util.ExitHook + val ExitHooks = sbt.internal.util.ExitHooks + type FeedbackProvidedException = sbt.internal.util.FeedbackProvidedException + val FileFunction = sbt.internal.util.FileFunction + val FileInfo = sbt.internal.util.FileInfo + type FileInfo = sbt.internal.util.FileInfo + type FilePosition = sbt.internal.util.FilePosition + val FilesInfo = sbt.internal.util.FilesInfo + type FilesInfo[F <: FileInfo] = sbt.internal.util.FilesInfo[F] + type FilterLogger = sbt.internal.util.FilterLogger + type Fn1[A, B] = sbt.internal.util.Fn1[A, B] + val FullLogger = sbt.internal.util.FullLogger + type FullLogger = sbt.internal.util.FullLogger + val FullReader = sbt.internal.util.FullReader + type FullReader = sbt.internal.util.FullReader + val GlobalLogBacking = sbt.internal.util.GlobalLogBacking + type GlobalLogBacking = sbt.internal.util.GlobalLogBacking + val GlobalLogging = sbt.internal.util.GlobalLogging + type GlobalLogging = sbt.internal.util.GlobalLogging + val HCons = sbt.internal.util.HCons + type HCons[H, T <: HList] = sbt.internal.util.HCons[H, T] + val HList = sbt.internal.util.HList + type HList = sbt.internal.util.HList + type HListCacheImplicits = sbt.internal.util.HListCacheImplicits + val HNil = sbt.internal.util.HNil + type HNil = sbt.internal.util.HNil + type HashFileInfo = sbt.internal.util.HashFileInfo + type HashModifiedFileInfo = sbt.internal.util.HashModifiedFileInfo + val IDSet = sbt.internal.util.IDSet + type IDSet[T] = sbt.internal.util.IDSet[T] + val IMap = sbt.internal.util.IMap + type IMap[K[_], V[_]] = sbt.internal.util.IMap[K, V] + type Init[Scope] = sbt.internal.util.Init[Scope] + val InputCache = sbt.internal.util.InputCache + type InputCache[I] = sbt.internal.util.InputCache[I] + type JLine = sbt.internal.util.JLine + val KCons = sbt.internal.util.KCons + type KCons[H, +T <: KList[M], +M[_]] = sbt.internal.util.KCons[H, T, M] + type KList[+M[_]] = sbt.internal.util.KList[M] + val KNil = sbt.internal.util.KNil + type KNil = sbt.internal.util.KNil + val LinePosition = sbt.internal.util.LinePosition + type LinePosition = sbt.internal.util.LinePosition + val LineRange = sbt.internal.util.LineRange + type LineRange = sbt.internal.util.LineRange + type LineReader = sbt.internal.util.LineReader + val LoggerWriter = sbt.internal.util.LoggerWriter + type LoggerWriter = sbt.internal.util.LoggerWriter + val MainLogging = sbt.internal.util.MainLogging + type MessageOnlyException = sbt.internal.util.MessageOnlyException + type ModifiedFileInfo = sbt.internal.util.ModifiedFileInfo + type MultiLogger = sbt.internal.util.MultiLogger + val MultiLoggerConfig = sbt.internal.util.MultiLoggerConfig + type MultiLoggerConfig = sbt.internal.util.MultiLoggerConfig + type NewLine = sbt.internal.util.NewLine + val NoPosition = sbt.internal.util.NoPosition + type Output = sbt.internal.util.Output + val PMap = sbt.internal.util.PMap + type PMap[K[_], V[_]] = sbt.internal.util.PMap[K, V] + val Param = sbt.internal.util.Param + type Param[A[_], B[_]] = sbt.internal.util.Param[A, B] + type PlainFileInfo = sbt.internal.util.PlainFileInfo + type RMap[K[_], V[_]] = sbt.internal.util.RMap[K, V] + val RangePosition = sbt.internal.util.RangePosition + type RangePosition = sbt.internal.util.RangePosition + type RecordingLogger = sbt.internal.util.RecordingLogger + val Relation = sbt.internal.util.Relation + type Relation[A, B] = sbt.internal.util.Relation[A, B] + type SBinaryFormats = sbt.internal.util.SBinaryFormats + val ScalaKeywords = sbt.internal.util.ScalaKeywords + type Settings[Scope] = sbt.internal.util.Settings[Scope] + type SharedAttributeKey[T] = sbt.internal.util.SharedAttributeKey[T] + val Show = sbt.internal.util.Show + type Show[T] = sbt.internal.util.Show[T] + val ShowLines = sbt.internal.util.ShowLines + type ShowLines[A] = sbt.internal.util.ShowLines[A] + val Signals = sbt.internal.util.Signals + val SimpleReader = sbt.internal.util.SimpleReader + type SimpleReader = sbt.internal.util.SimpleReader + type SourcePosition = sbt.internal.util.SourcePosition + val StackTrace = sbt.internal.util.StackTrace + type SuppressedTraceContext = sbt.internal.util.SuppressedTraceContext + type Timestamp = sbt.internal.util.Timestamp + type ToLog = sbt.internal.util.ToLog + val Tracked = sbt.internal.util.Tracked + type Tracked = sbt.internal.util.Tracked + type TranslatedException = sbt.internal.util.TranslatedException + type TranslatedIOException = sbt.internal.util.TranslatedIOException + val TypeFunctions = sbt.internal.util.TypeFunctions + type TypeFunctions = sbt.internal.util.TypeFunctions + val Types = sbt.internal.util.Types + type Types = sbt.internal.util.Types + type UnionImplicits = sbt.internal.util.UnionImplicits + type UnprintableException = sbt.internal.util.UnprintableException + val Util = sbt.internal.util.Util + val ~> = sbt.internal.util.~> + type ~>[-K[_], +V[_]] = sbt.internal.util.~>[K, V] + + + // sbt.internal.util.complete + object complete { + val Completion = sbt.internal.util.complete.Completion + type Completion = sbt.internal.util.complete.Completion + val Completions = sbt.internal.util.complete.Completions + type Completions = sbt.internal.util.complete.Completions + val DefaultParsers = sbt.internal.util.complete.DefaultParsers + type DisplayOnly = sbt.internal.util.complete.DisplayOnly + val EditDistance = sbt.internal.util.complete.EditDistance + type ExampleSource = sbt.internal.util.complete.ExampleSource + val FileExamples = sbt.internal.util.complete.FileExamples + type FileExamples = sbt.internal.util.complete.FileExamples + val Finite = sbt.internal.util.complete.Finite + type Finite = sbt.internal.util.complete.Finite + val FixedSetExamples = sbt.internal.util.complete.FixedSetExamples + type FixedSetExamples = sbt.internal.util.complete.FixedSetExamples + val History = sbt.internal.util.complete.History + val HistoryCommands = sbt.internal.util.complete.HistoryCommands + val Infinite = sbt.internal.util.complete.Infinite + val JLineCompletion = sbt.internal.util.complete.JLineCompletion + val Parser = sbt.internal.util.complete.Parser + type Parser[+T] = sbt.internal.util.complete.Parser[T] + type ParserMain = sbt.internal.util.complete.ParserMain + val Parsers = sbt.internal.util.complete.Parsers + type Parsers = sbt.internal.util.complete.Parsers + val ProcessError = sbt.internal.util.complete.ProcessError + type Suggestion = sbt.internal.util.complete.Suggestion + type Token = sbt.internal.util.complete.Token + val TokenCompletions = sbt.internal.util.complete.TokenCompletions + type TokenCompletions = sbt.internal.util.complete.TokenCompletions + val TypeString = sbt.internal.util.complete.TypeString + type TypeString = sbt.internal.util.complete.TypeString + val UpperBound = sbt.internal.util.complete.UpperBound + type UpperBound = sbt.internal.util.complete.UpperBound + } + + // sbt.internal.util.appmacro + object appmacro { + import scala.reflect._ + import macros._ + + type BuilderResult[C <: Context with Singleton] = sbt.internal.util.appmacro.BuilderResult[C] + val ContextUtil = sbt.internal.util.appmacro.ContextUtil + type ContextUtil[C <: Context] = sbt.internal.util.appmacro.ContextUtil[C] + type Convert = sbt.internal.util.appmacro.Convert + val Converted = sbt.internal.util.appmacro.Converted + type Converted[C <: Context with Singleton] = sbt.internal.util.appmacro.Converted[C] + val Instance = sbt.internal.util.appmacro.Instance + type Instance = sbt.internal.util.appmacro.Instance + val KListBuilder = sbt.internal.util.appmacro.KListBuilder + val MixedBuilder = sbt.internal.util.appmacro.MixedBuilder + type MonadInstance = sbt.internal.util.appmacro.MonadInstance + type TupleBuilder = sbt.internal.util.appmacro.TupleBuilder + val TupleNBuilder = sbt.internal.util.appmacro.TupleNBuilder + } + + // sbt.internal.util.logic + object logic { + val Atom = sbt.internal.util.logic.Atom + type Atom = sbt.internal.util.logic.Atom + val Clause = sbt.internal.util.logic.Clause + type Clause = sbt.internal.util.logic.Clause + val Clauses = sbt.internal.util.logic.Clauses + type Clauses = sbt.internal.util.logic.Clauses + val Formula = sbt.internal.util.logic.Formula + type Formula = sbt.internal.util.logic.Formula + type Literal = sbt.internal.util.logic.Literal + val Logic = sbt.internal.util.logic.Logic + val Negated = sbt.internal.util.logic.Negated + type Negated = sbt.internal.util.logic.Negated + } + + // sbt.librarymanagement + val Artifact = sbt.librarymanagement.Artifact + type Artifact = sbt.librarymanagement.Artifact + val Caller = sbt.librarymanagement.Caller + type Caller = sbt.librarymanagement.Caller + val ChainedResolver = sbt.librarymanagement.ChainedResolver + type ChainedResolver = sbt.librarymanagement.ChainedResolver + val CircularDependencyLevel = sbt.librarymanagement.CircularDependencyLevel + type CircularDependencyLevel = sbt.librarymanagement.CircularDependencyLevel + val Configuration = sbt.librarymanagement.Configuration + type Configuration = sbt.librarymanagement.Configuration + val ConfigurationReport = sbt.librarymanagement.ConfigurationReport + type ConfigurationReport = sbt.librarymanagement.ConfigurationReport + val Configurations = sbt.librarymanagement.Configurations + val ConflictManager = sbt.librarymanagement.ConflictManager + type ConflictManager = sbt.librarymanagement.ConflictManager + val ConflictWarning = sbt.librarymanagement.ConflictWarning + type ConflictWarning = sbt.librarymanagement.ConflictWarning + val Credentials = sbt.librarymanagement.Credentials + type Credentials = sbt.librarymanagement.Credentials + val CrossVersion = sbt.librarymanagement.CrossVersion + type CrossVersion = sbt.librarymanagement.CrossVersion + val DefaultMavenRepository = sbt.librarymanagement.DefaultMavenRepository + val Developer = sbt.librarymanagement.Developer + type Developer = sbt.librarymanagement.Developer + type DirectCredentials = sbt.librarymanagement.DirectCredentials + val EvictionPair = sbt.librarymanagement.EvictionPair + type EvictionPair = sbt.librarymanagement.EvictionPair + val EvictionWarning = sbt.librarymanagement.EvictionWarning + type EvictionWarning = sbt.librarymanagement.EvictionWarning + val EvictionWarningOptions = sbt.librarymanagement.EvictionWarningOptions + type EvictionWarningOptions = sbt.librarymanagement.EvictionWarningOptions + val ExclusionRule = sbt.librarymanagement.ExclusionRule + type ExclusionRule = sbt.librarymanagement.ExclusionRule + type FileCredentials = sbt.librarymanagement.FileCredentials + val FileRepository = sbt.librarymanagement.FileRepository + type FileRepository = sbt.librarymanagement.FileRepository + val IvyScala = sbt.librarymanagement.IvyScala + type IvyScala = sbt.librarymanagement.IvyScala + val JCenterRepository = sbt.librarymanagement.JCenterRepository + val JavaNet1Repository = sbt.librarymanagement.JavaNet1Repository + type JavaNet1Repository = sbt.librarymanagement.JavaNet1Repository + val JavaNet2Repository = sbt.librarymanagement.JavaNet2Repository + val MavenCache = sbt.librarymanagement.MavenCache + type MavenCache = sbt.librarymanagement.MavenCache + val MavenRepository = sbt.librarymanagement.MavenRepository + type MavenRepository = sbt.librarymanagement.MavenRepository + val ModuleConfiguration = sbt.librarymanagement.ModuleConfiguration + type ModuleConfiguration = sbt.librarymanagement.ModuleConfiguration + val ModuleID = sbt.librarymanagement.ModuleID + type ModuleID = sbt.librarymanagement.ModuleID + val ModuleInfo = sbt.librarymanagement.ModuleInfo + type ModuleInfo = sbt.librarymanagement.ModuleInfo + val ModuleReport = sbt.librarymanagement.ModuleReport + type ModuleReport = sbt.librarymanagement.ModuleReport + val OrganizationArtifactReport = sbt.librarymanagement.OrganizationArtifactReport + type OrganizationArtifactReport = sbt.librarymanagement.OrganizationArtifactReport + val Patterns = sbt.librarymanagement.Patterns + type Patterns = sbt.librarymanagement.Patterns + type PatternsBasedRepository = sbt.librarymanagement.PatternsBasedRepository + type RawRepository = sbt.librarymanagement.RawRepository + val RepositoryHelpers = sbt.librarymanagement.RepositoryHelpers + val Resolver = sbt.librarymanagement.Resolver + type Resolver = sbt.librarymanagement.Resolver + val SbtArtifacts = sbt.librarymanagement.SbtArtifacts + val ScalaArtifacts = sbt.librarymanagement.ScalaArtifacts + val ScalaVersion = sbt.librarymanagement.ScalaVersion + type ScalaVersion = sbt.librarymanagement.ScalaVersion + val ScmInfo = sbt.librarymanagement.ScmInfo + type ScmInfo = sbt.librarymanagement.ScmInfo + val SftpRepository = sbt.librarymanagement.SftpRepository + type SftpRepository = sbt.librarymanagement.SftpRepository + type SshBasedRepository = sbt.librarymanagement.SshBasedRepository + val SshRepository = sbt.librarymanagement.SshRepository + type SshRepository = sbt.librarymanagement.SshRepository + val URLRepository = sbt.librarymanagement.URLRepository + type URLRepository = sbt.librarymanagement.URLRepository + val UpdateOptions = sbt.librarymanagement.UpdateOptions + type UpdateOptions = sbt.librarymanagement.UpdateOptions + val UpdateReport = sbt.librarymanagement.UpdateReport + type UpdateReport = sbt.librarymanagement.UpdateReport + val UpdateStats = sbt.librarymanagement.UpdateStats + type UpdateStats = sbt.librarymanagement.UpdateStats + val VersionNumber = sbt.librarymanagement.VersionNumber + type VersionNumber = sbt.librarymanagement.VersionNumber + type VersionNumberCompatibility = sbt.librarymanagement.VersionNumberCompatibility + + // sbt.internal.librarymanagement + type ArtifactFilter = sbt.internal.librarymanagement.ArtifactFilter + val ComponentManager = sbt.internal.librarymanagement.ComponentManager + type ComponentManager = sbt.internal.librarymanagement.ComponentManager + type ConfigurationFilter = sbt.internal.librarymanagement.ConfigurationFilter + val ConfigurationReportLite = sbt.internal.librarymanagement.ConfigurationReportLite + type ConfigurationReportLite = sbt.internal.librarymanagement.ConfigurationReportLite + val ConvertResolver = sbt.internal.librarymanagement.ConvertResolver + val CustomPomParser = sbt.internal.librarymanagement.CustomPomParser + type CustomPomParser = sbt.internal.librarymanagement.CustomPomParser + val CustomXmlParser = sbt.internal.librarymanagement.CustomXmlParser + type DeliverConfiguration = sbt.internal.librarymanagement.DeliverConfiguration + val DependencyFilter = sbt.internal.librarymanagement.DependencyFilter + type DependencyFilter = sbt.internal.librarymanagement.DependencyFilter + type DependencyFilterExtra = sbt.internal.librarymanagement.DependencyFilterExtra + val EmptyConfiguration = sbt.internal.librarymanagement.EmptyConfiguration + type EmptyConfiguration = sbt.internal.librarymanagement.EmptyConfiguration + val ExternalIvyConfiguration = sbt.internal.librarymanagement.ExternalIvyConfiguration + type ExternalIvyConfiguration = sbt.internal.librarymanagement.ExternalIvyConfiguration + val GetClassifiersConfiguration = sbt.internal.librarymanagement.GetClassifiersConfiguration + type GetClassifiersConfiguration = sbt.internal.librarymanagement.GetClassifiersConfiguration + val GetClassifiersModule = sbt.internal.librarymanagement.GetClassifiersModule + type GetClassifiersModule = sbt.internal.librarymanagement.GetClassifiersModule + val IfMissing = sbt.internal.librarymanagement.IfMissing + type IfMissing = sbt.internal.librarymanagement.IfMissing + val InlineConfiguration = sbt.internal.librarymanagement.InlineConfiguration + type InlineConfiguration = sbt.internal.librarymanagement.InlineConfiguration + val InlineConfigurationWithExcludes = sbt.internal.librarymanagement.InlineConfigurationWithExcludes + type InlineConfigurationWithExcludes = sbt.internal.librarymanagement.InlineConfigurationWithExcludes + type InlineIvyConfiguration = sbt.internal.librarymanagement.InlineIvyConfiguration + type InvalidComponent = sbt.internal.librarymanagement.InvalidComponent + val IvyActions = sbt.internal.librarymanagement.IvyActions + type IvyCache = sbt.internal.librarymanagement.IvyCache + val IvyConfiguration = sbt.internal.librarymanagement.IvyConfiguration + type IvyConfiguration = sbt.internal.librarymanagement.IvyConfiguration + val IvyFileConfiguration = sbt.internal.librarymanagement.IvyFileConfiguration + type IvyFileConfiguration = sbt.internal.librarymanagement.IvyFileConfiguration + type IvyPaths = sbt.internal.librarymanagement.IvyPaths + val IvyRetrieve = sbt.internal.librarymanagement.IvyRetrieve + val IvySbt = sbt.internal.librarymanagement.IvySbt + type IvySbt = sbt.internal.librarymanagement.IvySbt + val IvyUtil = sbt.internal.librarymanagement.IvyUtil + val JsonUtil = sbt.internal.librarymanagement.JsonUtil + val LogicalClock = sbt.internal.librarymanagement.LogicalClock + type LogicalClock = sbt.internal.librarymanagement.LogicalClock + val MakePom = sbt.internal.librarymanagement.MakePom + type MakePom = sbt.internal.librarymanagement.MakePom + val MakePomConfiguration = sbt.internal.librarymanagement.MakePomConfiguration + type MakePomConfiguration = sbt.internal.librarymanagement.MakePomConfiguration + type ModuleFilter = sbt.internal.librarymanagement.ModuleFilter + val ModuleSettings = sbt.internal.librarymanagement.ModuleSettings + type ModuleSettings = sbt.internal.librarymanagement.ModuleSettings + type NotInCache = sbt.internal.librarymanagement.NotInCache + val PomConfiguration = sbt.internal.librarymanagement.PomConfiguration + type PomConfiguration = sbt.internal.librarymanagement.PomConfiguration + val ProjectResolver = sbt.internal.librarymanagement.ProjectResolver + type ProjectResolver = sbt.internal.librarymanagement.ProjectResolver + type PublishConfiguration = sbt.internal.librarymanagement.PublishConfiguration + val ResolutionCache = sbt.internal.librarymanagement.ResolutionCache + type ResolutionCache = sbt.internal.librarymanagement.ResolutionCache + type ResolveException = sbt.internal.librarymanagement.ResolveException + type ResolverAdapter = sbt.internal.librarymanagement.ResolverAdapter + type RetrieveConfiguration = sbt.internal.librarymanagement.RetrieveConfiguration + val SbtExclusionRule = sbt.internal.librarymanagement.SbtExclusionRule + type SbtExclusionRule = sbt.internal.librarymanagement.SbtExclusionRule + val StringUtilities = sbt.internal.librarymanagement.StringUtilities + val UnresolvedWarning = sbt.internal.librarymanagement.UnresolvedWarning + type UnresolvedWarning = sbt.internal.librarymanagement.UnresolvedWarning + val UnresolvedWarningConfiguration = sbt.internal.librarymanagement.UnresolvedWarningConfiguration + type UnresolvedWarningConfiguration = sbt.internal.librarymanagement.UnresolvedWarningConfiguration + type UpdateConfiguration = sbt.internal.librarymanagement.UpdateConfiguration + val UpdateLogging = sbt.internal.librarymanagement.UpdateLogging + val UpdateReportLite = sbt.internal.librarymanagement.UpdateReportLite + type UpdateReportLite = sbt.internal.librarymanagement.UpdateReportLite +} diff --git a/sbt/src/sbt-test/actions/aggregate/project/Marker.scala b/sbt/src/sbt-test/actions/aggregate/project/Marker.scala index b1d0580df..b142c4576 100644 --- a/sbt/src/sbt-test/actions/aggregate/project/Marker.scala +++ b/sbt/src/sbt-test/actions/aggregate/project/Marker.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ import Project.Initialize trait Marker @@ -14,4 +15,4 @@ trait Marker else IO touch toMark } -} \ No newline at end of file +} diff --git a/sbt/src/sbt-test/actions/eval-is-safe-and-sound/build.sbt b/sbt/src/sbt-test/actions/eval-is-safe-and-sound/build.sbt index 387b24f5d..9fd0eaaea 100644 --- a/sbt/src/sbt-test/actions/eval-is-safe-and-sound/build.sbt +++ b/sbt/src/sbt-test/actions/eval-is-safe-and-sound/build.sbt @@ -19,7 +19,7 @@ configClassCountFile := (target.value / "config-count") numConfigClasses := { val cdir = (baseDirectory in ThisBuild).value / "project/target/config-classes" - (cdir.*** --- cdir).get.length + (cdir.allPaths --- cdir).get.length } saveNumConfigClasses := { @@ -46,4 +46,4 @@ checkNumConfigClasses := { val previous = previousConfigCount.value val current = numConfigClasses.value assert(previous == current, s"Failed to delete extra configuration classes. Expected: $previous, Found: $current") -} \ No newline at end of file +} diff --git a/sbt/src/sbt-test/actions/update-state-fail/project/Build.scala b/sbt/src/sbt-test/actions/update-state-fail/project/Build.scala index cb1845874..5ded4bb08 100644 --- a/sbt/src/sbt-test/actions/update-state-fail/project/Build.scala +++ b/sbt/src/sbt-test/actions/update-state-fail/project/Build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object TestBuild extends Build { diff --git a/sbt/src/sbt-test/api/show-circular-structure/build.sbt b/sbt/src/sbt-test/api/show-circular-structure/build.sbt index 03fb631e4..edcfebfd3 100644 --- a/sbt/src/sbt-test/api/show-circular-structure/build.sbt +++ b/sbt/src/sbt-test/api/show-circular-structure/build.sbt @@ -1,6 +1,6 @@ logLevel := Level.Debug -incOptions ~= { _.copy(apiDebug = true) } +incOptions ~= { _.withApiDebug(true) } TaskKey[Unit]("show-apis") <<= (compile in Compile, scalaSource in Compile, javaSource in Compile) map { (a: sbt.inc.Analysis, scalaSrc: java.io.File, javaSrc: java.io.File) => val aApi = a.apis.internalAPI(scalaSrc / "A.scala").api diff --git a/sbt/src/sbt-test/dependency-management/artifact/project/ArtifactTest.scala b/sbt/src/sbt-test/dependency-management/artifact/project/ArtifactTest.scala index 6f28d3e7e..052409fd0 100644 --- a/sbt/src/sbt-test/dependency-management/artifact/project/ArtifactTest.scala +++ b/sbt/src/sbt-test/dependency-management/artifact/project/ArtifactTest.scala @@ -1,4 +1,5 @@ import sbt._ + import Import._ import Keys._ object ArtifactTest extends Build diff --git a/sbt/src/sbt-test/dependency-management/exclude-transitive/project/TestProject.scala b/sbt/src/sbt-test/dependency-management/exclude-transitive/project/TestProject.scala index 7e2796e5b..9abda8694 100644 --- a/sbt/src/sbt-test/dependency-management/exclude-transitive/project/TestProject.scala +++ b/sbt/src/sbt-test/dependency-management/exclude-transitive/project/TestProject.scala @@ -1,4 +1,5 @@ import sbt._ + import Import._ import Keys._ object TestProject extends Build diff --git a/sbt/src/sbt-test/dependency-management/force/project/TestProject.scala b/sbt/src/sbt-test/dependency-management/force/project/TestProject.scala index 8a6bc5d1a..e914f17af 100755 --- a/sbt/src/sbt-test/dependency-management/force/project/TestProject.scala +++ b/sbt/src/sbt-test/dependency-management/force/project/TestProject.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ import Keys._ object TestProject extends Build diff --git a/sbt/src/sbt-test/dependency-management/info/project/InfoTest.scala b/sbt/src/sbt-test/dependency-management/info/project/InfoTest.scala index 0410bfca5..504dc23b0 100644 --- a/sbt/src/sbt-test/dependency-management/info/project/InfoTest.scala +++ b/sbt/src/sbt-test/dependency-management/info/project/InfoTest.scala @@ -1,4 +1,5 @@ import sbt._ + import Import._ import Keys._ import scala.xml._ @@ -39,4 +40,4 @@ object InfoTest extends Build if( deliveredWithCustom(d) ) sys.error("Expected empty 'info' tag, got: \n" + (d \ "info")) else () } def deliveredWithCustom(d: NodeSeq) = (d \ "info" \ "license").nonEmpty && (d \ "info" \ "description").nonEmpty -} \ No newline at end of file +} diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-c/project/P.scala b/sbt/src/sbt-test/dependency-management/ivy-settings-c/project/P.scala index d3c93919f..51886d8b4 100644 --- a/sbt/src/sbt-test/dependency-management/ivy-settings-c/project/P.scala +++ b/sbt/src/sbt-test/dependency-management/ivy-settings-c/project/P.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ import Keys._ object B extends Build @@ -29,4 +30,4 @@ object B extends Build publishArtifact in packageDoc := false, publishMavenStyle := false ) -} \ No newline at end of file +} diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/project/P.scala b/sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/project/P.scala index a12c276fe..eafbc6c90 100644 --- a/sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/project/P.scala +++ b/sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/project/P.scala @@ -13,6 +13,6 @@ object B extends Build ) lazy val baseSettings = Seq( autoScalaLibrary := false, - unmanagedJars in Compile <++= scalaInstance map (_.jars) + unmanagedJars in Compile <++= scalaInstance map (_.allJars.toSeq) ) } diff --git a/sbt/src/sbt-test/dependency-management/make-pom/project/MakePomTest.scala b/sbt/src/sbt-test/dependency-management/make-pom/project/MakePomTest.scala index b355e107b..3309a4b16 100644 --- a/sbt/src/sbt-test/dependency-management/make-pom/project/MakePomTest.scala +++ b/sbt/src/sbt-test/dependency-management/make-pom/project/MakePomTest.scala @@ -1,4 +1,5 @@ import sbt.{Node =>_,_} + import Import._ import Keys._ import scala.xml._ @@ -73,4 +74,4 @@ object MakePomTest extends Build if(base.endsWith("/")) base else (base + "/") } def normalize(repo: MavenRepository): MavenRepository = new MavenRepository(repo.name, normalize(repo.root)) -} \ No newline at end of file +} diff --git a/sbt/src/sbt-test/dependency-management/pom-advanced/project/PomRepoTest.scala b/sbt/src/sbt-test/dependency-management/pom-advanced/project/PomRepoTest.scala index 7ad54e069..f2d303be4 100644 --- a/sbt/src/sbt-test/dependency-management/pom-advanced/project/PomRepoTest.scala +++ b/sbt/src/sbt-test/dependency-management/pom-advanced/project/PomRepoTest.scala @@ -1,4 +1,5 @@ import sbt._ + import Import._ import Keys._ import complete.DefaultParsers._ @@ -34,4 +35,4 @@ object PomRepoTest extends Build extracted.find { e => !expected.exists(_.accept(e.root)) } map { "Repository should not be exported: " + _ } orElse (expected.find { e => !extracted.exists(r => e.accept(r.root)) } map { "Repository should be exported: " + _ } ) foreach error } -} \ No newline at end of file +} diff --git a/sbt/src/sbt-test/dependency-management/pom-classpaths/project/Build.scala b/sbt/src/sbt-test/dependency-management/pom-classpaths/project/Build.scala index 70ec59ae6..c8633ba71 100644 --- a/sbt/src/sbt-test/dependency-management/pom-classpaths/project/Build.scala +++ b/sbt/src/sbt-test/dependency-management/pom-classpaths/project/Build.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ import Keys._ import complete._ import complete.DefaultParsers._ @@ -34,4 +35,4 @@ object MyBuild extends Build () } def seqStr(s: Seq[_]) = s.mkString("\n\t", "\n\t", "\n") -} \ No newline at end of file +} diff --git a/sbt/src/sbt-test/dependency-management/provided/project/TestProject.scala b/sbt/src/sbt-test/dependency-management/provided/project/TestProject.scala index 036a39d27..bdff38488 100644 --- a/sbt/src/sbt-test/dependency-management/provided/project/TestProject.scala +++ b/sbt/src/sbt-test/dependency-management/provided/project/TestProject.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ import Keys._ import complete.DefaultParsers._ @@ -31,4 +32,4 @@ object TestProject extends Build else servletAPI.foreach(s => sys.error(s + " incorrectly included in " + label + ".")) } -} \ No newline at end of file +} diff --git a/sbt/src/sbt-test/dependency-management/publish-local/changes/RetrieveTest.scala b/sbt/src/sbt-test/dependency-management/publish-local/changes/RetrieveTest.scala index ef00824ef..b166ce7a9 100644 --- a/sbt/src/sbt-test/dependency-management/publish-local/changes/RetrieveTest.scala +++ b/sbt/src/sbt-test/dependency-management/publish-local/changes/RetrieveTest.scala @@ -1,4 +1,5 @@ import sbt._ + import Import._ import Keys._ object MultiPublishTest extends Build diff --git a/sbt/src/sbt-test/dependency-management/publish-local/project/MultiPublishTest.scala b/sbt/src/sbt-test/dependency-management/publish-local/project/MultiPublishTest.scala index d67beeb38..94c4c8ad2 100644 --- a/sbt/src/sbt-test/dependency-management/publish-local/project/MultiPublishTest.scala +++ b/sbt/src/sbt-test/dependency-management/publish-local/project/MultiPublishTest.scala @@ -1,4 +1,5 @@ import sbt._ + import Import._ import Keys._ object MultiPublishTest extends Build @@ -18,4 +19,4 @@ object MultiPublishTest extends Build def interProject = projectDependencies <<= (publishMavenStyle, publishMavenStyle in sub, projectDependencies) map { (style, subStyle, pd) => if(style == subStyle) pd else Nil } -} \ No newline at end of file +} diff --git a/sbt/src/sbt-test/dependency-management/sources/project/Test.scala b/sbt/src/sbt-test/dependency-management/sources/project/Test.scala index 30b4035b6..11b463829 100644 --- a/sbt/src/sbt-test/dependency-management/sources/project/Test.scala +++ b/sbt/src/sbt-test/dependency-management/sources/project/Test.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ import Keys._ object Test extends Build @@ -28,4 +29,4 @@ object Test extends Build val srcs = getSources(report) if(srcs.nonEmpty) sys.error("Sources retrieved:\n\t" + srcs.mkString("\n\t")) else () } -} \ No newline at end of file +} diff --git a/sbt/src/sbt-test/dependency-management/url/project/TestProject.scala b/sbt/src/sbt-test/dependency-management/url/project/TestProject.scala index 5613b3b3b..e30eb8ef7 100644 --- a/sbt/src/sbt-test/dependency-management/url/project/TestProject.scala +++ b/sbt/src/sbt-test/dependency-management/url/project/TestProject.scala @@ -1,4 +1,5 @@ import sbt._ + import Import._ import Keys._ import classpath.ClasspathUtilities @@ -24,4 +25,4 @@ object TestProject extends Build case _: ClassNotFoundException => sys.error("Dependency not downloaded.") } } -} \ No newline at end of file +} diff --git a/sbt/src/sbt-test/project/auto-plugins/project/A.scala b/sbt/src/sbt-test/project/auto-plugins/project/A.scala index f28b8bec8..3121216c5 100644 --- a/sbt/src/sbt-test/project/auto-plugins/project/A.scala +++ b/sbt/src/sbt-test/project/auto-plugins/project/A.scala @@ -44,4 +44,4 @@ object TopC extends AutoPlugin { lazy val topLevelKeyTest = settingKey[String]("A top level setting declared in a plugin.") } -} \ No newline at end of file +} diff --git a/sbt/src/sbt-test/project/auto-plugins/project/Q.scala b/sbt/src/sbt-test/project/auto-plugins/project/Q.scala index b607b170b..bc3461b14 100644 --- a/sbt/src/sbt-test/project/auto-plugins/project/Q.scala +++ b/sbt/src/sbt-test/project/auto-plugins/project/Q.scala @@ -1,6 +1,7 @@ package sbttest // you need package http://stackoverflow.com/questions/9822008/ import sbt._ + import Import._ import sbt.Keys.{name, resolvedScoped, organization } import java.util.concurrent.atomic.{AtomicInteger => AInt} diff --git a/sbt/src/sbt-test/project/delegate_config/project/Build.scala b/sbt/src/sbt-test/project/delegate_config/project/Build.scala index 25318261b..2dacae404 100644 --- a/sbt/src/sbt-test/project/delegate_config/project/Build.scala +++ b/sbt/src/sbt-test/project/delegate_config/project/Build.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ import complete.DefaultParsers._ import Keys._ import AddSettings._ diff --git a/sbt/src/sbt-test/project/delegates/project/Build.scala b/sbt/src/sbt-test/project/delegates/project/Build.scala index db87308aa..75bf40e42 100644 --- a/sbt/src/sbt-test/project/delegates/project/Build.scala +++ b/sbt/src/sbt-test/project/delegates/project/Build.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ import complete.DefaultParsers._ import Keys._ diff --git a/sbt/src/sbt-test/project/external-conflict/changes/Build.scala b/sbt/src/sbt-test/project/external-conflict/changes/Build.scala index 1838b971a..576964d51 100644 --- a/sbt/src/sbt-test/project/external-conflict/changes/Build.scala +++ b/sbt/src/sbt-test/project/external-conflict/changes/Build.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ import Keys._ object B extends Build diff --git a/sbt/src/sbt-test/project/flatten/project/Flat.scala b/sbt/src/sbt-test/project/flatten/project/Flat.scala index 1613ac0ef..f65bc8b0f 100644 --- a/sbt/src/sbt-test/project/flatten/project/Flat.scala +++ b/sbt/src/sbt-test/project/flatten/project/Flat.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ import Keys._ import Configurations.{Compile, Test} diff --git a/sbt/src/sbt-test/project/global-plugin/changes/Build.scala b/sbt/src/sbt-test/project/global-plugin/changes/Build.scala index d9c1611d5..13ba8e7af 100644 --- a/sbt/src/sbt-test/project/global-plugin/changes/Build.scala +++ b/sbt/src/sbt-test/project/global-plugin/changes/Build.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ import sbt.Keys._ object MyBuild extends Build { diff --git a/sbt/src/sbt-test/project/provided/project/P.scala b/sbt/src/sbt-test/project/provided/project/P.scala index 2c96f8a66..a59b7658e 100644 --- a/sbt/src/sbt-test/project/provided/project/P.scala +++ b/sbt/src/sbt-test/project/provided/project/P.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ import Keys._ object P extends Build @@ -29,4 +30,4 @@ object P extends Build case (Some(x), true) => throw x } } -} \ No newline at end of file +} diff --git a/sbt/src/sbt-test/project/transitive-plugins/project/Build.scala b/sbt/src/sbt-test/project/transitive-plugins/project/Build.scala index 8de8f8268..ba8a27023 100644 --- a/sbt/src/sbt-test/project/transitive-plugins/project/Build.scala +++ b/sbt/src/sbt-test/project/transitive-plugins/project/Build.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ import Keys._ object Build extends Build @@ -15,4 +16,4 @@ object Build extends Build }, resolvers += Resolver.typesafeIvyRepo("releases") // not sure why this isn't included by default ) -} \ No newline at end of file +} diff --git a/sbt/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt b/sbt/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt index d24e304b1..b6deda492 100644 --- a/sbt/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt +++ b/sbt/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt @@ -6,7 +6,7 @@ incOptions := incOptions.value.withNameHashing(true) // some fraction (e.g. 50%) of files is scheduled to be recompiled // in this test we want precise information about recompiled files // which that heuristic would distort -incOptions := incOptions.value.copy(recompileAllFraction = 1.0) +incOptions := incOptions.value.withRecompileAllFraction(1.0) /* Performs checks related to compilations: * a) checks in which compilation given set of files was recompiled diff --git a/sbt/src/sbt-test/source-dependencies/typeref-only/build.sbt b/sbt/src/sbt-test/source-dependencies/typeref-only/build.sbt index 02813797f..6ed67b1ca 100644 --- a/sbt/src/sbt-test/source-dependencies/typeref-only/build.sbt +++ b/sbt/src/sbt-test/source-dependencies/typeref-only/build.sbt @@ -2,4 +2,4 @@ logLevel := Level.Debug // disable recompile all which causes full recompile which // makes it more difficult to test dependency tracking -incOptions ~= { _.copy(recompileAllFraction = 1.0) } +incOptions ~= { _.withRecompileAllFraction(1.0) }