Commit Graph

821 Commits

Author SHA1 Message Date
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
Eugene Vigdorchik 04d53c05d5 Modify forking tests based on Stefan's feedback. Should be ported to 0.12 2012-05-09 20:07:47 -04:00
Gerolf Seitz cddbb8dd12 Add method Aggregation.runTasksWithResult 2012-05-07 19:09:11 -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 9e7ee361c7 Tags.exclusive convenience method for executing tasks in isolation 2012-05-02 19:56:35 -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 2bd103f1fa implement embedded interface 2012-04-18 16:01:45 -04:00
Mark Harrah d837f869bd using some of the embedding interfaces 2012-04-18 11:02:52 -04:00
Mark Harrah 8594e4443d reorganize compilation modules 2012-04-18 08:08:25 -04:00
Mark Harrah db7ec09591 move compiler integration classes to subproject compile/integration 2012-04-18 03:33:49 -04:00
Mark Harrah 4de26c1195 allow specifying Scala version for sbt plugin in addSbtVersion 2012-04-13 17:47:12 -04:00
Mark Harrah 1eef9e660a missed a compatibility overload for constructing an InputKey 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
Vojin Jovanovic f17cb88d00 Augmenting scalaOrganization key description. 2012-04-10 12:12:04 +02:00
Michael Allman ba2e42287b Add support for loading Ivy settings from a URL 2012-04-08 20:22:15 -07:00
Mark Harrah 3f7fd80755 Merge pull request #422 from vigdorchik/extract_common_code
Extract common code to a separate method.
2012-04-08 11:40:30 -07:00
Eugene Vigdorchik f122b95e46 Extract common code to a separate method. 2012-04-08 20:33:46 +04:00
Mark Harrah 756099c67b add extra category of help for listing command names without summary 2012-04-07 18:10:23 -04:00
Mark Harrah 2ba5e0a363 help message changes 2012-04-07 18:10:23 -04:00
Mark Harrah 585a62bf5e only list history help (!) in brief help listing 2012-04-07 18:10:23 -04:00
Mark Harrah c358a8a5b0 more improvements to 'tasks' and 'settings' commands 2012-04-07 18:10:23 -04:00
Mark Harrah 75dfccf098 move ForkMain.Tags out to top-level ForkTags to make sxr happy 2012-04-06 23:29:48 -04:00
Mark Harrah f94eae15b6 merge test forking from vigdorchik/xsbt/wip_fork_test 2012-04-06 20:48:31 -04:00
Mark Harrah 12d72facb1 enhance 'projects' to allow temporarily adding/removing builds to the session 2012-04-06 20:28: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 b5766e4057 Fix newlines and indentation. 2012-04-04 09:30:46 +04:00
Eugene Vigdorchik 291db63af3 Fixes 2012-04-03 19:43:59 +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
Eugene Vigdorchik e3a7a331d5 Changes after review, step 1. 2012-04-02 10:46:13 +04:00
Mark Harrah 6015d082aa use resolvers configured in plugin definition for update-sbt-classifiers. fixes #304. 2012-04-01 23:19:08 -04:00
Eugene Vigdorchik 68c5cbe438 Fork java, not scala. 2012-04-01 15:49:29 +04:00
Eugene Vigdorchik 7afc9e77c6 \'fork in test\' initial implementation. 2012-04-01 11:44:05 +04:00
Mark Harrah 6fb1934efa filter detected binary plugins by classpath now that plugin class loader is shared. fixes #412 2012-03-31 21:51:01 -04:00
Mark Harrah 04efcd12d2 fix brief help for set 2012-03-25 20:35:09 -04:00
Mark Harrah 87d2144c12 rank settings, tasks and use this to restrict help/settings/tasks output. fixes #315 2012-03-25 20:35:09 -04:00
Mark Harrah 0aadf5e500 fix help whitespace parsing 2012-03-25 20:35:09 -04:00
Indrajit Raychaudhuri 2525eeb7e6 Ensure that `parents` for java classes have all the ancestors
Currently, only immediate parents classes are picked up for java classes.
This could be problematic, for example, in detecting Fingerprint for test frameworks.
So far, Scala types are not affected –– all the ancestors are available for them.
2012-03-25 15:44:16 +05:30
Mark Harrah 2bb2aed1f6 Revert "work around for 2.10. pattern matching on KNil now requires KNil()"
This reverts commit 2f726b34c3.

