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

78 Commits

Author SHA1 Message Date
Josh Suereth 7f71aafc7c Merge pull request #1520 from sbt/fix/1514 
Fixes #1514, #321. Fixes -SNAPSHOT issue by re-implemeting ChainResolver
 2014-08-12 10:04:10 -04:00
Josh Suereth ae8f99daa9 Merge pull request #1491 from sbt/fix/528 
Unresolved dependency warning includes source position. Fixes #528
 2014-08-11 07:51:33 -04:00
eugene yokota 6a257b06df Merge pull request #1498 from sbt/wip/fix-broken-cross 
Fix broken cross versioning semantics using +
 2014-08-04 17:38:34 -04:00
eugene yokota 23d9eeb6f5 Merge pull request #1497 from sbt/wip/0.13.5-merge 
0.13.5 merge
 2014-08-04 11:51:11 -04:00
Eugene Yokota 57c1da19d7 Merged 0.13.5 to remove documents 2014-08-04 10:14:46 -04:00
Josh Suereth abac4c1445 Merge pull request #1400 from dpratt/0.13 
Add 'scala-jar' to the list of jar artifacts.
 2014-07-03 11:57:12 -04:00
Josh Suereth bb2635a695 Merge pull request #1367 from dansanduleac/issue/1366 
Don't update classifiers of projectDependencies
 2014-07-02 10:09:45 -04:00
David Pratt 75403c698d Merge remote-tracking branch 'upstream/0.13' into 0.13 2014-06-09 13:56:16 -05:00
eugene yokota ba27c2d49d Merge pull request #1391 from sbt/wip/1390 
Improve test failure message for #1390.
 2014-06-06 13:24:11 -04:00
Josh Suereth 2c8a28ebd7 Merge pull request #1397 from havocp/wip/havocp-try-harder-for-errors 
Try harder to get diagnostics on server launch failure
 2014-06-06 10:04:41 -04:00
Josh Suereth 7b6352a7b5 Merge pull request #1396 from skyluc/2.12-support 
Adds support for Scala 2.12
 2014-06-05 16:26:21 -04:00
Josh Suereth 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
Josh Suereth 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
eugene yokota 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
Josh Suereth 4e6ce490a0 merge with master 2014-06-02 13:44:07 -04:00
eugene yokota 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
eugene yokota 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
eugene yokota 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
Josh Suereth 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
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
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
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
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 38a0c16eff Merge pull request #1304 from sbt/wip/scalariform 
scalariform
 2014-05-01 19:22:41 -04:00
Eugene Yokota 9fe27afe37 added scalariform 2014-05-01 12:50:07 -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
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 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
Josh Suereth c6ab77e60d Merge pull request #1236 from urbas/0.13 
Implemented the fileParser and added DynamicExamples.
 2014-04-25 07:54:31 -04:00
Matej Urbas 4b3252b27f Merge remote-tracking branch 'remotesbt/0.13' into 0.13 2014-04-18 13:48:19 +01:00
eugene yokota 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
eugene yokota 01dbbc8607 Merge pull request #1263 from sbt/wip/docs-and-cleanups 
addPlugins => enablePlugins
 2014-04-16 13:59:40 -04:00
Grzegorz Kossakowski 7f995d811b Merge pull request #1250 from gkossakowski/namehashing-cleanup 
Move NameHashing from incremental to api subproject.
 2014-04-16 00:18:27 +02:00
Grzegorz Kossakowski d6f2121b42 Merge pull request #1254 from gkossakowski/classFileManager-logging 
Add debug logging in ClassfileManager
 2014-04-13 16:05:18 +02:00
eugene yokota 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
eugene yokota 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
eugene yokota 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
Josh Suereth 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
Grzegorz Kossakowski 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
Josh Suereth 46c4fd80e2 Merge pull request #1241 from jaceklaskowski/follow-deprecation 
Follow deprecation
 2014-04-08 11:11:40 -04:00
Jacek Laskowski 2f42c1385f Merge branch '0.13' into follow-deprecation 2014-04-07 22:20:55 +02:00
eugene yokota 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
Josh Suereth 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
Josh Suereth 9b3b2d6588 Merge pull request #1064 from jaceklaskowski/javadoc-changes 
Javadoc changes
 2014-04-07 10:02:35 -04:00
Josh Suereth 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
Jason Zaugg 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
Josh Suereth 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
Jason Zaugg 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
Josh Suereth 84b79f9bc1 Revert "Fix task macro's handling of Symbol owners in <qual>.value" 
This reverts commit 3017bfcd07.

This was causing sbt to be unable to compile.  Reverting temporarily until
we have a shot at a full fix.
 2014-03-07 22:25:29 -05:00
Josh Suereth 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