From 3f091e5f86b6dd643c0fd7aeeb92357fab698bf4 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 20 Aug 2012 15:55:51 -0400 Subject: [PATCH] Resolve Scala version for projects in the normal `update` task. 1. Scala jars won't be copied to the boot directory, except for those needed to run sbt. 2. Scala SNAPSHOTs behave like normal SNAPSHOTs. In particular, running `update` will properly re-resolve the dynamic revision. 3. Scala jars are resolved using the same repositories and configuration as other dependencies. 4. Classloaders (currently, Scala classloaders) are cached by the timestamps of entries instead of Scala class loaders being cached by version. TODO: Support external dependency configuration --- ivy/IvyInterface.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ivy/IvyInterface.scala b/ivy/IvyInterface.scala index fb85ae0db..4496f3cae 100644 --- a/ivy/IvyInterface.scala +++ b/ivy/IvyInterface.scala @@ -347,7 +347,7 @@ object Configurations def default: Seq[Configuration] = defaultMavenConfigurations def defaultMavenConfigurations: Seq[Configuration] = Seq(Compile, Runtime, Test, Provided, Optional) def defaultInternal: Seq[Configuration] = Seq(CompileInternal, RuntimeInternal, TestInternal) - def auxiliary: Seq[Configuration] = Seq(Sources, Docs, Pom) + def auxiliary: Seq[Configuration] = Seq(Sources, Docs, Pom, ScalaTool) def names(cs: Seq[Configuration]) = cs.map(_.name) lazy val RuntimeInternal = optionalInternal(Runtime) @@ -379,6 +379,7 @@ object Configurations lazy val Optional = config("optional") lazy val Pom = config("pom") + lazy val ScalaTool = config("scala-tool") hide lazy val CompilerPlugin = config("plugin") hide private[sbt] val DefaultMavenConfiguration = defaultConfiguration(true)