This commit caused "java.lang.Error: typeConstructor inapplicable for <none>" when running 'sxr'
2012-03-17 22:58:13 -04:00
Mark Harrah 9bebc70ada normalize URI before hashing 2012-03-17 19:31:56 -04:00
Mark Harrah 1cbb7ce93c print-warnings task for Scala 2.10+ to avoid needing to rerun 'compile' to see deprecation/unchecked warnings 2012-03-17 19:31:55 -04:00
Mark Harrah 7768aaacb0 add overload of addSbtPlugin for explicitly specifying the sbt cross-version 2012-03-17 19:31:55 -04:00
Mark Harrah 2c5a2f0f96 enable sbt-plugin auto-configuration when using 'reload plugins' 2012-03-17 19:31:04 -04:00
Mark Harrah f0eb3ac3a8 force 'update' to run when invoked directly. ref #335 2012-03-17 19:31:03 -04:00
Mark Harrah 5cfafdb648 provide list of task execution roots 2012-03-17 19:31:03 -04:00
Mark Harrah 2f726b34c3 work around for 2.10. pattern matching on KNil now requires KNil() 2012-03-17 19:31:03 -04:00
Mark Harrah 1ffa7b7d92 work around for type inference change in 2.10 2012-03-13 08:01:58 -04:00
Mark Harrah 4e4937e706 searchable help 2012-03-12 19:54:18 -04:00
Indrajit Raychaudhuri eef3a1ed31 Adjust mechanism of resolver conflict detection
Warn when publish resolver and dependency resolvers have same name but different access mechanism.
Multiple resolvers having same name as well as same access mechanism (i.e., equality matching) isn't
usually a problem. A common scenario for this would be Maven based resolvers with exact (http based)
same access mechanism. Also see #367, #363
2012-03-12 05:25:12 +05:30
Indrajit Raychaudhuri 3adf080bc1 Convenient `DefaultOptions` for resolvers.
Simply, add `DefaultOptions.addResolvers` in project config
or `DefaultOptions.addPluginResolvers` in plugin config to have known
resolvers added by default (snapshot mode sensitive)
2012-03-12 05:25:12 +05:30
Indrajit Raychaudhuri abcd4555b9 Replace `Pair.apply` with `Util.pairID`, avoids extra class generation 2012-03-12 05:25:12 +05:30
Indrajit Raychaudhuri c09174c428 Enable `sbtPluginReleases` repository by default for plugins. Closes #380 2012-03-12 05:25:12 +05:30
Indrajit Raychaudhuri 5b3dc5bf26 Update Resolver configuration
- deprecate scala-tools resolvers
- rename `typesafeResolver` to `typesafeReleases` for consistency
- add reference for other wel known resolvers, viz., oss.sonatype.org and scalasbt.artifactoryonline.com
- rearrange locations for helper methods
2012-03-12 05:25:12 +05:30
Mark Harrah 4527e9bfc6 merge test-quick reimplementation #393 from vigdorchik/wip_test_quick 2012-03-09 09:31:39 -05:00
Mark Harrah 3587777638 move error processing to complete/ 2012-03-09 07:08:38 -05:00
Eugene Vigdorchik 40d35a5ced Change according to review and add a missing recursive dependency check. 2012-03-08 20:20:17 +04:00
Eugene Vigdorchik d5bf8cf6d6 Transitive compilation dependency tracking. 2012-03-08 18:58:44 +04:00
Eugene Vigdorchik efb9cde9f3 Add test file itself to the set to track compilation time. 2012-03-07 13:13:56 +04:00
Eugene Vigdorchik e92ba43b3f Add API dependency tracking to testQuickFilter. 2012-03-07 12:28:40 +04:00
Indrajit Raychaudhuri 57ec3bf37e rename `docSetting` to more consistent `docTaskSettings` 2012-03-06 23:36:02 +05:30
Indrajit Raychaudhuri 2e554c10ba Add support for compile task specific settings on `compile` task axis
So far we had ability to configure compile task specific settings on
`Compile` Configuration scope only. We can now add `compile` task scope
as well.

