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

Bump to ZInc 1.0.0-X12

This commit is contained in:
Eugene Yokota 2017-04-13 00:22:12 -04:00
parent 95da5bafc2
commit 81642138e1
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/main/scala/sbt/Defaults.scala
View File

@ -15,8 +15,6 @@ import sbt.internal.CommandStrings.ExportStream
import sbt.internal.io.WatchState
import sbt.internal.librarymanagement._
import sbt.internal.librarymanagement.mavenint.{ PomExtraDependencyAttributes, SbtPomExtraProperties }
import sbt.internal.librarymanagement.syntax._
import sbt.internal.librarymanagement.{ CustomPomParser, DependencyFilter }
import sbt.internal.testing.TestLogger
import sbt.internal.util._
import sbt.internal.util.Attributed.data
@ -29,7 +27,7 @@ import sbt.librarymanagement.Artifact.{ DocClassifier, SourceClassifier }
import sbt.librarymanagement.Configurations.{ Compile, CompilerPlugin, IntegrationTest, names, Provided, Runtime, Test }
import sbt.librarymanagement.CrossVersion.{ binarySbtVersion, binaryScalaVersion, partialVersion }
import sbt.librarymanagement.{ `package` => _, _ }
import sbt.librarymanagement.{ Configuration, Configurations, ConflictManager, CrossVersion, MavenRepository, Resolver, ScalaArtifacts, UpdateOptions }
import sbt.librarymanagement.syntax._
import sbt.util.InterfaceUtil.{ f1, o2m }
import sbt.util.{ Level, Logger, ShowLines }
import scala.concurrent.duration.FiniteDuration

8
project/Dependencies.scala
View File

@ -11,10 +11,10 @@ object Dependencies {
val baseScalaVersion = scala212
// sbt modules
private val ioVersion = "1.0.0-M9"
private val utilVersion = "1.0.0-M21"
private val lmVersion = "1.0.0-X7"
private val zincVersion = "1.0.0-X11"
private val ioVersion = "1.0.0-M11"
private val utilVersion = "1.0.0-M22"
private val lmVersion = "1.0.0-X8"
private val zincVersion = "1.0.0-X12"
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion

2
sbt/src/main/scala/package.scala
View File

@ -6,7 +6,7 @@ package object sbt extends sbt.IOSyntax0
with sbt.internal.util.Types
with sbt.internal.librarymanagement.impl.DependencyBuilders
with sbt.ProjectExtra
with sbt.internal.librarymanagement.DependencyFilterExtra
with sbt.librarymanagement.DependencyFilterExtra
with sbt.BuildExtra
with sbt.TaskMacroExtra
with sbt.ScopeFilter.Make