Commit Graph

11744 Commits

Author SHA1 Message Date
Josh Suereth 68e7c9a2b6 Merge pull request #1304 from sbt/wip/scalariform
scalariform
2014-05-01 19:22:41 -04:00
Josh Suereth 9c296f96fb Fix typo. 2014-05-01 14:10:35 -04:00
Josh Suereth debe03e0c7 Merge branch 'master' of github.com:sbt/sbt-launcher-package 2014-05-01 14:09:01 -04:00
Josh Suereth c627388102 Bump for bintray publishing. 2014-05-01 14:08:27 -04:00
Eugene Yokota 2b526e6aa7 added scalariform 2014-05-01 12:50:07 -04:00
Eugene Yokota 9fe27afe37 added scalariform 2014-05-01 12:50:07 -04:00
Eugene Yokota 4258189951 added scalariform 2014-05-01 12:50:07 -04:00
Eugene Yokota adb41611cf added scalariform 2014-05-01 12:50:07 -04:00
Eugene Yokota b730c00b75 sbt 0.13.2 2014-05-01 12:05:52 -04:00
eugene yokota 5c630eb8aa Merge pull request #1036 from dansanduleac/derivedSettings
Allow derived settings to replace previously-defined but non-default settings
2014-05-01 11:53:42 -04:00
eugene yokota c3af4b7450 Merge pull request #1036 from dansanduleac/derivedSettings
Allow derived settings to replace previously-defined but non-default settings
2014-05-01 11:53:42 -04:00
Josh Suereth 04e32b7859 Merge pull request #1303 from sbt/wip/merge-0.13.2
Merge 0.13.2
2014-05-01 10:51:50 -04:00
Jarek Sacha e69a0bc79e Added links to `imagej` and `install4j` plugins 2014-05-01 09:55:59 -04:00
rschatz 13322a2d0d added npt as new Utility Plugin 2014-05-01 09:55:53 -04:00
Josh Suereth 26b7a5cea1 removing last type in python conf. 2014-05-01 09:55:46 -04:00
Josh Suereth 2adbe0e1e8 Fix for new location of MSI files. 2014-05-01 09:55:32 -04:00
Josh Suereth 1508c967a9 Fix native package location for bintray distribution. 2014-05-01 09:55:26 -04:00
Dan Sanduleac 1e9dee900a Add 2 derived settings tests:
1) non-default derived settings, if they produce anything, the settings
   they produce must supersede previous assignents (in the settings seq)
   to the same key.

2) even if a derived setting is scoped at a higher scope (e.g.
   ThisBuild) the settings it produces are scoped at the intersection of
   that (the defining) scope and the scope of the triggering dependency.

2 is particularly nice as it enables this behaviour:
    derive(b in ThisBuild := a.value + 1)
    a in project1 := 0
    // a could be defined in all projects
    ==>
    Now (b in project1).value == (a in project1).value + 1 == 1
    and similarly in all other projects
    all with a single derived setting
2014-05-01 03:11:22 +01:00
Dan Sanduleac 96c7864088 Add 2 derived settings tests:
1) non-default derived settings, if they produce anything, the settings
   they produce must supersede previous assignents (in the settings seq)
   to the same key.

2) even if a derived setting is scoped at a higher scope (e.g.
   ThisBuild) the settings it produces are scoped at the intersection of
   that (the defining) scope and the scope of the triggering dependency.

2 is particularly nice as it enables this behaviour:
    derive(b in ThisBuild := a.value + 1)
    a in project1 := 0
    // a could be defined in all projects
    ==>
    Now (b in project1).value == (a in project1).value + 1 == 1
    and similarly in all other projects
    all with a single derived setting
