Commit Graph
283 Commits
Author SHA1 Message Date
Mark Harrah 042128a673 Put default conflict warnings at the debug level. Fixes #709.
This is at debug instead of disabled so as to be a minimal change
during a point release.  It is dropped to debug because the conflict warnings
don't work correctly, especially for the artifacts they were designed for,
sbt and Scala.  This is due to the overrides and excludes present in 0.12.x.

The other possible use of conflictWarning is for general libraries, but
in 0.13 that is better served by using a strict conflict manager.  Therefore,
0.13 should drop the warnings based on the evicted modules completely.
2013-03-14 16:48:42 -04:00
Mark Harrah cd7afef797 Make exclude-classifiers per-user instead of per-build. Fixes #634. 2013-03-06 10:19:18 -05:00
Mark Harrah eb5ec9c736 Allow cleanKeepFiles to contain directories
The directory contents will be kept as will empty directories.
2013-03-06 09:33:32 -05:00
Mark Harrah 7753a29ea0 Disable aggregation for run-main by default 2012-12-12 16:02:42 -05:00
Mark Harrah ffea316c17 cleanup of #585: compatible with earlier launchers 2012-12-12 15:54:31 -05:00
Eric Bowman 7064ca4114 XSBT-5: maven-style ivy repo support in the launcher config
Change-Id: I22c1ff126961d61d92e2e45a5b7eff329d3def90
Reviewed-on: https://gerrit.gilt.com/10950
Reviewed-by: Eric Bowman <[email protected]>
Tested-by: Eric Bowman <[email protected]>
2012-12-12 15:54:24 -05:00
Kevin Scaldeferri 1f8c21de18 Include all JAR packaging types in the default classpathTypes. Fixes #550
These special types need to be recognized in both the POM parser and added to the classpath.
The previous code was not DRY, and eclipse-plugin was in one but not the other.  This ensures
new types can be added in the future without risking this type of oversight.
2012-12-12 15:45:06 -05:00
Mark Harrah e32358165b Strip explicitArtifacts from projectDependencies. Fixes #546.
The module definition (ModuleID) got copied as to be the dependency definition,
but as a dependency definition, it should not include explicit artifacts.
2012-09-13 08:39:15 -04:00
Mark Harrah bdac041599 Force update on change to last modified time of artifacts or cached descriptor.
This is part 2 of the fix for #532.  It may also fix issues when working with
multiple local projects via 'publish-local' and binary dependencies.
2012-09-04 13:37:29 -04:00
Eugene Vigdorchik ed9ea1cf77 Fix compilation error for 2.10.0-M5 for all but main project. 2012-09-04 13:37:23 -04:00
Mark Harrah c6223388d9 back all ConsoleLoggers by a common ConsoleOut
The common ConsoleOut merges (overwrites) consecutive Resolving xxxx ... lines
when ansi codes are enabled.
2012-09-04 13:30:34 -04:00
Mark Harrah 81a283c1ca per-project resolution cache that deletes cached files before each update
These are the ivy files, properties, and resolve reports for the project,
not dependencies and their artifacts.
2012-09-04 13:26:33 -04:00
Mark Harrah 3dba9988e1 clean up temporary directory on exit. ref #502
Directory was already empty, this just removes the empty directory.
2012-09-04 13:26:33 -04:00
Mark Harrah e7f6cd7cba Merge commit '82a338b3a899419a5761a0395a9d265d7d442778' into 0.12.1
This is part I of 0.13 backports.
2012-09-04 11:46:28 -04:00
Mark Harrah 4059631654 run either javadoc (Java sources only) or scaladoc (Scala only or mixed), but not both 2012-07-17 14:34:05 -04:00
Indrajit Raychaudhuri 82a338b3a8 Add OSX JNI library extension in includeFilter by default. Closes #500 2012-07-08 00:38:25 -04:00
Mark Harrah 5a93605d75 'orbit' packaging should be handled like a standard jar. fixes #499. ref #463 2012-07-06 10:28:51 -04:00
Mark Harrah 464193d0f6 sourcesInBase setting. fixes #494 2012-07-06 10:28:51 -04:00
Josh Suereth 171ff5f808 Fix override repositories flag so we can still resolve inter-project dependencies. 2012-06-25 18:48:06 -04:00
Mark Harrah bfe78f174c fix makePom delegation 2012-06-16 23:40:52 -04:00
Mark Harrah 0578a49e43 make publishArtifact setting for makePom affected by more general setting. fixes #484. 2012-06-15 07:54:02 -04:00
Mark Harrah e37145137f Revert "use the same logic for selecting extra attributes in addSbtPlugin as in pluginProjectId"
Doesn't compile.

This reverts commit 8f14df1930.
2012-05-30 21:48:06 -04:00
Josh Suereth 76d24091fa Fixes from mark's suggestions.
* Puppies may rest easy from the removal of Option.get calls.
* better names for config values
* Added a helper method to avoid any possible code duplication, besides repeated def, val, match and for keywords.
  Looking for ways to remove this duplciation ASAP.
