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

91 Commits

Author SHA1 Message Date
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 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 af506f57b6 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 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
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
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
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
Pierre DAL-PRA f1bc128e51 Replace procedure syntax by explicit Unit annotation 2015-08-04 10:07:38 +02:00
Grzegorz Kossakowski cb9fcc9e56 Merge pull request #1531 from gkossakowski/positions-crash 
Set currentRun and currentUnit in Eval
 2014-08-14 15:52:01 +02:00
eugene yokota 2bd109def3 Merge pull request #1512 from sbt/wip/fix-1506 
Fix unknown host exception in junit xml listener.
 2014-08-12 14:55:20 -04:00
eugene yokota 835fc3482c Merge pull request #1521 from sbt/wip/fix-flaky-settings-test 
Fixes flaky no-such-element exception from bad generation of random test...
 2014-08-12 11:12:44 -04:00
eugene yokota 5bc02e8894 Merge pull request #1516 from sbt/wip/fix-1455 
Allow root plugins to be disabled.
 2014-08-12 11:12:18 -04:00
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