Commit Graph

4322 Commits

Author SHA1 Message Date
eugene yokota fc7af22eef Merge pull request #2177 from Duhemm/compiler-interface-logging
Compiler interface sources: Hide Ivy logs & download compiler interface sources in boot directory.
2015-08-26 14:31:25 -04:00
Martin Duhem e31a9ba456 Download compiler interface sources in boot directory 2015-08-26 10:33:11 +02:00
Martin Duhem 41b7208a36 Hide Ivy logs in compiler-interface sources retrieval
Because in most cases there aren't version-specific sources, we expect
the retrieval to fail a number of times before succeeding. This
generates a lot of noise in sbt's log, so the logs will now be shown if
and only all the versions fail.
2015-08-26 09:40:53 +02:00
Josh Suereth da8bb5b621 Merge pull request #2151 from dwijnand/add-Def.settings
Extract Def.settings from Project#settings.
2015-08-25 09:52:27 -04:00
eugene yokota 7bb08fe776 Merge pull request #2172 from dwijnand/add-MavenRepository.localIfFile
Add localIfFile to MavenRepository, & use it.
2015-08-23 17:02:16 -04:00
Dale Wijnand 786dc7fd10 Add notes for MavenRepository.localIfFile. 2015-08-23 17:33:19 +01:00
Dale Wijnand 5662b2ceed Only set LocalIfFileRepo if MavenRepository.localIfFile is set. 2015-08-23 17:25:25 +01:00
Dale Wijnand 0bf7e63887 Add localIfFile to MavenRepository. 2015-08-23 17:24:54 +01:00
Dale Wijnand 9beaf21926 Use string interpolation. 2015-08-20 23:12:17 +01:00
Dale Wijnand dcbbc531ed Add notes for PR 2151. 2015-08-20 18:45:42 +01:00
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
Dale Wijnand 553dffec39 Upgrade to 0.13.9. 2015-08-19 12:16:03 +01: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 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
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 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 66af3adefa Merge pull request #2142 from pdalpra/fix-warnings
Fix additional warnings
2015-08-13 03:27:35 -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 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 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 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 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 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
Pierre DAL-PRA b9171e59ad Simplify operations on collections 2015-08-01 02:25:17 +02:00
eugene yokota 1fff6b2cef Merge pull request #2132 from sbt/wip/bump-ivy
Bump to latest version of ivy.
2015-07-27 21:35:58 -04:00
Josh Suereth eba37d84b1 Bump to latest version of ivy.
Fixes #2118
2015-07-27 16:26:39 -04:00
Josh Suereth ebcb5aeb5e Merge pull request #2128 from sbt/fix/remove-old-urls
Remove reference to dead servers.
2015-07-27 09:26:46 -04:00
Josh Suereth 6e8d0015ed Merge pull request #2129 from sbt/wip/cached-resolution-circular
[0.13.9-RC3] cached resolution: stack overflow when circular dependency is found
2015-07-27 09:26:28 -04:00
Eugene Yokota 792a761599 try breaking circular dependency and continue sorting 2015-07-26 23:19:16 -04:00