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

5633 Commits

Author SHA1 Message Date
Antonio Cunei b19bd33dc0 Missing import 2017-10-26 02:30:23 +02:00
Antonio Cunei 53ea3596ec Interim fix for #3583, for 1.0.3 
In 0.13.x, zinc would discover only top-level objects and classes
containing tests to the test framework. In 1.x, however, zinc can
discover also nested objects and classes; that causes the "name"
of a ClassLike to no longer be usable for reflection.

This change filters out nested objects/classes from the list,
restoring compatibility with 0.13. A zinc extension of ClassLike
will probably be introduced in 1.1 or 1.2, in order to provide
the test framework with enough information to deal with nested
classes.

This patch unblocks https://github.com/sbt/sbt-standalone-build/issues/15
 2017-10-26 02:30:23 +02:00
Dale Wijnand 4c3cf6bfe7 Merge pull request #3634 from dwijnand/recompile247 
[1.0.x] Track sources in base directory non-recursively
 2017-10-24 20:35:59 +01:00
Dale Wijnand 78c5ee92d3
Track sources in base directory non-recursively 
Using a recursive Source meant that ~ looked into target. If you have
any source generators and use ~ with anything the invokes them, like
~compile, that means that the act of generating sources triggers ~ to
re-execute compile (perhaps only on macOS where the NIO WatchService
just polls, after an initial delay).

Requires sbt/io#78

Fixes #3501
 2017-10-24 11:09:00 +01:00
Dale Wijnand 9e85c08fb1 Merge pull request #3651 from eed3si9n/wip/scala2124 
Bump to Scala 2.12.4
 2017-10-20 06:44:09 -05:00
Eugene Yokota ae860d5a7d Bump to Scala 2.12.4 
Uses Scala 2.12.4 for the build definition. This includes fix for runtime reflection of empty package members under Java 9.

Fixes sbt/sbt#3587
 2017-10-20 00:23:29 -05:00
Dale Wijnand 85af599b52 Merge pull request #3626 from eed3si9n/bport/3597 
[1.0.x] Add system property to revert to old polling fs watcher
 2017-10-10 11:36:13 +01:00
Michael Stringer b9a4d32916 Add system property to revert to old polling fs watcher 
This adds a sbt.watch.mode system property that if set to 'polling' will
use PollingWatchService instead of WatchServiceAdapter (nio).

On macOS this will default to 'polling' and on all others 'nio'.

This is a temporary workaround for users affected by #3527
 2017-10-10 01:17:42 -04:00
eugene yokota c57e831112 Merge pull request #3561 from jastice/1.0.x-pr/3560 
Pass `allJars` when creating ScalaInstance instead of `otherJars`.
 2017-09-20 11:13:22 -04:00
Justin Kaeser 45d69f3762 Pass `allJars` when creating ScalaInstance instead of `otherJars`. 
Fixes https://github.com/sbt/sbt/issues/3560
required for https://youtrack.jetbrains.com/issue/SCL-12591
 2017-09-19 19:12:59 +02:00
eugene yokota 0ff08bd9ac Merge pull request #3554 from eed3si9n/wip/notes2 
contributors
 2017-09-16 20:33:21 -04:00
Eugene Yokota 15ecc9845a contributors 2017-09-16 20:32:33 -04:00
eugene yokota 2e4873c7fb Merge pull request #3553 from eed3si9n/wip/bump_version 
1.0.3-SNAPSHOT
 2017-09-16 15:53:51 -04:00
Eugene Yokota 182b8296da 1.0.3-SNAPSHOT 2017-09-16 15:52:58 -04:00
eugene yokota c855f0cd9e Merge pull request #3551 from eed3si9n/wip/autostart 
`sbt.server.autostart` flag and startServer
 2017-09-16 15:25:11 -04:00
Eugene Yokota f21d190a65 `sbt.server.autostart` flag and startServer 
Adds JVM flag `sbt.server.autostart` to enable/disable the automatic starting of sbt server with the sbt shell.

This also adds a new command `startServer` to manually start the server.
 2017-09-16 03:24:30 -04:00
Eugene Yokota 8dbb00f3b1 notes 2017-09-16 02:37:30 -04:00
eugene yokota c514acc651 Merge pull request #3550 from eed3si9n/wip/lm_bump 
bump lm to 1.0.2
 2017-09-16 02:33:12 -04:00
Eugene Yokota 87e95e3a51 bump lm to 1.0.2 2017-09-16 01:43:42 -04:00
eugene yokota 6677802697 Merge pull request #3549 from eed3si9n/wip/zinc_bump 
bump Zinc to 1.0.1
 2017-09-16 01:28:07 -04:00
Eugene Yokota 4bd7010a4f bump Zinc to 1.0.1 
Fixes #2884
 2017-09-16 00:38:22 -04:00
eugene yokota caf2fa2cb8 Merge pull request #3523 from guillaumebort/1.0.x 
Sbt server could miss some messages
 2017-09-15 23:31:13 -04:00
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
Guillaume Bort b355aa66e4 Sbt server could miss some messages 
If the read buffer contains more that 2 messages, we need to consume them all before blocking on socket read again. For that we have to loop until the buffer does not contain anymore the message delimiter character.

Same problem in the client ServerConnection code.
 2017-09-13 13:18:38 +02: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