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

We shouldn't cross publish sbt for backward compatibility 

By keeping sbt artifact to be called sbt, the user can try by just
changing the build properties.
This commit is contained in:
Eugene Yokota 2016-05-03 22:39:42 -04:00
parent b8e490fbfe
commit e3d2af9e40
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.sbt
View File

@ -196,6 +196,7 @@ lazy val sbtProj = (project in sbtPath).
baseSettings,
name := "sbt",
normalizedName := "sbt",
crossPaths := false,
libraryDependencies ++= Seq(compilerBrdige)
)

4
launch/src/main/input_resources/sbt/sbt.boot.properties
View File

@ -1,5 +1,5 @@
[scala]
version: 2.11.8
version: ${sbt.scala.version-auto}
[app]
org: ${sbt.organization-${{org}}}
@ -7,7 +7,7 @@
version: ${sbt.version-read(sbt.version)[${{sbt.version}}]}
class: ${sbt.main.class-sbt.xMain}
components: xsbti,extra
cross-versioned: ${sbt.cross.versioned-binary}
cross-versioned: ${sbt.cross.versioned-false}
resources: ${sbt.extraClasspath-}
[repositories]

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

@ -1162,9 +1162,9 @@ object Classpaths {
val id = app.provider.id
val scalaVersion = app.provider.scalaProvider.version
val binVersion = binaryScalaVersion(scalaVersion)
val cross = CrossVersion.binary
ModuleID(id.groupID, id.name, sbtVersion.value, crossVersion = cross)
// CrossVersion(scalaVersion, binVersion)(base) // .copy(crossVersion = CrossVersion.Disabled)
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)
}
))
@ -1375,7 +1375,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_2.11", 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", 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)

2
sbt/src/sbt-test/actions/compile-time-only/build.sbt
View File

@ -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.")

2
sbt/src/sbt-test/project/src-plugins/plugin/build.sbt
View File

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