2014-05-01 03:11:22 +01:00
Dan Sanduleac eb93fdd7a6 Improve SettingsExample to allow orthogonal scopes (like projects/tasks) at a certain nestIndex 2014-05-01 03:09:50 +01:00
Dan Sanduleac 0489fa817b Improve SettingsExample to allow orthogonal scopes (like projects/tasks) at a certain nestIndex 2014-05-01 03:09:50 +01:00
Dan Sanduleac 767e2487d0 Couple of fixes 2014-05-01 01:35:48 +01:00
Dan Sanduleac 512494cd04 Couple of fixes 2014-05-01 01:35:48 +01:00
Dan Sanduleac 962f0bad76 Optimise scope intersection for GlobalScope 2014-05-01 01:35:48 +01:00
Dan Sanduleac 0377a40cf8 Optimise scope intersection for GlobalScope 2014-05-01 01:35:48 +01:00
Dan Sanduleac decd323b64 Decouple DefaultSetting from Setting/DerivedSetting; BuildCommon.derive() produces default settings by default 2014-05-01 01:35:48 +01:00
Dan Sanduleac f485270adf Put sbt's derived settings under GlobalScope 2014-05-01 01:35:48 +01:00
Dan Sanduleac 6f5242d812 Derive settings only under the scope of the DerivedSetting 2014-05-01 01:35:48 +01:00
Dan Sanduleac 3161d75a41 Decouple DefaultSetting from Setting/DerivedSetting; BuildCommon.derive() produces default settings by default 2014-05-01 01:35:48 +01:00
Dan Sanduleac 431c61775c Derived settings to replace their DerivedSetting, not go at the beginning 2014-05-01 01:35:48 +01:00
Dan Sanduleac 4f7b6e269b Derive settings only under the scope of the DerivedSetting 2014-05-01 01:35:48 +01:00
Dan Sanduleac 89d2aa291c DerivedSetting not a DefaultSetting anymore 2014-05-01 01:35:48 +01:00
Dan Sanduleac ae5af2116f Derived settings to replace their DerivedSetting, not go at the beginning 2014-05-01 01:35:48 +01:00
Dan Sanduleac e06c4efe4f DerivedSetting not a DefaultSetting anymore 2014-05-01 01:35:48 +01:00
Josh Suereth c855dbd854 Merge pull request #1300 from cunei/wip-fix-ivy-move
Do not attempt to publish if no artifacts are present
2014-04-30 14:41:51 -04:00
Antonio Cunei 350619545d Do not attempt to publish if no artifacts are present
Ivy transactional publishing will abort if no artifacts
are published, either because the temporary directory is
not being created, or because Ivy will detect an anomalous
condition.

Therefore, skip publishing altogether if there is
nothing to publish to begin with.
2014-04-30 17:40:58 +02:00
Josh Suereth 09b4ae7711 Merge pull request #66 from rtyley/only-specify-permgen-pre-java-8
Don't pass MaxPermSize to Java 8+
2014-04-29 08:38:17 -04:00
eugene yokota b10e094223 Merge pull request #1270 from oscarvarto/spanishTranslation
Initial Spanish translation of documentation
2014-04-28 11:25:58 -04:00
eugene yokota a0509c084d Merge pull request #1270 from oscarvarto/spanishTranslation
Initial Spanish translation of documentation
2014-04-28 11:25:58 -04:00
eugene yokota 2a0fef6700 Merge pull request #1270 from oscarvarto/spanishTranslation
Initial Spanish translation of documentation
2014-04-28 11:25:58 -04:00
eugene yokota 42c1fdcd5c Merge pull request #1296 from sbt/wip/revert-scala-2.11
Revert "add precompiled 2.11.0"
2014-04-28 11:22:42 -04:00
Josh Suereth 3121f2f278 Revert "add precompiled 2.11.0"
This reverts commit 36ec103274.

This 2.11.0 dependency was causing issues with older sbt launchers
attempting to use the 2.11.0 scala release for sbt's classloader,
leading to binary incompatibility issues.
2014-04-28 07:46:44 -04:00
Josh Suereth c61bef7c35 Merge pull request #1295 from zavakid/0.13
add sbt-one-log into Community Plugins
2014-04-28 07:42:03 -04:00
Josh Suereth 1fca869941 Merge pull request #1292 from jaceklaskowski/docs-resourceGenerators
Removing remaining mentions of "<+="
2014-04-28 07:35:24 -04:00
Zava 1cb1da5184 add sbt-one-log into Community Plugins 2014-04-28 11:57:16 +08:00
Jacek Laskowski 1a0ca0a7a5 Removing remaining mentions of "<+=" 2014-04-27 21:39:49 +02:00
Josh Suereth 71b3d5ea30 Merge pull request #1291 from jaceklaskowski/docs-externalIvyFile
Def.setting needed for externalIvyFile
2014-04-27 09:26:50 -04:00
Jacek Laskowski b31c8740e3 Def.setting needed for externalIvyFile 2014-04-27 00:04:40 +02:00
Josh Suereth 3aeee0af03 Merge pull request #1285 from jaceklaskowski/docs-changes-alone
Docs changes alone
2014-04-25 07:56:56 -04:00
Josh Suereth dc97171a08 Merge pull request #1285 from jaceklaskowski/docs-changes-alone
Docs changes alone
2014-04-25 07:56:56 -04:00