eugene yokota
1cbf1aaf28
Merge pull request #1357 from sbt/wip/roll-back-ivy
...
Roll back Ivy to 2.3.0 for 0.13.5 for #1356
2014-05-20 22:43:33 -04:00
ZhiFeng Hu
0f54be9c96
JDK8 compat issue, MaxPermSize removed since JDK 8
2014-05-21 10:41:23 +08:00
Dan Sanduleac
5273aa3a03
Add scripted test to verify ThisProject is resolved properly
2014-05-21 01:16:15 +01:00
Dan Sanduleac
5deb103ef6
Fix resolving Select(ThisProject)
2014-05-21 01:16:15 +01:00
Grzegorz Kossakowski
7849361c82
Remove stale, commented out code from Incremental.scala
...
The commented out code was sitting here since 2010. It bit-rotted to the
point of not being useful anymore. Let's remove it.
2014-05-20 19:51:28 +02:00
Eugene Yokota
d2f07be79d
Roll back Ivy to 2.3.0 for 0.13.5
2014-05-20 12:09:19 -04:00
Josh Suereth
d8a8792946
Merge pull request #1353 from dansanduleac/bugfix/failing-derived-settings-tests
...
SettingsTest: Don't allow generated strings (key names) to be empty
2014-05-20 08:32:53 -04:00
Dan Sanduleac
4eafda7891
Don't allow generated strings (key names) to be empty
2014-05-20 09:02:10 +01:00
eugene yokota
5a0e962d8a
Merge pull request #1349 from paulp/pr/dead-line
...
Remove line of dead code.
2014-05-19 12:33:45 -04:00
Josh Suereth
398385d00c
Merge pull request #1346 from benjyw/sort_analysis_seqs
...
Ensure sequences in analysis files are read in order.
2014-05-19 10:45:13 -04:00
Paul Phillips
e88d1436c5
Remove line of dead code.
...
Unmoored expression in constructor does nothing except pack
on a few micros.
2014-05-19 06:17:44 -07:00
Benjy
00f12c6046
Ensure sequences in analysis files are read in order.
...
For various reasons, we serialize sequences as:
0 -> foo
1 -> bar
...
Until now we were implicitly relying on the sequences being in order.
However external code may end up (due to bugs or otherwise) messing
with the ordering:
1 -> bar
0 -> foo
...
This change ensures that we don't get confused by that. Although
it's best if external code doesn't mess up the ordering, it's still
a good idea to be defensive about this.
Note that the sequences we serialize are short, so the extra sort
is not a performance concern.
2014-05-17 01:04:14 +00:00
eugene yokota
da9f29bd04
Merge pull request #1345 from sbt/wip/cross-publish-libs
...
Add the ability to cross publish libraries and create a command to autom...
2014-05-16 17:20:30 -04:00
Josh Suereth
a1a784bf91
Add the ability to cross publish libraries and create a command to automatically do so.
2014-05-16 16:50:34 -04:00
eugene yokota
253492740b
Merge pull request #1344 from sbt/wip/merge-0.13.5
...
Wip/merge 0.13.5
2014-05-16 14:14:33 -04:00
eugene yokota
7f69facd26
Merge pull request #1344 from sbt/wip/merge-0.13.5
...
Wip/merge 0.13.5
2014-05-16 14:14:33 -04:00
Josh Suereth
7fb665d5fd
Merge remote-tracking branch 'origin/0.13.5' into wip/merge-0.13.5
...
Conflicts:
main/src/main/scala/sbt/Load.scala
2014-05-16 14:04:51 -04:00
Josh Suereth
7d0b517be2
Merge remote-tracking branch 'origin/0.13.5' into wip/merge-0.13.5
...
Conflicts:
main/src/main/scala/sbt/Load.scala
2014-05-16 14:04:51 -04:00
eugene yokota
748ff345a4
Merge pull request #1342 from sbt/wip/fix-build-loaders
...
Fix pattern match on buildLoaders.
2014-05-16 09:10:23 -04:00
Josh Suereth
e95feccfca
Fix pattern match on buildLoaders.
...
Fixes #1341
2014-05-16 07:41:29 -04:00
eugene yokota
f402f9ac9e
Merge pull request #1336 from sbt/wip/compile-with-2.11
...
Bump expected 2.11 module versions so we can compile with 2.11
2014-05-15 09:13:36 -04:00
Josh Suereth
abffc3e1bd
Bump expected 2.11 module versions so we can compile with 2.11
...
Add scala 2.11 test/build verification.
* Add 2.11 build configuratoin to travis ci
* Create command which runs `safe` unit tests
* Create command to test the scala 2.11 build
* Update scalacheck to 1.11.4
* Update specs2 to 2.3.11
* Fix various 2.11/deprecation removals
and other changes.
Fix eval test failure in scala 2.11 with XML not existing.
2014-05-14 19:08:05 -04:00
eugene yokota
9399f263f9
Merge pull request #1334 from sbt/wip/merge-0.13.5
...
Wip/merge 0.13.5
2014-05-14 09:06:09 -04:00
eugene yokota
1d67d42da3
Merge pull request #1334 from sbt/wip/merge-0.13.5
...
Wip/merge 0.13.5
2014-05-14 09:06:09 -04:00
eugene yokota
d1b6410c02
Merge pull request #1333 from sbt/wip/fix-derived-setting-tests
...
Fixed project/derived test to pass
2014-05-14 09:05:59 -04:00
Josh Suereth
f848a36b40
Merge remote-tracking branch 'origin/0.13.5' into wip/merge-0.13.5
...
Conflicts:
main/src/main/scala/sbt/EvaluateTask.scala
2014-05-13 19:31:44 -04:00
Josh Suereth
81ae2fa582
Merge remote-tracking branch 'origin/0.13.5' into wip/merge-0.13.5
...
Conflicts:
main/src/main/scala/sbt/EvaluateTask.scala
2014-05-13 19:31:44 -04:00
Josh Suereth
ebab164a41
Disable failing derived test for now.
...
* Disable test of derived setting which depends on itself
* Not sure we even care about supporting that feature.
2014-05-13 18:27:22 -04:00
Josh Suereth
148b578681
Fix project load ordering to match 0.13.5 and previous.
...
* root project needs to be discovered FIRST in the list.
* All other rpojects come in the order they were seen.
2014-05-13 18:27:04 -04:00
Josh Suereth
bb8bb1e667
Merge pull request #1328 from gkossakowski/cleanup-incremental-tests
...
Cleanup incremental tests
2014-05-13 14:52:47 -04:00
Josh Suereth
d80a39b78f
Merge pull request #1330 from pvlugter/cross-update-cache
...
Use separate update caches when cross compiling scala
2014-05-13 14:52:11 -04:00
eugene yokota
d509ff83a1
Merge pull request #1332 from sbt/wip/disable-force-gc
...
Default force gc to false
2014-05-13 14:47:46 -04:00
Josh Suereth
015ccf2fae
Modify changes with latest RC changes.
2014-05-13 13:56:25 -04:00
Josh Suereth
664d83ed0f
Back out autogc fix to be optionally enabled.
...
Workaround for #1329
2014-05-13 13:14:39 -04:00
Peter Vlugter
7948fbafbc
Use separate update caches when cross compiling scala
2014-05-13 16:14:30 +12:00
Grzegorz Kossakowski
658e1928cc
Update comments in `inc-ant-style` scripted test.
...
I forgot to update comments after copy&pasting the test. The updated
comments describe what's being tested related to Ant mode.
2014-05-12 16:15:35 +02:00
Grzegorz Kossakowski
2ec6f5c589
Use new sbt syntax for defining `check-compilations` task.
...
Some scripted tests define `check-compilations` task. We can refactor them
to be more readable by using new `.value` syntax.
2014-05-12 16:11:49 +02:00
Eugene Yokota
d84f729b39
Updated on Changes.rst
2014-05-09 15:30:39 -04:00
eugene yokota
066a12cd2a
Merge pull request #1320 from sbt/wip/bump-root-version
...
Bump version number for next bout of development.
2014-05-09 11:28:35 -04:00
Grzegorz Kossakowski
53555a8e04
Merge pull request #1319 from gkossakowski/name-hashing-for-sbt-itself
...
Enable name hashing algorithm in sbt build.
2014-05-09 16:51:07 +02:00
Josh Suereth
979f5d615b
Merge pull request #1317 from gkossakowski/ant-style-inc
...
Add Ant-style incremental compilation mode
2014-05-09 08:50:42 -04:00
Josh Suereth
4fbd376afb
Merge pull request #1318 from sbt/topic/1314
...
Check for object autoImport in auto plugins.
2014-05-09 08:43:24 -04:00
Josh Suereth
98ed08a976
Bump version number for next bout of development.
2014-05-09 08:32:55 -04:00
Grzegorz Kossakowski
436e7078fb
Enable name hashing algorithm in sbt build.
...
The name hashing seems to be stable enough for sbt to use it by default
now. It also greatly improves incremental compilation experience for
people working on sbt sources.
2014-05-09 14:18:46 +02:00
Eugene Yokota
2b621869fc
Check for object autoImport in auto plugins. Fixes #1314
2014-05-08 21:54:04 -04:00
Grzegorz Kossakowski
680713f666
Add Ant-style incremental compilation mode.
...
This commit implements an Ant-style incremental compilation mode. This mode
emulates what Ant's scalac command does. It recompiles just changed source
files and does not perform any invalidation of dependencies.
This is a very naive mode of incremental compilation that very often leads
to broken binaries.
The Ant-style mode is being introduced because Scala team needs it for
migration of Scala compiler to sbt. The name hashing algorithm doesn't
work well with Scala compiler sources due to deep inheritance chains.
There's a plan to refactor compiler's code to use more composition instead
of inheritance.
Once Scala compiler sources are refactored to work well with name hashing
algorithm, Ant-style mode will be deleted immediately.
2014-05-08 20:29:02 +02:00
Grzegorz Kossakowski
ba88236b31
Add `antStyle` to IncOptions.
...
Add an option that enables (to be implemented) Ant-style mode of
incremental compilation.
This option is unsupported and may go away at any point in the future.
NOTE: Either `antStyle` or `nameHashing` mode can be enabled. This is
being enforced with runtime assertion.
2014-05-08 20:28:16 +02:00
Grzegorz Kossakowski
0cbbe8c2ed
Add pending scripted test for Ant-style compilation.
...
Add pending test for Ant-style incremental compilation. In that mode
incremental compiler will recompile only the source files that were changed
by the user and won't try to invalidate any dependencies.
Once Ant-style incremental compilation is implemented this test should be
passing.
2014-05-08 20:28:16 +02:00
eugene yokota
3b1d63d0c9
Merge pull request #1312 from sbt/wip/dsl-enable-plugins
...
Expand the DSL abilities with Project manipulations
2014-05-08 14:25:17 -04:00
Josh Suereth
dd263341fa
Bump travis memory settings.
2014-05-08 07:36:41 -04:00