Commit Graph

6472 Commits

Author SHA1 Message Date
eugene yokota dedc7a53e6
Merge pull request #4466 from eed3si9n/wip/travis-notifications
[1.2.x] drop notification override
2018-11-29 01:45:31 -05:00
eugene yokota 138deadafd
Merge pull request #4471 from cunei/1.2.x-fixNightly
[1.2.x] fix nightly
2018-11-29 01:44:23 -05:00
Antonio Cunei 9e4e16b7f0 Bump scalatest to 3.0.6-SNAP5 2018-11-28 20:44:07 +01:00
Antonio Cunei 94aa8591e6 Bump log4j2 to 2.11.1 2018-11-28 20:44:07 +01:00
Eugene Yokota 5558ca5c70 drop notification override 2018-11-27 18:25:32 -05:00
eugene yokota c2115cc347
Merge pull request #4463 from dwijnand/ignore-files-in-scripted-group-dirs
[1.2.x] Ignore files in scripted group dirs
2018-11-23 16:26:35 -05:00
Dale Wijnand 5f562aa7a8
Ignore files in scripted group dirs
Scripted tests, in src/sbt-test/<group>/<name> blow up if <name> is a
plain file.  Filter them out.
2018-11-22 15:48:56 +00:00
eugene yokota 67b109c4bd
Merge pull request #4447 from eatkins/managed-source-fix
Fix '~' for dependent projects with a broken parent (1.2.x)
2018-11-13 12:59:05 -08:00
Ethan Atkins fd2ec7adc3 Fix '~' for dependent projects with a broken parent
In #4446, @japgolly reported that in some projects, if a parent project
was broken, then '~' would immediately exit upon startup. I tracked it
down to this managed sources filter. The idea of this filter is to avoid
getting stuck in a build loop if managedSources writes into an unmanaged
source directory. If the (managedSources in ThisScope).value line
failed, however, it would cause the watchSources, and by delegation,
watchTransitiveSources task to fail. The fix is to only create this
filter if the managedSources task succeeds.

I'm not 100% sure if we shouldn't just get rid of this filter entirely
and just document that '~' will probably loop if a build writes the
result of managedSources into an unmanaged source directory.
2018-11-11 09:36:46 -08:00
eugene yokota 015d85836b
Merge pull request #4425 from eed3si9n/wip/bump
[1.2.x] Fixes cached resolution, and upgrades modules
2018-10-15 16:34:22 -04:00
Eugene Yokota 137c746ac0 util 1.2.3, zinc 1.2.4 2018-10-15 12:48:47 -04:00
Eugene Yokota 4e6352179b lm 1.2.2 2018-10-15 12:46:40 -04:00
Eugene Yokota ede82b4709 Adjust the tests 2018-10-15 12:46:18 -04:00
Eugene Yokota 608c6fb990 Set withMetadataDirectory by default
This partly fixes cached resolution.

