Some changes due to cross publishing

main/src/main/scala/sbt/Defaults.scala

@@ -1158,9 +1158,9 @@ object Classpaths {
       val id = app.provider.id
       val scalaVersion = app.provider.scalaProvider.version
       val binVersion = binaryScalaVersion(scalaVersion)
-      val cross = if (id.crossVersioned) CrossVersion.binary else CrossVersion.Disabled
-      val base = ModuleID(id.groupID, id.name, sbtVersion.value, crossVersion = cross)
-      CrossVersion(scalaVersion, binVersion)(base).copy(crossVersion = CrossVersion.Disabled)
+      val cross = CrossVersion.binary
+      ModuleID(id.groupID, id.name, sbtVersion.value, crossVersion = cross)
+      // CrossVersion(scalaVersion, binVersion)(base) // .copy(crossVersion = CrossVersion.Disabled)
     }
   ))
 
@@ -1368,7 +1368,7 @@ object Classpaths {
       val depDir = dependencyCacheDirectory.value
       withExcludes(out, mod.classifiers, lock(app)) { excludes =>
         val noExplicitCheck = ivyScala.value.map(_.copy(checkExplicit = false))
-        IvyActions.transitiveScratch(is, "sbt", GetClassifiersConfiguration(mod, excludes, c.copy(artifactFilter = c.artifactFilter.invert), noExplicitCheck, srcTypes, docTypes), uwConfig, LogicalClock(state.value.hashCode), Some(depDir), s.log)
+        IvyActions.transitiveScratch(is, "sbt_2.11", GetClassifiersConfiguration(mod, excludes, c.copy(artifactFilter = c.artifactFilter.invert), noExplicitCheck, srcTypes, docTypes), uwConfig, LogicalClock(state.value.hashCode), Some(depDir), s.log)
       }
     } tag (Tags.Update, Tags.Network)
   )) ++ Seq(bootIvyConfiguration := (ivyConfiguration in updateSbtClassifiers).value)

sbt/src/main/scala/Import.scala

