Commit Graph

5610 Commits

Author SHA1 Message Date
eugene yokota 7420071f25 Merge pull request #3533 from razvan-panda/1.0.x
Fix unused imports warnings
2017-09-15 22:13:06 -04:00
eugene yokota 45765583a6 Merge branch '1.0.x' into 1.0.x 2017-09-15 19:47:08 -04:00
eugene yokota b4744486a8 Merge pull request #3546 from eed3si9n/wip/flaky
Comment out flaky tests
2017-09-15 19:41:42 -04:00
eugene yokota 43538bdbe6 Merge pull request #3526 from dwijnand/crossplusplus
Redefine crossScalaVersions, because it's Def.derive..
2017-09-15 19:09:11 -04:00
Eugene Yokota 3c5aaca15c comment out part of tests/fork-parallel
Ref #3545
2017-09-15 18:50:31 -04:00
Eugene Yokota 4ac231dd49 comment out part of run/error
Ref #3543
2017-09-15 18:48:07 -04:00
Dale Wijnand 71ae211841
Redefine crossScalaVersions, because it's Def.derive..
Fixes #3495
2017-09-15 16:59:47 +01:00
Răzvan Flavius Panda 0124a8ad0e Fix unused imports warnings 2017-09-15 16:35:08 +01:00
eugene yokota d81d054bd2 Merge pull request #3507 from kczulko/issue-3453
Fix for text echo issue when running sbt.
2017-09-14 14:14:26 -04:00
kczulko e9fa4201fb Fix review issue. Add 't.restore' before function call. 2017-09-14 09:34:06 +02:00
Dale Wijnand da40288d6f Merge pull request #3517 from dwijnand/run-cp-dirs
Fix run's support of directories in the classpath
2017-09-13 16:07:36 +01:00
Dale Wijnand 3cb281945e
Alias when strings are a scala version 2017-09-13 16:03:51 +01:00
Dale Wijnand 930fac2a78
Restrict switchScalaVersion `projects` to just ResolvedReference's 2017-09-13 16:03:51 +01:00
Dale Wijnand 936733b2b1
Cleanup 2017-09-13 16:03:51 +01:00
Dale Wijnand 103e40882f
Fix run's support of directories in the classpath
Fixes #3504
2017-09-13 10:21:41 +01:00
Dale Wijnand 53e41a0045
Dedup defining bgRun/bgRunMain 2017-09-13 10:21:40 +01:00
Dale Wijnand 363966da28 Merge pull request #3522 from eed3si9n/wip/travis2
Undo _JAVA_OPTIONS enrivonment variable
2017-09-13 10:12:30 +01:00
Eugene Yokota 97e1049d57 Undo _JAVA_OPTIONS enrivonment variable
Ref sbt/sbt#3520

This undoes the environment variable addedin 2017-09-06 update of Travis CI:
https://docs.travis-ci.com/user/build-environment-updates/2017-09-06/
2017-09-12 21:29:40 -04:00
eugene yokota cedb902d17 Merge pull request #3513 from dwijnand/allow-late-settingkey-evals
Don't warn on by-name keys
2017-09-12 14:22:58 -04:00
Dale Wijnand d3d105515a
Don't warn on by-name keys
.. which is apparently what the type of bare vals in *.sbt files are.

