Commit Graph

5654 Commits

Author SHA1 Message Date
eugene yokota 8e933fcda4
Merge pull request #3768 from eed3si9n/wip/bump_modules
Bump modules
2017-11-26 03:49:14 -05:00
Eugene Yokota 1d8d1a1622 Zinc 1.0.5 2017-11-26 02:26:04 -05:00
Eugene Yokota f44dcef14d notes 2017-11-25 05:26:51 -05:00
Eugene Yokota 309fdfac31 Bump modules 2017-11-25 00:27:45 -05:00
Dale Wijnand 17762947e4
Merge pull request #3744 from cunei/wip-port-zinc-pr-441
Port of sbt/zinc#441 to sbt/sbt 1.0.x
2017-11-16 16:29:15 +00:00
Antonio Cunei 43a976d42c Port of sbt/zinc#441 to sbt/sbt 1.0.x 2017-11-16 15:15:21 +01:00
Dale Wijnand 8fe38d4a5a
Merge pull request #3743 from cunei/wip-flakyTests1
Workaround for scala/bug#10605
2017-11-16 10:58:53 +00:00
Antonio Cunei a050b73a46 Workaround for scala/bug#10605
templateStats() is not thread-safe in 2.12.x (at least up to 2.12.4)
2017-11-15 05:27:31 +01:00
Dale Wijnand c3f9cf800e
Merge pull request #3719 from eed3si9n/wip/launcher
Bump launcher to 1.0.2
2017-11-08 10:28:52 +00:00
Dale Wijnand f380de79f4
Merge pull request #3720 from eed3si9n/wip/3680
Improve testQuick performance, restoring caching of stamps
2017-11-08 08:50:26 +00:00
OlegYch 6e29a1aa15 Improve testQuick performance, restoring caching of stamps 2017-11-07 22:56:05 -05:00
Eugene Yokota afe9757da0 Bump launcher to 1.0.2
Fixes #3676
2017-11-07 22:54:05 -05:00
eugene yokota ee4dcee7cf
Merge pull request #3717 from cunei/wip-3655
Do not always use Level.Debug while creating a backgroundLog
2017-11-06 13:08:21 -05:00
Antonio Cunei 1ca266d0f8 Do not always use Level.Debug while creating a backgroundLog
The creation of a backgroundLog was always using Debug as the
logging level for console and backing. This commit sets the
levels to those used by the caller. Fixes #3655
2017-11-06 15:33:05 +01:00
eugene yokota af11219637 Merge pull request #3675 from eed3si9n/wip/1.0.3-notes
notes for 1.0.3
2017-10-27 01:59:33 -04:00
Eugene Yokota db79226c22 notes for 1.0.3 2017-10-26 22:39:35 -04:00
eugene yokota 89702ffaa7 Merge pull request #3674 from eed3si9n/wip/1.0.3
Bump modules
2017-10-26 22:03:35 -04:00
Eugene Yokota 84f03b64be Bump modules
Fixes #3519
Fixes #3586
Fixes #3569
Fixes #3573
2017-10-26 21:13:48 -04:00
eugene yokota cb79a4ae08 Merge pull request #3669 from cunei/wip-interim-3583
Interim fix for #3583, for 1.0.3
2017-10-26 18:23:12 -04:00
Antonio Cunei c60a5a204e Release notes for the fix to #3583 2017-10-26 02:30:23 +02:00
Antonio Cunei 24a463cc6b Add scripted test for nested test classes/objects 2017-10-26 02:30:23 +02:00
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