@@ -1,7 +1,6 @@
 package sbt
 
 object Import {
-
   // sbt.io
   val AllPassFilter = sbt.io.AllPassFilter
   val DirectoryFilter = sbt.io.DirectoryFilter

sbt/src/sbt-test/actions/compile-time-only/build.sbt

@@ -1,4 +1,4 @@
-libraryDependencies += "org.scala-sbt" % "sbt" % sbtVersion.value
+libraryDependencies += "org.scala-sbt" %% "sbt" % sbtVersion.value
 
 
 lazy val expectErrorNotCrash = taskKey[Unit]("Ensures that sbt properly set types on Trees so that the compiler doesn't crash on a bad reference to .value, but gives a proper error instead.")

sbt/src/sbt-test/apiinfo/basic/build.sbt

@@ -0,0 +1,4 @@
+lazy val root = (project in file(".")).
+  settings(
+    scalaVersion := "2.10.6"
+  )

sbt/src/sbt-test/dependency-management/cache-classifiers/project/maven.sbt

@@ -1,2 +1,2 @@
-libraryDependencies += Defaults.sbtPluginExtra("org.scala-sbt" % "sbt-maven-resolver" % sbtVersion.value,
-  sbtBinaryVersion.value, scalaBinaryVersion.value)
+// libraryDependencies += Defaults.sbtPluginExtra("org.scala-sbt" % "sbt-maven-resolver" % sbtVersion.value,
+//  sbtBinaryVersion.value, scalaBinaryVersion.value)

sbt/src/sbt-test/dependency-management/cross-conflict/build.sbt

@@ -1,3 +1,4 @@
+scalaVersion := "2.10.6"
 libraryDependencies ++= Seq(
   "org.scalatest" %% "scalatest" % "1.9.1" % "test",
   "org.scalamock" %% "scalamock-scalatest-support" % "3.0" % "test"

sbt/src/sbt-test/dependency-management/dynamic-revision/build.sbt

@@ -1,5 +1,6 @@
 lazy val root = (project in file(".")).
   settings(
+    scalaVersion := "2.10.6",
     libraryDependencies += "org.webjars" %% "webjars-play" % "2.1.0-3",
     resolvers += Resolver.typesafeRepo("releases")
   )

sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt

@@ -3,6 +3,6 @@ import sbt.internal.librarymanagement.syntax._
 seq(externalIvySettings(), externalIvyFile())
 
 TaskKey[Unit]("check") := {
-	val files = update.value.matching( moduleFilter(organization = "org.scalacheck", name = "scalacheck*", revision = "1.9") )
+	val files = update.value.matching( moduleFilter(organization = "org.scalacheck", name = "scalacheck*", revision = "1.11.4") )
 	assert(files.nonEmpty, "ScalaCheck module not found in update report")
 }

sbt/src/sbt-test/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml

@@ -2,6 +2,6 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation= "http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info organisation="org" module="ivy-settings-test"/>
 	<dependencies>
-		<dependency org="org.scalacheck" name="scalacheck_2.9.1" rev="1.9"/>
+		<dependency org="org.scalacheck" name="scalacheck_2.11" rev="1.11.4"/>
 	</dependencies>
 </ivy-module>

sbt/src/sbt-test/dependency-management/t468/project/maven.sbt

@@ -1,2 +1,2 @@
-libraryDependencies += Defaults.sbtPluginExtra("org.scala-sbt" % "sbt-maven-resolver" % sbtVersion.value,
-  sbtBinaryVersion.value, scalaBinaryVersion.value)
+// libraryDependencies += Defaults.sbtPluginExtra("org.scala-sbt" % "sbt-maven-resolver" % sbtVersion.value,
+//  sbtBinaryVersion.value, scalaBinaryVersion.value)

sbt/src/sbt-test/dependency-management/update-sbt-classifiers/project/plugins.sbt

@@ -1 +1 @@
-libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value
+libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value

sbt/src/sbt-test/project/generated-root-no-publish/test

@@ -1,10 +1,10 @@
 > publishLocal
-$ exists target/ivy-cache/local/com.example/app_2.10/0.1.0/poms/app_2.10.pom
-$ exists target/ivy-cache/local/com.example/app_2.10/0.1.0/jars/app_2.10.jar
-$ absent target/ivy-cache/local/com.example/default-root_2.10/0.1.0/ivys/ivy.xml
+$ exists target/ivy-cache/local/com.example/app_2.11/0.1.0/poms/app_2.11.pom
+$ exists target/ivy-cache/local/com.example/app_2.11/0.1.0/jars/app_2.11.jar
+$ absent target/ivy-cache/local/com.example/default-root_2.11/0.1.0/ivys/ivy.xml
 
 $ copy-file changes/bare.sbt build.sbt
 > reload
 > publishLocal
-$ exists target/ivy-cache/local/com.example/generated-root-no-publish_2.10/0.1.0/poms/generated-root-no-publish_2.10.pom
-$ exists target/ivy-cache/local/com.example/generated-root-no-publish_2.10/0.1.0/jars/generated-root-no-publish_2.10.jar
+$ exists target/ivy-cache/local/com.example/generated-root-no-publish_2.11/0.1.0/poms/generated-root-no-publish_2.11.pom
+$ exists target/ivy-cache/local/com.example/generated-root-no-publish_2.11/0.1.0/jars/generated-root-no-publish_2.11.jar

sbt/src/sbt-test/project/scripted-plugin/project/plugins.sbt

@@ -1,3 +1,3 @@
 libraryDependencies <+= sbtVersion { sv =>
-  "org.scala-sbt" % "scripted-plugin" % sv
+  "org.scala-sbt" %% "scripted-plugin" % sv
 }

sbt/src/sbt-test/project/scripted13/project/plugins.sbt

@@ -1,5 +1,5 @@
 libraryDependencies <+= sbtVersion { sbtv =>
-   "org.scala-sbt" % "scripted-plugin" % sbtv
+   "org.scala-sbt" %% "scripted-plugin" % sbtv
 }
 
 offline := true

sbt/src/sbt-test/project/src-plugins/plugin/build.sbt

@@ -1,2 +1,2 @@
 libraryDependencies +=
-	"org.scala-sbt" % "sbt" % appConfiguration.value.provider.id.version
+	"org.scala-sbt" %% "sbt" % appConfiguration.value.provider.id.version

sbt/src/sbt-test/source-dependencies/continuations/build.sbt

@@ -1,5 +1,4 @@
+scalaVersion := "2.10.6"
 autoCompilerPlugins := true
-
 libraryDependencies += compilerPlugin("org.scala-lang.plugins" % "continuations" % scalaVersion.value)
-
 scalacOptions += "-P:continuations:enable"

sbt/src/sbt-test/source-dependencies/inherited-macros/build.sbt

@@ -1,4 +1,5 @@
 val defaultSettings = Seq(
+  scalaVersion := "2.10.6",
   libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _ )//,
   //incOptions := incOptions.value.withNameHashing(true)
 )

sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt

@@ -1,4 +1,5 @@
 val defaultSettings = Seq(
+  scalaVersion := "2.10.6",
   libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _ )
 )
 

