mirror of https://github.com/sbt/sbt.git
move to 2.9.1 (RC3), bump to 0.11.0-SNAPSHOT
This commit is contained in:
Mark Harrah
parent
19f4b423e1
commit
b36e40a8f7
14
README.md
14
README.md
|
|
@ -4,9 +4,9 @@
|
|||
[Setup]: https://github.com/harrah/xsbt/wiki/Setup
|
||||
[video of a demo]: http://vimeo.com/20263617
|
||||
|
||||
# sbt 0.10
|
||||
# sbt 0.11
|
||||
|
||||
This is the 0.10.x series of sbt. See [Setup] for getting started with the latest binary release or see below to build from source.
|
||||
This is the 0.11.x series of sbt. See [Setup] for getting started with the latest binary release or see below to build from source.
|
||||
|
||||
The previous stable release of sbt was 0.7.7, which was hosted on [Google Code].
|
||||
|
||||
|
|
@ -14,13 +14,13 @@ There is a [video of a demo] given at the [Northeast Scala Symposium] that gives
|
|||
|
||||
# Build from source
|
||||
|
||||
1. Install the current stable binary release of sbt 0.10.x (see [Setup]), which will be used to build sbt from source.
|
||||
1. Install the current stable binary release of sbt (see [Setup]), which will be used to build sbt from source.
|
||||
2. Get the source code.
|
||||
|
||||
$ git clone git://github.com/harrah/xsbt.git
|
||||
$ cd xsbt
|
||||
|
||||
3. The initial branch is the development branch 0.10, which contains the latest code for the 0.10.x series. To build a specific release or commit, switch to the associated tag. The tag for the latest 0.10.x release is v0.10.1:
|
||||
3. The initial branch is the development branch 0.11, which contains the latest code for the 0.11.x series. To build a specific release or commit, switch to the associated tag. The tag for the latest stable release is v0.10.1:
|
||||
|
||||
$ git checkout v0.10.1
|
||||
|
||||
|
|
@ -36,9 +36,9 @@ Alternatively, the individual commands run by `build-all` may be executed direct
|
|||
|
||||
<xsbt>/target/sbt-launch-0.10.1.jar
|
||||
|
||||
If using the 0.10 development branch, the launcher is at:
|
||||
If using the 0.11 development branch, the launcher is at:
|
||||
|
||||
<xsbt>/target/sbt-launch-0.10.2-SNAPSHOT.jar
|
||||
<xsbt>/target/sbt-launch-0.11.0-SNAPSHOT.jar
|
||||
|
||||
## Modifying sbt
|
||||
|
||||
|
|
@ -48,4 +48,4 @@ To use your modified version of sbt in a project locally, run `publish-local`.
|
|||
|
||||
After each `publish-local`, clean the `project/boot/` directory in the project in which you want to use the locally built sbt. Alternatively, if sbt is running and the launcher hasn't changed, run `reboot full` to have sbt do this for you.
|
||||
|
||||
If a project has `project/build.properties` defined, either delete the file or change `sbt.version` to `0.10.2-SNAPSHOT`.
|
||||
If a project has `project/build.properties` defined, either delete the file or change `sbt.version` to `0.11.0-SNAPSHOT`.
|
||||
|
|
@ -86,9 +86,7 @@ final class Eval(optionsNoncp: Seq[String], classpath: Seq[File], mkReporter: Se
|
|||
()
|
||||
else
|
||||
{
|
||||
reporter.withSource(unit.source) {
|
||||
atPhase(phase) { phase.run }
|
||||
}
|
||||
compile(phase.next)
|
||||
}
|
||||
}
|
||||
|
|
@ -114,7 +112,7 @@ final class Eval(optionsNoncp: Seq[String], classpath: Seq[File], mkReporter: Se
|
|||
Nil,
|
||||
List(Nil),
|
||||
TypeTree(),
|
||||
Block(List(Apply(Select(Super(emptyTypeName, emptyTypeName), nme.CONSTRUCTOR), Nil)), Literal(Constant(())))
|
||||
Block(List(Apply(Select(Super(This(emptyTypeName), emptyTypeName), nme.CONSTRUCTOR), Nil)), Literal(Constant(())))
|
||||
)
|
||||
|
||||
def method = DefDef(NoMods, WrapValName, Nil, Nil, tpt, tree)
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ object InlineConfiguration
|
|||
}
|
||||
object ModuleSettings
|
||||
{
|
||||
def apply(ivyScala: Option[IvyScala], validate: Boolean, module: => ModuleID, moduleInfo: => ModuleInfo)(baseDirectory: File, log: Logger) =
|
||||
def apply(ivyScala: Option[IvyScala], validate: Boolean, module: => ModuleID, moduleInfo: => ModuleInfo)(baseDirectory: File, log: Logger): ModuleSettings =
|
||||
{
|
||||
log.debug("Autodetecting dependencies.")
|
||||
val defaultPOMFile = IvySbt.defaultPOM(baseDirectory)
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@ object Sbt extends Build
|
|||
override lazy val settings = super.settings ++ buildSettings ++ Status.settings
|
||||
def buildSettings = Seq(
|
||||
organization := "org.scala-tools.sbt",
|
||||
version := "0.10.2-SNAPSHOT",
|
||||
version := "0.11.0-SNAPSHOT",
|
||||
publishArtifact in packageDoc := false,
|
||||
scalaVersion := "2.8.1",
|
||||
scalaVersion := "2.9.1.RC3",
|
||||
publishMavenStyle := false,
|
||||
componentID := None
|
||||
)
|
||||
|
|
@ -85,7 +85,7 @@ object Sbt extends Build
|
|||
// Compiler-side interface to compiler that is compiled against the compiler being used either in advance or on the fly.
|
||||
// Includes API and Analyzer phases that extract source API and relationships.
|
||||
lazy val compileInterfaceSub = baseProject(compilePath / "interface", "Compiler Interface") dependsOn(interfaceSub, ioSub % "test->test", logSub % "test->test", launchSub % "test->test") settings( compileInterfaceSettings : _*)
|
||||
lazy val precompiled29 = precompiled("2.9.0-1")
|
||||
lazy val precompiled28 = precompiled("2.8.1")
|
||||
// lazy val precompiled27 = precompiled("2.7.7")
|
||||
|
||||
// Implements the core functionality of detecting and propagating changes incrementally.
|
||||
|
|
@ -115,7 +115,7 @@ object Sbt extends Build
|
|||
// Strictly for bringing implicits and aliases from subsystems into the top-level sbt namespace through a single package object
|
||||
// technically, we need a dependency on all of mainSub's dependencies, but we don't do that since this is strictly an integration project
|
||||
// with the sole purpose of providing certain identifiers without qualification (with a package object)
|
||||
lazy val sbtSub = baseProject(sbtPath, "Simple Build Tool") dependsOn(mainSub, compileInterfaceSub, precompiled29, scriptedSbtSub % "test->test") settings(sbtSettings : _*)
|
||||
lazy val sbtSub = baseProject(sbtPath, "Simple Build Tool") dependsOn(mainSub, compileInterfaceSub, precompiled28, scriptedSbtSub % "test->test") settings(sbtSettings : _*)
|
||||
|
||||
/* Nested subproject paths */
|
||||
def sbtPath = file("sbt")
|
||||
|
|
@ -162,7 +162,7 @@ object Sbt extends Build
|
|||
import Sxr.sxr
|
||||
def releaseSettings = Release.settings(nonRoots, proguard in Proguard)
|
||||
def rootSettings = releaseSettings ++ LaunchProguard.settings ++ LaunchProguard.specific(launchSub) ++ Sxr.settings ++ docSetting ++ Seq(
|
||||
scriptedScalaVersion := "2.8.1",
|
||||
scriptedScalaVersion := "2.9.1.RC3",
|
||||
scripted <<= scriptedTask,
|
||||
scriptedSource <<= (sourceDirectory in sbtSub) / "sbt-test",
|
||||
sources in sxr <<= deepTasks(sources in Compile),
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ object Sxr
|
|||
lazy val settings: Seq[Setting[_]] = inTask(sxr)(inSxrSettings) ++ baseSettings
|
||||
|
||||
def baseSettings = Seq(
|
||||
libraryDependencies += "org.scala-tools.sxr" %% "sxr" % "0.2.7" % sxrConf.name
|
||||
libraryDependencies += "org.scala-tools.sxr" % "sxr_2.9.0" % "0.2.7" % sxrConf.name
|
||||
)
|
||||
def inSxrSettings = Seq(
|
||||
managedClasspath <<= update map { _.matching( configurationFilter(sxrConf.name) ).classpath },
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ object Util
|
|||
lazy val base: Seq[Setting[_]] = Seq(scalacOptions ++= Seq("-Xelide-below", "0"), projectComponent) ++ Licensed.settings
|
||||
|
||||
def testDependencies = libraryDependencies ++= Seq(
|
||||
"org.scala-tools.testing" %% "scalacheck" % "1.8" % "test",
|
||||
"org.scala-tools.testing" %% "specs" % "1.6.8" % "test"
|
||||
"org.scala-tools.testing" % "scalacheck_2.9.0-1" % "1.9" % "test",
|
||||
"org.scala-tools.testing" % "specs_2.9.0-1" % "1.6.8" % "test"
|
||||
)
|
||||
|
||||
lazy val minimalSettings: Seq[Setting[_]] = Defaults.paths ++ Seq[Setting[_]](crossTarget <<= target.identity, name <<= thisProject(_.id))
|
||||
|
|
@ -73,7 +73,7 @@ object Common
|
|||
lazy val ivy = lib("org.apache.ivy" % "ivy" % "2.2.0")
|
||||
lazy val httpclient = lib("commons-httpclient" % "commons-httpclient" % "3.1")
|
||||
lazy val jsch = lib("com.jcraft" % "jsch" % "0.1.31" intransitive() )
|
||||
lazy val sbinary = lib("org.scala-tools.sbinary" %% "sbinary" % "0.4.0" )
|
||||
lazy val sbinary = lib("org.scala-tools.sbinary" % "sbinary_2.9.0" % "0.4.0" )
|
||||
lazy val scalaCompiler = libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _ )
|
||||
}
|
||||
object Licensed
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
libraryDependencies ++= Seq(
|
||||
"com.novocode" % "junit-interface" % "0.5" % "test",
|
||||
"junit" % "junit" % "4.8" % "test",
|
||||
"org.scala-lang" % "scala-compiler" % "2.8.1"
|
||||
"junit" % "junit" % "4.8" % "test"
|
||||
)
|
||||
|
||||
libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _ )
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
libraryDependencies ++= Seq(
|
||||
"org.scala-tools.testing" %% "specs" % "1.6.7.2" % "test",
|
||||
"org.scala-lang" % "scala-compiler" % "2.8.1"
|
||||
)
|
||||
scalaVersion := "2.8.1"
|
||||
|
||||
libraryDependencies += "org.scala-tools.testing" %% "specs" % "1.6.7.2" % "test"
|
||||
|
||||
libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _)
|
||||
|
|
@ -2,6 +2,8 @@ import sbt._
|
|||
import Keys._
|
||||
object P extends Build
|
||||
{
|
||||
override def settings = super.settings ++ Seq( scalaVersion in update := "2.9.0" )
|
||||
|
||||
val declared = SettingKey[Boolean]("declared")
|
||||
lazy val a = Project("A", file("a")) settings(
|
||||
libraryDependencies += "org.scala-tools.sbinary" %% "sbinary" % "0.4.0" % "provided"
|
||||
|
|
|
|||
Loading…
Reference in New Issue