Ref https://github.com/sbt/sbt/issues/3761
2018-10-15 12:46:02 -04:00
eugene yokota fb4a4a3c30
Merge pull request #4416 from eed3si9n/bport/all
Fix single repo emulation script
2018-10-09 12:27:13 -04:00
Eugene Yokota ed76503629 Fix single repo emulation script
Fixes #4330
Ref 5b179a2611 (diff-fdc3abdfd754eeb24090dbd90aeec2ce)
2018-10-09 00:23:54 -04:00
eugene yokota c2dc7d62f4
Merge pull request #4405 from eed3si9n/bport/plugincross
[1.2.x]  check PluginCross.scala consisntency
2018-10-05 14:05:40 -04:00
Eugene Yokota 4c6e421d59 add onLoadMessage 2018-10-05 13:40:59 -04:00
Eugene Yokota ce9aa0c920 check PluginCross.scala consisntency 2018-10-05 13:39:59 -04:00
eugene yokota ec26c512cd
Merge pull request #4401 from eed3si9n/wip/bump
Zinc 1.2.3
2018-10-05 03:31:31 -04:00
Eugene Yokota 1f0680efbf Bump modules 2018-10-05 02:25:36 -04:00
Eugene Yokota 48726a0d60 Formatting 2018-10-05 02:25:21 -04:00
eugene yokota 5649ac0410
Merge pull request #4400 from eed3si9n/bport/junit-reports
[1.2.x] Duplicate reports for backwards-compat adding a name-compliant copy
2018-10-05 01:18:20 -04:00
Ignasi Marimon-Clos 3ea7533d4f Duplicate reports for backwards-compat adding a name-compliant copy 2018-10-05 00:17:33 -04:00
eugene yokota 3f9972df4d
Merge pull request #4388 from eed3si9n/wip/2127
[1.2.x]  Scala 2.12.7
2018-09-28 04:58:50 -04:00
Eugene Yokota cd7a5c6f6b Use linesIterator for JDK 11 compat 2018-09-28 03:03:28 -04:00
Eugene Yokota 4e00a3e9f0 Scala 2.12.7 2018-09-28 03:03:17 -04:00
eugene yokota 916724afd4
Merge pull request #4354 from eed3si9n/wip/rangepos
Follow up on Position extension
2018-09-14 00:56:58 -04:00
Eugene Yokota 48418408b3 Follow up on Position extension
https://github.com/sbt/util/pull/173 added the ability to carry range position. This exposes it to the sbt server.
2018-09-14 00:02:02 -04:00
eugene yokota dce2ea1f8c
Merge pull request #4351 from eed3si9n/bport/fix-server-broadcast
[1.2.x] Fix second part of #4091: server responses should not be broadcasted
2018-09-13 16:11:21 -04:00
Eugene Yokota b472d5d2b6 Bump modules 2018-09-13 14:26:16 -04:00
Guillaume Martres a7b04329bd Fix second part of #4091: server responses should not be broadcasted
Change CommandExchange#publishEvent to not broadcast ExecStatusEvent and
instead check the channelName, this matches what was already done in
CommandExchange#publishEventMessage
2018-09-13 12:38:48 -04:00
eugene yokota 65d592cf7e
Merge pull request #4332 from smarter/scalaCompilerBridgeBinaryJar
Add scalaCompilerBridgeBinaryJar task
2018-09-13 09:50:55 -04:00
Guillaume Martres 2c64c0c9b5 Add scalaCompilerBridgeBinaryJar task
The end goal is to rewrite Dotty's compiler-bridge in Java (this is easy
since the zinc-specific phases are in the compiler itself) to simplify
the bootstrapping process.
2018-08-28 17:44:58 +09:00
eugene yokota 6eb3d9f0fb
Merge pull request #4324 from eed3si9n/wip/bumpvscodemodules
sbt 1.2.1 and some maintenance npm bumps
2018-08-16 23:38:25 -04:00
Eugene Yokota fa3b0f0313 sbt 1.2.1 2018-08-16 15:55:25 -04:00
Eugene Yokota 349f56fed5 Bump modules to address security vulnerability 2018-08-16 15:54:40 -04:00
eugene yokota 549c69463d
Merge pull request #4304 from eed3si9n/wip/bump
Zinc 1.2.1, IO 1.2.1
2018-08-06 18:52:29 -04:00
Eugene Yokota a1d1c77311 Zinc 1.2.1, IO 1.2.1 2018-08-06 16:46:55 -04:00
eugene yokota 1ebc1a7bfc
Merge pull request #4302 from eed3si9n/wip/remove-configuration-warning
Remove warnings about configuration
2018-08-06 08:34:05 -04:00
eugene yokota d4d83a5d6b
Merge pull request #4301 from eed3si9n/wip/vararg
Revert switch inThisBuild (+friends) to use varargs SettingsDefinition
2018-08-06 08:13:20 -04:00
Eugene Yokota 780ca366d8 Remove warnings about configuration
Fixes #4293
Ref #4231, #4065

This fixes the regression on sbt 1.2.0 that displays a lot of warnings about configurations.

The warning was added in #4231 in an attempt to fix #4065. This actually highlights somewhat loose usage of configurations among the builds in the wild, and the limitation on the current slash syntax implementation.

I think we can remove this warning for now, and try to fix #4065 by making slash syntax more robust. In particular, we need to memorize the mapping between the configuration name and Scala identifier across the entire build, and use that in the shell.
2018-08-06 00:22:57 -04:00
Eugene Yokota 26c180e768 Revert "Switch inThisBuild (+friends) to use varargs SettingsDefinition"
This reverts commit f459b218c4.
2018-08-05 16:00:33 -04:00
Eugene Yokota eac7eef947 Revert "Switch to varargs inThisBuild (+friends)"
This reverts commit ccf938c786.
2018-08-05 15:44:37 -04:00
eugene yokota 7c2ea0f374
Merge pull request #4290 from eed3si9n/wip/1.2.0
1.2.1-SNAPSHOT
2018-07-31 10:41:53 -04:00
Eugene Yokota 305a8de319 1.2.1-SNAPSHOT 2018-07-30 20:28:42 -04:00
Eugene Yokota 4bcfaee264 1.2.0 2018-07-30 00:56:36 -04:00
eugene yokota 02cea368eb
Merge pull request #4288 from eed3si9n/wip/bump
Zinc, LM, Util 1.2.0
2018-07-30 00:26:50 -04:00
Eugene Yokota 3d5b198f88 Zinc, LM, Util 1.2.0 2018-07-29 22:45:46 -04:00
eugene yokota 43607b0c40
Merge pull request #4270 from eed3si9n/wip/parser
Fix bimcompat breakages in complete
2018-07-15 23:26:52 -04:00