sbt/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt

@@ -1,4 +1,5 @@
 val defaultSettings = Seq(
+  scalaVersion := "2.10.6",
   libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _ )
 )
 

sbt/src/sbt-test/source-dependencies/macro/build.sbt

@@ -1,4 +1,5 @@
 val defaultSettings = Seq(
+  scalaVersion := "2.10.6",
   libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _ )//,
   //incOptions := incOptions.value.withNameHashing(true)
 )

sbt/src/sbt-test/tests/arguments-new/build.sbt

@@ -1,3 +1,4 @@
+scalaVersion := "2.10.6"
 libraryDependencies += "org.scalatest" % "scalatest_2.10" % "2.0.M6-SNAP28" % "test"
 
 

sbt/src/sbt-test/tests/fork2/build.sbt

@@ -1,3 +1,4 @@
+scalaVersion := "2.10.6"
 fork := true
 
-libraryDependencies += "org.scalatest" %% "scalatest" % "1.9" % "test"
+libraryDependencies += "org.scalatest" %% "scalatest" % "1.9" % "test"

sbt/src/sbt-test/tests/it/build.sbt

@@ -1,6 +1,7 @@
 lazy val root = (project in file(".")).
   configs(IntegrationTest).
   settings(
+    scalaVersion := "2.10.6",
     Defaults.itSettings,
     libraryDependencies += specs
   )

sbt/src/sbt-test/tests/resources/build.sbt

@@ -1 +1,2 @@
+scalaVersion := "2.10.6"
 libraryDependencies += "org.specs2" % "specs2_2.10" % "1.12.3" % "test"

sbt/src/sbt-test/tests/setup-cleanup/base.sbt

@@ -1 +1,2 @@
-libraryDependencies += "org.scalatest" %% "scalatest" % "1.9.1"
+scalaVersion := "2.10.6"
+libraryDependencies += "org.scalatest" %% "scalatest" % "1.9.1"

sbt/src/sbt-test/tests/test-exclude/build.sbt

@@ -1,5 +1,6 @@
 lazy val root = (project in file(".")).
   settings(
+    scalaVersion := "2.10.6",
     libraryDependencies += "org.scalatest" %% "scalatest" % "1.9.1" % Test,
     parallelExecution in test := false
   )

sbt/src/sbt-test/tests/test-quick/build.sbt

@@ -1,5 +1,6 @@
 lazy val root = (project in file(".")).
   settings(
+    scalaVersion := "2.10.6",
     libraryDependencies += "org.scalatest" %% "scalatest" % "1.9.1" % Test,
     parallelExecution in test := false
   )

scripted/plugin/src/main/scala/sbt/ScriptedPlugin.scala

@@ -39,7 +39,7 @@ object ScriptedPlugin extends AutoPlugin {
     sbtLauncher <<= getJars(scriptedLaunchConf).map(_.get.head),
     sbtTestDirectory := sourceDirectory.value / "sbt-test",
     libraryDependencies ++= Seq(
-      "org.scala-sbt" % "scripted-sbt" % scriptedSbt.value % scriptedConf.toString,
+      "org.scala-sbt" %% "scripted-sbt" % scriptedSbt.value % scriptedConf.toString,
       "org.scala-sbt" % "sbt-launch" % scriptedSbt.value % scriptedLaunchConf.toString
     ),
     scriptedBufferLog := true,