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

1237 Commits

Author SHA1 Message Date
eugene yokota 1fe20338b1 Merge pull request #1409 from vn971/0.13 
make it possible to reference a branch of a local git repository
 2014-06-24 23:00:45 -04:00
eugene yokota 2e9dadb5cc Merge pull request #1424 from jaceklaskowski/deprecated-annotation-param-positions 
Message and since parameters in @deprecated properly placed
 2014-06-24 22:59:55 -04:00
eugene yokota e0f2d212df Merge pull request #1425 from jaceklaskowski/typo-fixes 
Typo fixes + removing unnecessary semicolons
 2014-06-24 22:58:59 -04:00
Jacek Laskowski d7c7237d2c Typo fixes + removing unnecessary semicolons 2014-06-25 00:08:25 +02:00
David Pratt 9209dba52a Merge remote-tracking branch 'upstream/0.13' into 0.13 2014-06-09 13:56:16 -05:00
David Pratt 648ab3a8dd Make jar artifact a 0-byte file. 2014-06-09 13:54:20 -05:00
David Pratt f38cd6d8c3 Add a unit test for the 'scala-jar' mapping. 2014-06-07 20:58:31 -05:00
eugene yokota 42b85a99d8 Merge pull request #1391 from sbt/wip/1390 
Improve test failure message for #1390.
 2014-06-06 13:24:11 -04:00
Josh Suereth cd6c5f7b65 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
David Pratt 1c92e42c44 Add 'scala-jar' to the list of jar artifacts. 
The CustomPomParser has a hard-coded list of 'blessed' Maven POM packaging types
that are actually packaged as jar files, but Ivy incorrectly maps the file extension.
This patch allows artifacts published with the 'scala-jar' packaging to be properly
resolved and used in an SBT project.
 2014-06-05 18:11:37 -05:00
Josh Suereth fce9345a9f 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 0c56c30975 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 357a46280a 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 55eb00ae9c 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 a1841798b0 merge with master 2014-06-02 13:44:07 -04:00
eugene yokota 5a64061032 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 ffd9d39f0d 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 7408c51288 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 449e757249 Fix formatting issues and bump to sbt 0.13.5 2014-05-28 09:12:55 -04:00
Josh Suereth fd44df9ec8 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
Josh Suereth 1f68d3f6fd Fix import issues to generate sxr/scaladoc. 2014-05-28 08:55:29 -04:00
eugene yokota 2db3812410 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 88bef3c503 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 47caff27bc 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 5ea556a397 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 bb5b284d8d 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 7a1c481549 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
eugene yokota d3aa84ff7a Merge pull request #1316 from sbt/wip/fix-broken-build 
This doesn't quite fix the build, but gets closer
 2014-05-07 12:23:09 -04:00
Josh Suereth fc5da1fa65 Scalariforming test code 2014-05-07 11:52:23 -04:00
Josh Suereth b201e0431a Merge pull request #1304 from sbt/wip/scalariform 
scalariform
 2014-05-01 19:22:41 -04:00
Eugene Yokota e64165ce9e added scalariform 2014-05-01 12:50:07 -04:00
Josh Suereth 60d038170f Merge pull request #1300 from cunei/wip-fix-ivy-move 
Do not attempt to publish if no artifacts are present
 2014-04-30 14:41:51 -04:00
Antonio Cunei be3ff51f0a Do not attempt to publish if no artifacts are present 
Ivy transactional publishing will abort if no artifacts
are published, either because the temporary directory is
not being created, or because Ivy will detect an anomalous
condition.

Therefore, skip publishing altogether if there is
nothing to publish to begin with.
 2014-04-30 17:40:58 +02:00
eugene yokota f77c8fb949 Merge pull request #1270 from oscarvarto/spanishTranslation 
Initial Spanish translation of documentation
 2014-04-28 11:25:58 -04:00
Josh Suereth 9698b84274 Merge pull request #1285 from jaceklaskowski/docs-changes-alone 
Docs changes alone
 2014-04-25 07:56:56 -04:00
Josh Suereth 78eb6022b5 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 5a5abe4f68 Merge pull request #1236 from urbas/0.13 
Implemented the fileParser and added DynamicExamples.
 2014-04-25 07:54:31 -04:00
Matej Urbas ff549766a8 Merge remote-tracking branch 'remotesbt/0.13' into 0.13 2014-04-18 13:48:19 +01:00
eugene yokota 769de77fac 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 765ed0712d Merge pull request #1263 from sbt/wip/docs-and-cleanups 
addPlugins => enablePlugins
 2014-04-16 13:59:40 -04:00
Grzegorz Kossakowski b4251aa60e 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 35d8b8b77d Merge pull request #1254 from gkossakowski/classFileManager-logging 
Add debug logging in ClassfileManager
 2014-04-13 16:05:18 +02:00
eugene yokota 8e5a623730 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 15fce3f84f 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 10e79b7a91 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 94d9fe5ec5 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 ec582e8255 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 823abc60cb Merge pull request #1241 from jaceklaskowski/follow-deprecation 
Follow deprecation
 2014-04-08 11:11:40 -04:00
Jacek Laskowski 24f31804af Merge branch '0.13' into follow-deprecation 2014-04-07 22:20:55 +02:00
eugene yokota 0215b14fb8 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