Fixes #3299, again.
2017-09-11 14:46:33 +01:00
Dale Wijnand 8d9a3a35d2
Fix warnings in TaskLinterDSL.scala 2017-09-11 14:45:40 +01:00
Dale Wijnand 498ef3652b
Set version to 1.0.2-SNAPSHOT 2017-09-11 14:45:14 +01:00
kczulko b6a3ca1937 Fix for text echo issue when running sbt. 2017-09-11 11:49:10 +02:00
eugene yokota 277413ef7a Merge pull request #3511 from eed3si9n/wip/lm
lm 1.0.1
2017-09-10 15:53:46 -04:00
Eugene Yokota 01e8f609e8 lm 1.0.1 2017-09-10 14:13:51 -04:00
eugene yokota f11b1e086f Merge pull request #3487 from cunei/wip-3419
deliver task fixes
2017-08-31 23:40:45 -04:00
Antonio Cunei 8b187147ef Add makeIvyXml, as a more sensibly-named alternative to deliver 2017-09-01 00:38:04 +02:00
Antonio Cunei c35220c32f Add makeIvyXmlConfiguration, restore deliver to 0.13 behavior 2017-09-01 00:38:04 +02:00
eugene yokota 34945af631 Merge pull request #3483 from sbt/1.0.x
Merge 1.0.1 to 1.x
2017-08-31 13:04:57 -04:00
eugene yokota 380121f0b4 Merge pull request #3480 from eed3si9n/wip/notes2
1.0.1 notes
2017-08-28 13:24:53 -04:00
Eugene Yokota 2a014781d6 Mention #3481 2017-08-28 13:23:53 -04:00
eugene yokota c951b38fea Merge pull request #3481 from eed3si9n/wip/revert_bad_fport
Revert "Automatically choose proper compiler bridge for dotty"
2017-08-28 13:20:50 -04:00
Eugene Yokota aaf259f4fd Revert "Automatically choose proper compiler bridge for dotty"
This reverts commit 2283c68031.
2017-08-28 12:12:09 -04:00
Eugene Yokota dd58299472 Fix typo 2017-08-28 12:01:47 -04:00
Eugene Yokota 6c6abc3ae6 1.0.1 notes 2017-08-28 11:54:59 -04:00
eugene yokota 8412f0254b Merge pull request #3478 from eed3si9n/wip/bump_io
WatchSource = sbt.internal.io.Source
2017-08-28 11:02:08 -04:00
Eugene Yokota afd5ff03f8 WatchSource = sbt.internal.io.Source
Ref #3438
2017-08-28 00:56:27 -04:00
eugene yokota 6202015335 Merge pull request #3477 from eed3si9n/wip/runissue
Forward `run` task to `bgRun`
2017-08-27 16:13:25 -04:00
Eugene Yokota c6782f4b55 Fix project/flatten 2017-08-27 03:00:12 -04:00
Eugene Yokota 9003ed4fac Capture errors thrown inside `bgRun`
This captures non-fatal errors in `bgRun` background thread, so if needed we can re-throw it for `run`.
2017-08-27 02:59:50 -04:00
Eugene Yokota b6f2fe7654 Forward `run` task to `bgRun`
Fixes #3425

The `Compile`-specific `run` task was removed in #2936 in favor of `bgRun` but it stop short of delegating the `run` to `bgRun`.
2017-08-26 16:49:29 -04:00
eugene yokota 88f3d43b87 Merge pull request #3475 from eed3si9n/wip/use_sbt1
Use sbt 1.0.0
2017-08-26 16:38:12 -04:00
Eugene Yokota 0e77d9f8a2 Merge branch 'wip/npe' into wip/use_sbt1 2017-08-26 15:37:19 -04:00
Eugene Yokota c562a17358 Split the source-dependencies tests 2017-08-26 15:35:34 -04:00
Eugene Yokota 12be2e28a6 Use sbt 1.0.0 2017-08-26 14:40:58 -04:00
Eugene Yokota c74d397cd7 Bump Util for NPE fix attempt
Ref sbt/util#119
2017-08-26 01:39:51 -04:00
eugene yokota 7ac1b034e4 Merge pull request #3439 from Duhemm/fix/3413
Fix #3413: Include base directory to watched sources
2017-08-23 18:39:23 -04:00
eugene yokota eb4312e6fa Merge pull request #3446 from jroper/cross-build-commands
[1.0.x] Add support for cross building commands
2017-08-23 18:38:25 -04:00
eugene yokota ddaa091dec Merge pull request #3442 from dwijnand/sbt-plugin-cross-version
[fport] Fix addSbtPlugin to use the correct version of sbt
2017-08-23 18:37:23 -04:00
eugene yokota 33d3ba9d7c Merge pull request #3438 from Duhemm/source-appender
[1.0.x] `Append` instance to add `File` to `Seq[Source]`
2017-08-23 18:31:58 -04:00