fix scripted tests

This commit is contained in:
Mark Harrah 2013-04-09 20:13:06 -04:00
parent d3f8bdb837
commit d6b548596b
6 changed files with 11 additions and 6 deletions

View File

@ -1,4 +1,4 @@
libraryDependencies += "org.example" %% "artifacta" % "1.0.0-SNAPSHOT" withSources() classifier("test") classifier("")
libraryDependencies += "org.example" %% "artifacta" % "1.0.0-SNAPSHOT" withSources() classifier("tests") classifier("")
externalResolvers := Seq( "demo" at ( (baseDirectory in ThisBuild).value / "demo-repo").toURI.toString )

View File

@ -1 +0,0 @@
conflictWarning ~= { _.copy(failOnConflict = true) }

View File

@ -0,0 +1 @@
conflictWarning ~= { _.copy(failOnConflict = false) }

View File

@ -1,5 +1,5 @@
> update
$ copy-file changes/conflict-error.sbt conflict-error.sbt
-> update
$ copy-file changes/no-conflict-error.sbt no-conflict-error.sbt
> reload
-> update
> update

View File

@ -6,7 +6,11 @@ $ touch stm
$ touch noscala
> reload
> scalaOverride
# before 0.13, the Scala version was overridden for dependency management,
# but now it is only introduced by a dependency on Scala
# when autoScalaLibrary is false, therefore, the resolved Scala version
# is determined by the dependency manager
-> scalaOverride
$ delete stm
> reload

View File

@ -14,6 +14,7 @@ Features, fixes, changes with compatibility implications (incomplete, please hel
- Dropped support for tab completing the right side of a setting for the ``set`` command. The new task macros make this tab completion obsolete.
- The convention for keys is now camelCase only. Details below.
- sbt no longer looks for main artifacts for poms with ``packaging="pom"``. For details, see the :ref:`relevant Library Management section <packaging-pom>` and gh-636.
- Fixed the default classifier for tests to be ``tests`` for proper Maven compatibility.
Features
--------