luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,460 Commits 29 Branches 314 Tags 78 MiB
Commit Graph

5460 Commits

Author SHA1 Message Date
Dale Wijnand 13c6729507 Extract Def.settings from Project#settings. 
This allows for the same functionality that using SettingsDefinition in
Project#settings allows (specifying either bare Setting[_] or a Seq[Setting[_]])
to be available outside of the settings for a project, for instance when
defining a val.

In short, it allows:

    val modelSettings = Def.settings(
      sharedSettings,
      libraryDependencies += foo
    )
 2015-08-20 18:45:41 +01:00
eugene yokota 5a7a1db24b Merge pull request #2166 from dwijnand/upgrade-to-0.13.9 
Upgrade to 0.13.9.
 2015-08-20 11:51:52 -04:00
eugene yokota 3e33ffd5c0 Merge pull request #2152 from dwijnand/revert-travis-workaround 
Revert Travis/sbt-extras workaround. (#2124).
 2015-08-20 11:51:26 -04:00
Eugene Yokota 527dd51aa0 move modules around. 2015-08-20 00:59:57 -04:00
Martin Duhem 337bca1c74 Disable project / session-save 2015-08-19 16:16:16 +02:00
Dale Wijnand 553dffec39 Upgrade to 0.13.9. 2015-08-19 12:16:03 +01:00
Martin Duhem 29e6764a05 Mark passing pending scripted tests as passing 
The following scripted tests are pending but pass:

 - dependency-management / gh-1484-npe
 - source-dependencies / implicit-search-companion-scope
 - tests / arguments-new

The test dependency-management / publish-local passes but is considered
as flaky, and is thus disabled (see
6424adadcb).
 2015-08-19 11:29:13 +02:00
Martin Duhem d84573c9d3 Include pending scripted tests in * and *aofb 2015-08-19 09:11:02 +02:00
Martin Duhem bce77a1ecc Continue to run tests after passing pending test 2015-08-19 08:26:21 +02:00
eugene yokota 9349094e65 Merge pull request #2158 from twitter-forks/stuhood/fix-error-message-when-name-hashing-is-enabled 
Fix error when name hashing is enabled and mixed with non-enabled
 2015-08-18 17:55:43 -04:00
eugene yokota 3e7d71c5c2 Merge pull request #2158 from twitter-forks/stuhood/fix-error-message-when-name-hashing-is-enabled 
Fix error when name hashing is enabled and mixed with non-enabled
 2015-08-18 17:55:43 -04:00
eugene yokota 296a266add Merge pull request #2154 from dwijnand/update-CONTRIBUTING-for-0.13.9 
Update CONTRIBUTING for 0.13.9.
 2015-08-18 17:55:31 -04:00
Martin Duhem 1b2750be7a Mark passing pending scripted tests as failures 2015-08-18 15:38:36 +02:00
Martin Duhem ca1de3836e Mark test source-dependencies/trait-super as fixed 
It appears to have been fixed by #2160
 2015-08-18 15:17:37 +02:00
eugene yokota 53ef1c5f18 Merge pull request #2160 from Duhemm/fix-2155 
Include private members in API hash of traits.
 2015-08-17 15:05:30 -04:00
Martin Duhem 8a31702253 Add overloads to restore binary compatibility 2015-08-17 16:31:09 +02:00
Martin Duhem 40ebc82531 Include private members in API hash of traits. 
During compilation, scalac generates getters and setters for the fields
of traits, regardless of their access modifiers. Therefore, when a
field of a trait is modified, all its implementors must be recompiled to
take these changes into account.

Private fields of traits were not included in the API hash of traits,
and their implementors were thus not recompiled when modified.

This commit changes the way the API hash is computed for traits only, so
that the generated hash includes the private members of traits.

Fixes sbt/sbt#2155
 2015-08-17 11:59:48 +02:00
Stu Hood 1b6dbc90c1 Fix error message when name hashing is enabled and mixed with non-enabled. 2015-08-15 11:55:31 -07:00
Dale Wijnand 974390b66f Update CONTRIBUTING for 0.13.9. 2015-08-13 09:30:41 +01:00
Dale Wijnand 520a9af491 Revert Travis/sbt-extras workaround. (#2124). 2015-08-13 09:04:21 +01:00
eugene yokota 693364a3d4 Merge pull request #2143 from dwijnand/scala-2.11.7 
Update scala211 to 2.11.7.
 2015-08-13 03:27:50 -04:00
eugene yokota b7c331b267 Merge pull request #2143 from dwijnand/scala-2.11.7 
Update scala211 to 2.11.7.
 2015-08-13 03:27:50 -04:00
eugene yokota af506f57b6 Merge pull request #2142 from pdalpra/fix-warnings 
Fix additional warnings
 2015-08-13 03:27:35 -04:00
eugene yokota 66af3adefa Merge pull request #2142 from pdalpra/fix-warnings 
Fix additional warnings
 2015-08-13 03:27:35 -04:00
eugene yokota 18f37815c8 Merge pull request #2145 from jaceklaskowski/doc-contributing 
Docs update: the launcher is in launch/target/sbt-launch.jar
 2015-08-13 03:26:01 -04:00
eugene yokota 22702ca0e5 Merge pull request #2145 from jaceklaskowski/doc-contributing 
Docs update: the launcher is in launch/target/sbt-launch.jar
 2015-08-13 03:26:01 -04:00
eugene yokota 2aea16baf7 Merge pull request #2147 from dwijnand/merge-0.13.9-into-0.13 
Merge 0.13.9 into 0.13.
 2015-08-13 03:25:08 -04:00
eugene yokota 739f1c6f69 Merge pull request #2147 from dwijnand/merge-0.13.9-into-0.13 
Merge 0.13.9 into 0.13.
 2015-08-13 03:25:08 -04:00
Dale Wijnand c5a32cb17a Merge remote-tracking branch 'origin/0.13.9' into merge-0.13.9-into-0.13 
* origin/0.13.9:
  Notes
  0.13.9
  cached resolution: use mutable map to speed up breakLoops
  cached resolution: don't include callers from evicted modules
  Add debug logs
  Fixes #2129. break up circular dependency loops in cached resolution
  try breaking circular dependency and continue sorting
  refactored to use less stack space
  make sortModules tailrec
  Reproduce stack overflow using cached resolution with circular dependency
 2015-08-11 22:42:31 +01:00
Dale Wijnand a432c3def1 Merge remote-tracking branch 'origin/0.13.9' into merge-0.13.9-into-0.13 
* origin/0.13.9:
  Notes
  0.13.9
  cached resolution: use mutable map to speed up breakLoops
  cached resolution: don't include callers from evicted modules
  Add debug logs
  Fixes #2129. break up circular dependency loops in cached resolution
  try breaking circular dependency and continue sorting
  refactored to use less stack space
  make sortModules tailrec
  Reproduce stack overflow using cached resolution with circular dependency
 2015-08-11 22:42:31 +01:00
Eugene Yokota 946ee17081 Notes 2015-08-11 17:24:55 -04:00
Eugene Yokota 10afc1f0a1 0.13.9 2015-08-10 20:32:24 -04:00
eugene yokota e72f83e0e4 Merge pull request #2146 from sbt/wip/cached-resolution-circular3 
cached resolution: don't include callers from evicted modules
 2015-08-10 19:32:27 -04:00
Jacek Laskowski 5e6cf54329 Docs update: the launcher is in launch/target/sbt-launch.jar 2015-08-09 00:34:57 +02:00
Pierre DAL-PRA 8f1fb2d232 Fix additional warnings 2015-08-07 00:23:14 +02:00
Dale Wijnand 07d7cdcb51 Update scala211 to 2.11.7. 2015-08-05 23:10:56 +01:00
Eugene Yokota 868740a2ae cached resolution: use mutable map to speed up breakLoops 2015-08-05 07:01:21 -04:00
Eugene Yokota dd94cb90d9 cached resolution: don't include callers from evicted modules 2015-08-05 07:00:39 -04:00
Josh Suereth 7f902da73b Merge pull request #2140 from dwijnand/set-version-to-0.13.10-SNAPSHOT 
Set version to 0.13.10-SNAPSHOT.
 2015-08-04 14:18:56 -04:00
Josh Suereth 39462b6e36 Merge pull request #2140 from dwijnand/set-version-to-0.13.10-SNAPSHOT 
Set version to 0.13.10-SNAPSHOT.
 2015-08-04 14:18:56 -04:00
eugene yokota 668afafc08 Merge pull request #2139 from pdalpra/drop-procedure-syntax 
Replace procedure syntax by explicit Unit annotation
 2015-08-04 11:32:07 -04:00
eugene yokota be8175ba0c Merge pull request #2139 from pdalpra/drop-procedure-syntax 
Replace procedure syntax by explicit Unit annotation
 2015-08-04 11:32:07 -04:00
Pierre DAL-PRA f1bc128e51 Replace procedure syntax by explicit Unit annotation 2015-08-04 10:07:38 +02:00
Pierre DAL-PRA 54d54b9f4f Replace procedure syntax by explicit Unit annotation 2015-08-04 10:07:38 +02:00
Dale Wijnand a0ac6033f6 Set version to 0.13.10-SNAPSHOT. 2015-08-03 22:18:33 +01:00
Josh Suereth 303b0681da Merge pull request #2137 from pdalpra/clean-ops-on-collections 
Clean ops on collections
 2015-08-03 12:22:51 -04:00
Josh Suereth 856a30b43d Merge pull request #2138 from sbt/wip/cached-resolution-circular2 
[0.13.9-RC3] Fixes #2129. break up circular dependency loops in cached resolution
 2015-08-03 12:22:36 -04:00
Eugene Yokota ff729643e3 Add debug logs 2015-08-03 08:17:48 -04:00
Eugene Yokota 431a90264d Fixes #2129. break up circular dependency loops in cached resolution 
Simple remove-one method to workaround for circular dependency did not
work. This fix traverses the entire graph to detect all loops and then
breaks them up.
 2015-08-03 07:31:32 -04:00
Pierre DAL-PRA f0bd9001e6 Remove redundant collection conversions 2015-08-01 12:05:35 +02:00