13a00ff37b
Merge pull request #1377 from havocp/wip/havocp-server-launch-errors
...
Read stderr from server for a short time before exiting
2014-06-03 16:03:06 -04:00
626e5455d5
Merge pull request #1383 from xuwei-k/scripted-parser
...
use custom scriptedParser instead of spaceDelimited parser
2014-06-03 16:01:00 -04:00
4768d52759
Merge pull request #1350 from sbt/wip/fix-release-scripts
...
Fix bug in release script due to typo.
2014-06-02 14:36:33 -04:00
4e6ce490a0
merge with master
2014-06-02 13:44:07 -04:00
ff9c7d253b
Merge pull request #1378 from sbt/wip/fix-default-generated-projects
...
Allow autogenerated projects to have overridden organization.
2014-05-29 14:32:17 -04:00
0ffa703c2c
Merge pull request #1352 from dansanduleac/issues/1084
...
Don't inject global plugins' classpath into that of builds, and autotrigger build.update if GP.updated
2014-05-29 12:29:45 -04:00
d9b1f7165f
Merge pull request #1376 from sbt/wip/fix-doc-generation
...
Merge 0.13.5 into 0.13
2014-05-28 17:16:15 -04:00
639faf4623
Merge remote-tracking branch 'origin/0.13.5' into wip/fix-doc-generation
...
Conflicts:
project/Sbt.scala
2014-05-28 09:09:51 -04:00
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
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
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
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
38a0c16eff
Merge pull request #1304 from sbt/wip/scalariform
...
scalariform
2014-05-01 19:22:41 -04:00
9fe27afe37
added scalariform
2014-05-01 12:50:07 -04:00
b10e094223
Merge pull request #1270 from oscarvarto/spanishTranslation
...
Initial Spanish translation of documentation
2014-04-28 11:25:58 -04:00
3aeee0af03
Merge pull request #1285 from jaceklaskowski/docs-changes-alone
...
Docs changes alone
2014-04-25 07:56:56 -04:00
a57abbcd6a
Merge pull request #1286 from jaceklaskowski/reload-detailed-help
...
Detailed help for the reload command (following project's)
2014-04-25 07:55:23 -04:00
c6ab77e60d
Merge pull request #1236 from urbas/0.13
...
Implemented the fileParser and added DynamicExamples.
2014-04-25 07:54:31 -04:00
4b3252b27f
Merge remote-tracking branch 'remotesbt/0.13' into 0.13
2014-04-18 13:48:19 +01:00
16f2238ce1
Merge pull request #1255 from sbt/wip/remove-depreated-evaluate-task-call
...
Remove deprecated EvaluateTask usage for new, easier to update variant.
2014-04-16 14:33:10 -04:00
01dbbc8607
Merge pull request #1263 from sbt/wip/docs-and-cleanups
...
addPlugins => enablePlugins
2014-04-16 13:59:40 -04:00
7f995d811b
Merge pull request #1250 from gkossakowski/namehashing-cleanup
...
Move NameHashing from incremental to api subproject.
2014-04-16 00:18:27 +02:00
d6f2121b42
Merge pull request #1254 from gkossakowski/classFileManager-logging
...
Add debug logging in ClassfileManager
2014-04-13 16:05:18 +02:00
e5c06c4b89
Merge pull request #1253 from sbt/wip/fix-1247
...
FIx configuration ordering issues in sbt 0.13.5
2014-04-10 10:21:49 -07:00
a4101d7979
Merge pull request #1226 from sbt/wip/bump-to-latest-ivy
...
Bump to our own release of ivy 2.4.x
2014-04-10 10:15:26 -07:00
e217a64aee
Merge pull request #1242 from sbt/wip/cancel-task-hooks
...
Add task cancellation hooks into the build definition.
2014-04-08 23:32:46 -07:00
587912a253
Merge pull request #1243 from gkossakowski/clarify-compilations
...
Clarify the role and uses cases of Analysis.compilations.
2014-04-08 21:27:08 -04:00
15d2770fae
Merge pull request #1238 from Duhemm/issue-1237
...
Handle macros that have themselves as original tree (Fix #1237 )
2014-04-09 01:40:29 +02:00
46c4fd80e2
Merge pull request #1241 from jaceklaskowski/follow-deprecation
...
Follow deprecation
2014-04-08 11:11:40 -04:00
2f42c1385f
Merge branch '0.13' into follow-deprecation
2014-04-07 22:20:55 +02:00
155af80b36
Merge pull request #1232 from sbt/wip/fix-1156
...
Ensure that if artifact is published, we overwrite default checksums.
2014-04-07 08:36:16 -07:00
3629c657a1
Merge pull request #1065 from jaceklaskowski/string-interpolation-follow-deprecation
...
Use string interpolation and replace deprecated methods
2014-04-07 11:22:19 -04:00
9b3b2d6588
Merge pull request #1064 from jaceklaskowski/javadoc-changes
...
Javadoc changes
2014-04-07 10:02:35 -04:00
4dd4d670d7
Merge pull request #1168 from retronym/ticket/1107
...
Fix NPE in task macro accessing q"{...}".symbol.pos
2014-03-10 08:38:23 -04:00
f66830eed9
Fix NPE in task macro accessing q"{...}".symbol.pos
...
We shouldn't assume that the qualifier of a `Select` is a
`SymTree`; it may be a `Block`. One place that happens
is after the transformation of named/defaults applications.
That causes the reported `NullPointerException'.
In any case, using `qual.symbol.pos` sense here; it yields the
position of the defintions *referred to* by `qual`, not the
position of `qual` itself.
Both problems are easily fixed: use `qual.pos` instead.
Fixes #1107
2014-03-10 10:28:19 +01:00
c398b1bf64
Merge pull request #1166 from retronym/ticket/1150
...
Fix task macro's handling of Symbol owners in <qual>.value
2014-03-09 09:48:33 -04:00
ef826584c2
Fix task macro's handling of Symbol owners in <qual>.value
...
The qualifier of the `.value` call may contain `DefTree`s (e.g.
vals, defs) or `Function` trees. When we snip them out of the
tree and graft them into a new context, we must also call
`changeOwner`, so that the symbol owner structure and the tree
structure are coherent.
Failure to do so resulted in a crash in the compiler backend.
Fixes #1150
2014-03-09 12:20:24 +01:00
84b79f9bc1
Revert "Fix task macro's handling of Symbol owners in <qual>.value"
...
This reverts commit 3017bfcd07
2014-03-07 22:25:29 -05:00
ff6649b329
Merge pull request #1145 from sbt/wip/issue-1136
...
Fix #1136 - Ivy's + dependency ranges not converted appropriately to maven.
2014-03-07 17:22:29 -05:00
1ed3daf169
Merge pull request #1157 from retronym/ticket/1150
...
Fix task macro's handling of Symbol owners in <qual>.value
2014-03-07 12:02:04 -05:00
abb38da063
Fix task macro's handling of Symbol owners in <qual>.value
...
The qualifier of the `.value` call may contain `DefTree`s (e.g.
vals, defs) or `Function` trees. When we snip them out of the
tree and graft them into a new context, we must also call
`changeOwner`, so that the symbol owner structure and the tree
structure are coherent.
Failure to do so resulted in a crash in the compiler backend.
Fixes #1150
2014-03-07 17:53:14 +01:00
f411379f0d
Merge pull request #1115 from metasim/Structure-docs
...
Added basic documentation for DefinableSetting, inferring behavior from implementation.
2014-03-03 14:16:21 -05:00
7c9ee6e687
Merge pull request #1127 from retronym/topic/2.11-2.10-source-compat
...
using compat._ to plug source compatibility breakages
2014-02-20 16:09:48 -05:00
ce812655e5
Merge pull request #1130 from sbt/wip/auto-plugins
...
AUTO PLUGIN FEATURE!!!!
2014-02-20 16:08:01 -05:00
c531c87001
Merge pull request #1126 from jozic/no-def-package
...
explicitly disapprove plugins using default package
2014-02-19 09:13:39 -05:00
b34aa0e563
using compat._ to plug source compatibility breakages
...
This commit makes the code source compatible across Scala 2.10.3
and https://github.com/scala/scala/pull/3452 , which is proposed
for inclusion in Scala 2.11.0-RC1.
We only strictly need the incremental compiler to build on Scala
2.11, as that is integrated into the IDE. But we gain valuable
insight into compiler regressions by building *all* of SBT with
2.11.
We only got there recently (the 0.13 branch of SBT now fully cross
compiles with 2.10.3 and 2.11.0-SNAPSHOT), and this aims to keep
things that way.
Once 2.10 support is dropped, SBT macros will be able to exploit
the new reflection APIs in 2.11 to avoid the need for casting
to compiler internals, which aren't governed by binary compatibility.
This has been prototyped by @xeno-by: https://github.com/sbt/sbt/pull/1121
2014-02-17 14:53:59 +01:00
29c319b5e0
Merge pull request #1114 from gkossakowski/scala-2.11.0-M8
...
Remove work-arounds for Scala 2.11 problematic dependencies
2014-02-12 15:27:23 +01:00
897fa1fb84
Merge pull request #1111 from D-Roch/patch-1
...
Update Community-Plugins.rst
2014-02-12 08:23:49 -05:00
62072ebcca
Merge pull request #1113 from retronym/ticket/si-8263
...
Scala 2.11 compatibility
2014-02-12 14:05:47 +01:00
10ed229004
SI-8263 Avoid SOE in Symbol#logicallyEnclosingMember under Scala 2.11
...
Since the fix for SI-2066, Scala 2.11 calls logicallyEnclosingMember on the
`x` in the expansion of the task macro:
InitializeInstance.app[[T0[x]](T0[java.io.File], T0[java.io.File]), Seq[java.io.File]]
This exposed the fact that SBT has created `T0` with `NoSymbol` as
the owner. This led to the a SOE.
I will also change the compiler to be more tolerant of this, but we
can observe good discipline in the macro and pick a sensible owner.
2014-02-12 13:30:46 +01:00
Josh Suereth
eugene yokota
Matej Urbas
Grzegorz Kossakowski
Jacek Laskowski
Jason Zaugg