diff --git a/build.sbt b/build.sbt index bc2cf4cb0..7cf968a89 100644 --- a/build.sbt +++ b/build.sbt @@ -12,7 +12,7 @@ import Sxr.sxr // but can be shared across the multi projects. def buildLevelSettings: Seq[Setting[_]] = Seq( organization in ThisBuild := "org.scala-sbt", - version in ThisBuild := "0.13.8-SNAPSHOT" + version in ThisBuild := "0.13.9-SNAPSHOT" ) def commonSettings: Seq[Setting[_]] = Seq( @@ -522,7 +522,7 @@ def otherRootSettings = Seq( } )) lazy val docProjects: ScopeFilter = ScopeFilter( - inAnyProject -- inProjects(root, sbtProj, scriptedBaseProj, scriptedSbtProj, scriptedPluginProj, precompiled282, precompiled292, precompiled293), + inAnyProject -- inProjects(root, sbtProj, scriptedBaseProj, scriptedSbtProj, scriptedPluginProj, precompiled282, precompiled292, precompiled293, mavenResolverPluginProj), inConfigurations(Compile) ) def fullDocSettings = Util.baseScalacOptions ++ Docs.settings ++ Sxr.settings ++ Seq( diff --git a/notes/0.13.8.markdown b/notes/0.13.8.markdown index 5386f3a79..4b31a0486 100644 --- a/notes/0.13.8.markdown +++ b/notes/0.13.8.markdown @@ -52,6 +52,7 @@ [1881]: https://github.com/sbt/sbt/issues/1881 [1899]: https://github.com/sbt/sbt/pull/1899 [1902]: https://github.com/sbt/sbt/pull/1902 + [1921]: https://github.com/sbt/sbt/issues/1921 ### Changes with compatibility implications @@ -135,6 +136,7 @@ This should help erase many of the deficiencies encountered when using Maven and - sbt-maven-resolver requires sbt 0.13.8 and above. - The current implementation does not support Ivy-style dynamic revisions, such as "2.10.+" or "latest.snapshot". This is a fixable situation, but the version range query and Ivy -> Maven version range translation code has not been migrated. +- The current implementation does not support Maven-style range revisions if found on transitive dependencies. [#1921][1921] [#1793][1793] by [@jsuereth][@jsuereth] diff --git a/src/main/conscript/sbt/launchconfig b/src/main/conscript/sbt/launchconfig index 42fd0f075..f884aebcc 100644 --- a/src/main/conscript/sbt/launchconfig +++ b/src/main/conscript/sbt/launchconfig @@ -4,7 +4,7 @@ [app] org: ${sbt.organization-org.scala-sbt} name: sbt - version: ${sbt.version-read(sbt.version)[0.13.7]} + version: ${sbt.version-read(sbt.version)[0.13.8]} class: sbt.xMain components: xsbti,extra cross-versioned: ${sbt.cross.versioned-false} diff --git a/src/main/conscript/scalas/launchconfig b/src/main/conscript/scalas/launchconfig index 49bfed9d2..b3a9cc26d 100644 --- a/src/main/conscript/scalas/launchconfig +++ b/src/main/conscript/scalas/launchconfig @@ -4,7 +4,7 @@ [app] org: ${sbt.organization-org.scala-sbt} name: sbt - version: ${sbt.version-read(sbt.version)[0.13.7]} + version: ${sbt.version-read(sbt.version)[0.13.8]} class: sbt.ScriptMain components: xsbti,extra cross-versioned: ${sbt.cross.versioned-false} diff --git a/src/main/conscript/screpl/launchconfig b/src/main/conscript/screpl/launchconfig index 704c5aa51..c73788eed 100644 --- a/src/main/conscript/screpl/launchconfig +++ b/src/main/conscript/screpl/launchconfig @@ -4,7 +4,7 @@ [app] org: ${sbt.organization-org.scala-sbt} name: sbt - version: ${sbt.version-read(sbt.version)[0.13.7]} + version: ${sbt.version-read(sbt.version)[0.13.8]} class: sbt.ConsoleMain components: xsbti,extra cross-versioned: ${sbt.cross.versioned-false}