* Moved from pattern match to ._1, my most hated member.
2012-05-30 21:42:45 -04:00
Josh Suereth 52307d27a4 Adding ability to override resolvers from launcher. * Added key which pulls the repositories used by the launcher, if the API allows. * Added which configures whether or not should just use . * Added parsing to launcher so java property is used by default for override setting. 2012-05-30 21:42:45 -04:00
Johannes Rudolph 8f14df1930 use the same logic for selecting extra attributes in addSbtPlugin as in pluginProjectId
This enables us to use the same plugins.sbt in projects for release and
pre-release versions of sbt.
2012-05-30 20:02:30 -04:00
Mark Harrah a099754109 if defined, use explicit historyPath at ThisBuild or Global project scope 2012-05-21 22:23:44 -04:00
Mark Harrah 53ee1c5adf hk2-jar packaging should be handled like a standard jar. fixes #463 2012-05-16 07:34:15 -04:00
Eugene Vigdorchik c795511e13 Only allow a single task to run at any point in time if parallelExecution in Test is false. 2012-05-12 10:15:59 -04:00
Eugene Vigdorchik 6f03b83446 Remove unneeded map argument. 2012-05-12 10:15:49 -04:00
Mark Harrah 13e62fd645 Use binary version for cross-version even for snapshots and milestones
Rely instead on users not publishing the same stable version against both
 stable Scala or sbt releases and snapshots/milestones.
2012-05-05 20:35:05 -04:00
Mark Harrah 6769c94208 basis for a resident compiler
unstable, but can be tested with -Dsbt.resident.limit=n
 n is the maximum Globals kept around
2012-04-28 18:58:52 -04:00
Mark Harrah d837f869bd using some of the embedding interfaces 2012-04-18 11:02:52 -04:00
Mark Harrah 4de26c1195 allow specifying Scala version for sbt plugin in addSbtVersion 2012-04-13 17:47:12 -04:00
Mark Harrah 2aad26a5ba Merge 'vjovanov/0.12' into 0.12 2012-04-12 17:21:08 -04:00
Mark Harrah 7109bc9637 configuration via ivysettings.xml: use URI instead of URL and make 'inter-project' resolver available for multi-project builds. ref #416 2012-04-11 22:40:45 -04:00
Michael Allman ba2e42287b Add support for loading Ivy settings from a URL 2012-04-08 20:22:15 -07:00
Eugene Vigdorchik f122b95e46 Extract common code to a separate method. 2012-04-08 20:33:46 +04:00
Mark Harrah f94eae15b6 merge test forking from vigdorchik/xsbt/wip_fork_test 2012-04-06 20:48:31 -04:00
Vojin Jovanovic 0f6a50daee Addressing https://github.com/harrah/xsbt/pull/418
Changed the order of parameters in getScala method.
Changed the key name to scalaOrganization (scala-organization).
Augmented description of the key.
Minor fixes.
2012-04-05 12:19:49 +02:00
Eugene Vigdorchik e8798ddca8 Add test and allow the java options to be picked for a default test group created. 2012-04-05 12:02:53 +04:00
Eugene Vigdorchik 05c4fbdc3d Cleanup: 1) Rename policies since Fork is popular name and clashes with sbt.Fork2. Don't put entire Execution into Group, but just RunPolicy. 2012-04-04 23:50:32 +04:00
Vojin Jovanovic 182b7c655f Adding scalaOrg setting key for scala clones.
Adding scalaOrg key that specifies organization (artifactId) of scala used in the project. The change does not affect version checks for dependecies and LauncherConfiguration.

Modified scalaProvider cache in Launcher to use (scalaOrg, version) as a key.

Downloaded jars are stored in the folder scala-.../lig-<scalaOrg> if scalaOrg is not default.

scala-org is an advanced setting so it can not be used in build.sbt.
2012-04-04 19:06:55 +02:00
Eugene Vigdorchik 2ba9bbc767 More indentation messed up. 2012-04-04 16:25:12 +04:00
Eugene Vigdorchik cdfc72d05d Given the ease of defining concurrentRestictions, I think it should be left to the user to correctly provide the limit for forked test groups. 2012-04-03 18:35:07 +04:00
Eugene Vigdorchik e169e4f222 Correctly initialize ForkedTestGroup restriction. 2012-04-03 18:13:02 +04:00
Eugene Vigdorchik c4385adce0 Some more fixes. 2012-04-03 11:49:41 +04:00
James Earl Douglas 710b12520d set status to "integration" if isSnapshot is true, and "release" if isSnapshot is false 2012-04-02 21:15:52 +05:30
Eugene Vigdorchik ce0a2a3625 More fixes. 2012-04-02 19:01:54 +04:00
Eugene Vigdorchik 2741515d44 Fixes after review, take 3. 2012-04-02 16:05:56 +04:00
Eugene Vigdorchik 4d5effcb28 Fixes after review, take 2. 2012-04-02 12:08:18 +04:00