Usecase: one can now specify:
```
// applies for all tasks on Compile axis
scalacOptions in Compile += "-deprecation"
// applies for compile tasks on Compile axis
scalacOptions in (Compile, compile) += "-Xcheckinit" // effectively, "-deprecation -Xcheckinit"
```
2012-03-06 11:20:11 +05:30
Indrajit Raychaudhuri 14f6d7fd87 rename `packageTasks` to more consistent `packageTaskSettings` 2012-03-06 11:20:11 +05:30
Indrajit Raychaudhuri b64e9fb482 Use regular scala helper `Pair.apply` instead of `PairID` 2012-03-06 11:20:11 +05:30
Mark Harrah 6746557d05 addCommandAlias method for defining command aliases in build definitions. fixes #388 2012-03-05 13:40:17 -05:00
Eugene Vigdorchik cef766046d Add forgotten test listener. 2012-03-05 18:37:46 +04:00
Eugene Vigdorchik 6e0ad08ad3 testQuick: track previous test status. 2012-03-05 17:17:55 +04:00
Eugene Vigdorchik fe753768d9 Extract testFilter task to substitute in case of test-quick. 2012-03-04 11:09:42 +04:00
Indrajit Raychaudhuri 69d45b7f5f Use `provider.id.name` instead of hard-coded 'sbt' in `aboutString`
Also rearrange and reformat a bit
2012-03-02 06:05:14 +05:30
Indrajit Raychaudhuri f51aad4b5b Add fancier `shellPrompt` by default, also better arg names 2012-03-02 00:59:06 +05:30
Indrajit Raychaudhuri 9ca86725b5 Rather use `globalSettingsDirectory` instead of `globalBaseDirectory` 2012-03-01 17:23:08 +05:30
Indrajit Raychaudhuri 0fead533c0 Clarify better in deprecation message
Add additional helper method for adding credential
2012-03-01 00:28:12 +05:30
Indrajit Raychaudhuri 7b97b6833f Credentials should be kept in SBT's own global base location
The old convention of keeping credentials in ~/.ivy2 isn't recommended anymore,
they can instead go in (customizable) global base location.

The global base defaults to `~/.sbt`, hence credentials go in `~/.sbt/.credentials`
(c.f. `Keys.globalBaseDirectory` and system property `sbt.global.base`)
2012-02-28 23:01:17 +05:30
Mark Harrah 2137b29aa1 Merge pull request #369 from vigdorchik/Overwrite_setting
Overwrite previous setting if possible.
2012-02-28 07:48:44 -08:00
Indrajit Raychaudhuri 0a6f58a761 Remove use of deprecated `logger(s)` call 2012-02-28 19:07:47 +05:30
Indrajit Raychaudhuri 940b77f940 Make warnings for multiple resolvers with same name more verbose.
Just so that user can figure out more quickly what's going on
2012-02-28 16:33:20 +05:30
Indrajit Raychaudhuri ea08f86520 Added support for providing basic SCM info
Sonatype OSS repo (where many libraries are expected to migrate) requires
populating SCM info in additional to what is already provisioned for
populating in SBT.

We now support populating the basic SCM info as thus:
```
// Usual <scm><url/><connection/></scm>
scmInfo := Some(ScmInfo(url("https://github.com/foo/project"), "scm:git:https://github.com/foo/project.git"))

// Also add <developerConnection/>
scmInfo := Some(ScmInfo(url("https://github.com/foo/project"), "scm:git:https://github.com/foo/project.git", Some("dev_connection")))
```
For anything more esoteric than the basic info, there is always `pomPostProcess` :)
2012-02-28 15:30:51 +05:30
Indrajit Raychaudhuri 4daed3b745 Adjust `packageConfig` Settings to be wrapped within appropriate `inTask` methods 2012-02-28 00:26:23 +05:30
Eugene Vigdorchik 63aa36bd1e More agressive overwrite. 2012-02-27 22:28:09 +04:00
Eugene Vigdorchik bb646d0437 SessionSetting to contain seq of line. 2012-02-27 11:46:23 +04:00
Mark Harrah ec2566047d allow plugins to inject settings at the build level. fixes #378 2012-02-25 12:01:08 -05:00
Eugene Vigdorchik eaa10b7a48 Support multi-line replacements. 2012-02-20 15:52:57 +04:00
Eugene Vigdorchik ff4b42ce45 Merge 2012-02-20 12:30:10 +04:00
Eugene Vigdorchik d23d39cc0f Support multiline settings in build.sbt, assumes set command doesn't allow multiline settings. TODO:tests. 2012-02-20 12:27:26 +04:00
Eugene Vigdorchik e0b2475dd6 Overwrite previous setting if possible. 2012-02-19 00:20:14 +04:00
Eugene Vigdorchik a52d36987c Remember the range for settings read from .sbt files 2012-02-16 16:58:51 +04:00
Eugene Vigdorchik 31735051ea Overwrite previous setting if possible. 2012-02-15 13:06:00 +04:00
Mark Harrah 923acc1258 stable build load order 2012-02-14 21:59:12 -05:00
Mark Harrah b96ceabb80 Ordering instances for ResolvedReference, BuildRef, ProjectRef 2012-02-14 21:59:12 -05:00