Commit Graph

1121 Commits

Author SHA1 Message Date
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
Josh Suereth e3738fab0a 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 5aae0caaeb Merge pull request #1064 from jaceklaskowski/javadoc-changes
Javadoc changes
2014-04-07 10:02:35 -04:00
Josh Suereth 99733074b0 Merge pull request #1234 from sbt/wip/undo-nonsnapshot-deletion
Roll back aggressive deletion of cache. Fixes #1091.
2014-04-05 07:47:32 -04:00
Eugene Yokota 1742e837c4 Roll back sbt/sbt@482f99 (aggressive deletion of cache). Fixes #1091.
* sbt 0.12.3 introduced sbt/sbt@482f99 to fix #637 and #641.
* The underlying issue of #641 was an incorrect classifier, and it was
  fixed in sbt/sbt@718fa9 for #683 and shipped as sbt 0.13.0.
2014-04-05 01:53:31 -07:00
Josh Suereth 8bd930cbe5 Remove JDK7 features from Resolver shim. 2014-04-04 20:25:37 -04:00
Josh Suereth 80c09619bf Ensure that if artifact is published, we overwrite default checksums.
Fixes # 1233

* Add a new "shim" for RepositoryResolvers that modifies the "put"
  method so that it will ignore the overwrite flag for checksums.
2014-04-04 17:19:56 -04:00
Grzegorz Kossakowski a8dbec04c4 Merge pull request #1202 from Duhemm/inherited-macros
Disable macro heuristic for inherited macros (sbt/sbt#1142)
2014-04-03 19:57:58 +02:00
Josh Suereth b95759a138 Bump to our own nightly of ivy 2.4.0 (RC1+).
* Testing the infrastructure to use our own instance of ivy
* Allow us to push bug-fixes/performance directly into ivy
  on our own pace, as we submit patches back to ivy master
2014-03-29 13:06:27 -04:00
eugene yokota 573005f934 Merge pull request #1203 from eed3si9n/topic/requiredAutoPlugin
Unifies AutoPlugin and RootPlugin
2014-03-24 19:02:00 -04:00
Josh Suereth 0ad7067345 Merge pull request #1197 from sandreev/t_1196_empty_tests
fixes #1196
2014-03-24 16:19:11 -04:00
Josh Suereth c4bff151b6 Merge pull request #1205 from eed3si9n/topic/pomparser
CustomPomParser compatibility with 0.13.1. #1191 #1192
2014-03-24 13:06:04 -04:00
Eugene Yokota 51d0df004f CustomPomParser compatibility with 0.13.1. #1191 #1192 2014-03-21 23:53:06 -04:00
eugene yokota 17ecfd62fa Merge pull request #1192 from dansanduleac/i1191
Rename sbtTransformHash -> e:sbtTransformHash
2014-03-21 18:09:01 -04:00
Dan Sanduleac efab62e89e sbtTransformHash -> e:sbtTransformHash 2014-03-19 11:08:17 +00:00
Josh Suereth a5e2f1908d Merge pull request #1160 from sbt/wip/issue-1156
Don't fail publishing on overwrite, but issue a warning.
2014-03-08 16:03:50 -05:00
Josh Suereth 95e9b5cda7 Don't fail publishing on overwrite, but issue a warning.
Workaround for #1156.

* Creates a new FileRepository that will stil allow local files
  to be transfered if overwrite is true (non-snapshot module),
  but will issue a warning about deprecated behavior.
* Ensure warning is long enough to annoy people into asking
  what it's about.
2014-03-08 14:08:25 -05:00