luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,353 Commits 29 Branches 314 Tags 74 MiB
Commit Graph

11353 Commits

Author SHA1 Message Date
Eugene Yokota 4f01fef477 some adjustments to the scripted tests 
some minor adjustments to make it work on Jenkins.
 2019-12-30 06:37:46 -05:00
Eugene Yokota 4d8c8b8e34 Forward -Dsbt.ivy.home 2019-12-30 04:58:21 -05:00
Eugene Yokota f5090cf70f Fix Zinc component compiler to respect -Dsbt.ivy.home 
This is currently blocking the new nightly process.
 2019-12-29 16:55:38 -05:00
eugene yokota 73b4d4b158
Merge pull request #5328 from dwijnand/message-reboot 
Revert "clarify message on sbt.version mismatch"
 2019-12-29 03:06:09 -05:00
eugene yokota bf9225bccf
Merge pull request #5344 from eed3si9n/wip/repeatable 
Don't emit timestamps when packaging to jar, take 2
 2019-12-29 02:58:53 -05:00
Arnout Engelen 989a37a776 Update sbt.io to 1.4.0-M2 2019-12-29 02:31:21 -05:00
Eugene Yokota 0ce5630633 refactor sbtProcess to use vararg 
This allows passing whitespace as part of an argument.
 2019-12-28 02:36:53 -05:00
eugene yokota 5aed0bb06d
Merge pull request #5340 from eed3si9n/wip/bumpsbt 
sbt 1.3.6
 2019-12-27 17:15:13 -05:00
Eugene Yokota a8ab4ada68 Replace getResource("") trick 
Fixes https://github.com/sbt/sbt/issues/5339

It seems like some tests are using `ClassLoader#getResource("")` to acquire the `classes` directory path. This does not seem to work on sbt 1.3.6, which returns `file:/home/travis/.cache/coursier/v1/https/repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.2/log4j-api-2.11.2.jar!/META-INF/versions/9/`. To workaround this issue, I've switched to loading the known folder name instead.
 2019-12-27 16:43:20 -05:00
eugene yokota 19cf7a4da0
Merge pull request #5341 from eed3si9n/wip/publishto 
customize publishTo for nightlies
 2019-12-27 02:48:37 -05:00
Eugene Yokota b18876b1f5 customize publishTo for nightlies 2019-12-27 02:43:46 -05:00
Eugene Yokota d21d698e96 sbt 1.3.6 2019-12-27 01:51:25 -05:00
eugene yokota 9400225fe9
Merge pull request #5338 from eed3si9n/wip/aggregate 
add aggregate projects for lower utils and upper modules
 2019-12-27 01:45:28 -05:00
Eugene Yokota 80aeb7eed9 add aggregate project for lower utils and upper modules 2019-12-27 00:24:03 -05:00
Dale Wijnand f5e73b610a Keep "using" change in sbt.version mismatch messaging. 2019-12-26 08:28:06 +00:00
eugene yokota 6c55f68f5c
Merge pull request #316 from eed3si9n/wip/rsync 
rsync flags
 2019-12-24 22:41:13 -05:00
Eugene Yokota d35fe3aeaf rsync flags 
Fixes https://github.com/sbt/sbt/issues/5035

Currently `sbt` calls `rsync -a`, which expands to `-rlptgoD`, including `--group` and `--owner` flag that preserves the group and owner of the files. This drops the requirement since we just need to copy files around with the right timestamp.
 2019-12-24 21:35:01 -05:00
eugene yokota c0af7e91bb
Merge pull request #315 from eed3si9n/wip/sync 
Fix rsync check path
 2019-12-24 15:37:53 -05:00
Eugene Yokota 8d06d14019 Fix rsync check path 
Starting sbt 1.3.x we use Coursier to build the preloaded local repo using Maven layout.
 2019-12-24 15:12:30 -05:00
eugene yokota cba3843965
Merge pull request #5329 from eatkins/cross-serial 
Run cross commands (with `+`) in parallel when possible
 2019-12-24 12:56:25 -05:00
Arnout Engelen 1d0a415200 SOURCE_DATE_EPOCH is in seconds, let's pass milliseconds 2019-12-24 10:11:09 +01:00
Arnout Engelen 4353098454 Target develop branch of io, support SOURCE_DATE_EPOCH 2019-12-24 10:11:09 +01:00
Arnout Engelen ceb28a0a41 Target 1.4.0 2019-12-24 10:11:09 +01:00
Arnout Engelen 52b72a7e14 Target 1.4.0 2019-12-24 10:11:09 +01:00
Arnout Engelen 21533863da Don't emit timestamps when packaging to jar 
This makes the build more deterministic.
 2019-12-24 10:11:09 +01:00
Ethan Atkins d445590d9d Fix cross multi command performance 
In 53788ba356, I changed the cross multi
parser to issue all of the commands sequentially. This caused a
performance regression for many use cases:
https://github.com/sbt/sbt/issues/5321. This commit restores the old
behavior of `+` if the command to run has no arguments.
 2019-12-23 14:45:57 -08:00
Ethan Atkins 4207362835 Upgrade scala 2.13 version in scripted tests 2019-12-23 14:45:57 -08:00
Dale Wijnand 56aa46308b Revert "clarify message on sbt.version mismatch" 
This reverts commit 2f4b6f476a.
 2019-12-23 22:25:37 +00:00
eugene yokota 6f453b2a23
Merge pull request #5327 from eatkins/revert-scalatest-layer 
Revert scalatest layer
 2019-12-23 17:13:22 -05:00
Eugene Yokota 6e83ba5603 Reproduce #5308 
#5308
 2019-12-23 13:33:32 -08:00
Eugene Yokota 556098ec31 Don't close test ClassLoader by default 
Fixes https://github.com/sbt/sbt/issues/5262
 2019-12-23 13:33:32 -08:00
Ethan Atkins 424fe958e1 Revert "Place scalatest framework jar in its own classloader" 
This partially reverts commit 8518c4b4fd.

I left in the useful changes to ReverseLookupClassLoader.
 2019-12-23 13:33:04 -08:00
eugene yokota 7863bd28f6
Merge pull request #313 from eed3si9n/wip/exec 
don't use execRunner to copy rt.jar
 2019-12-23 14:48:01 -05:00
Eugene Yokota 5559440739 don't use execRunner to copy rt.jar 
Ref https://github.com/sbt/sbt-launcher-package/pull/308
Fixes https://github.com/sbt/sbt/issues/5270

The first time `sbt` runs on JDK 11, it copies the `rt.jar` by calling `execRunner java`.. it seems like the control never comes back from it and `sbt` just ends there. This fixes the problem by not calling `execRunner` for that operation.
 2019-12-23 01:50:37 -05:00
eugene yokota ae01f25bab
Merge pull request #5317 from eed3si9n/wip/cross 
workaround client / clean problem
 2019-12-20 15:33:59 -05:00
eugene yokota 60979336d5
Merge pull request #5322 from renatocaval/develop 
Clarify message on sbt.version mismatch
 2019-12-20 15:32:07 -05:00
eugene yokota 2df05c5bfb
Merge pull request #311 from er1c/jvm-debug 
Tweak sbt.bat to parse the -debug arguments first
 2019-12-20 09:32:30 -05:00
Eric Peters 29548d7628 Tweak sbt.bat to parse the -debug arguments first 2019-12-19 16:15:25 -08:00
Renato Cavalcanti 2f4b6f476a
clarify message on sbt.version mismatch 2019-12-19 08:21:28 +01:00
eugene yokota e4131814e7
Merge pull request #5318 from eed3si9n/wip/doc-scalainstance 
Remove actions/doc-scala-instance
 2019-12-17 13:55:29 -05:00
eugene yokota 215b16cde1
Merge pull request #5315 from olafurpg/forkmain-classloader 
Add library-friendly entrypoint for sbt.ForkMain
 2019-12-17 13:20:44 -05:00
Eugene Yokota 68284b38e4 Remove actions/doc-scala-instance 
Fixes https://github.com/sbt/sbt/issues/5316

The latest doesn't look like it's testing anything.
 2019-12-17 13:16:02 -05:00
Eugene Yokota faa1540009 workaround client / clean problem 
Ref https://github.com/sbt/sbt/issues/5314
Ref https://github.com/sbt/sbt/pull/5265

In sbt 1.3.4, it's possible to define a subproject named `client`.
The current parser behaves differently whether we calll `client/clean` or `client / clean` with whitespaces. The one with the whitespace invokes `client` command (as in thin client). This gets triggered by `+clean` because the new implementation uses whitespace.
 2019-12-17 12:52:18 -05:00
Olafur Pall Geirsson fd658f38d3 Add library-friendly entrypoint for sbt.ForkMain 
Previously, it was not possible to use `sbt.ForkMain` as a library since
* it called `System.exit`, shutting down the library client JVM process.
* it assumed that it was always running in the same classloader as where
  the test suites it was running causing "class not found: my.test.Suite"
  if the `ForkMain` class lives in a classloader above the test suite
  classes.
This commit adds a new `main(Array[String],ClassLoader])` entrypoint
that allows clients to call `ForkMain` as a library.
 2019-12-17 10:51:10 +00:00
eugene yokota d528d0734e
Merge pull request #310 from eed3si9n/wip/offline 
Fix Coursier export by adding missing artifacts
 2019-12-13 11:25:04 -05:00
Eugene Yokota 595bf0fc2d Fix Coursier export by adding missing artifacts 
Ref https://github.com/sbt/sbt-launcher-package/pull/145
Ref https://github.com/sbt/sbt-launcher-package/pull/267
 2019-12-13 10:45:13 -05:00
eugene yokota 19c3b44b59
Merge pull request #5303 from eed3si9n/wip/cache_removal 
Fixes update task not invalidating
 2019-12-13 05:57:48 -05:00
eugene yokota cfbdd8d82c
Merge pull request #5302 from eatkins/util-contraband 
Add utilLogging contraband directory to managedSourceDirectories
 2019-12-12 22:51:41 -05:00
eugene yokota b8f1edb6cc
Merge pull request #5301 from eatkins/classloader-close 
Add closeClassLoader setting
 2019-12-12 22:49:45 -05:00
Eugene Yokota 2b24f05435 Fixes update task not invalidating 
Fixes https://github.com/sbt/sbt/issues/5292
Ref https://github.com/sbt/sbt/issues/5142

`update` task checks if the timestamp is still the same from the previous resolution. This no longer works since lm-coursier does not populate the timestamps in `UpdateReport`. See 2e5c8aed5e/modules/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala (L346-L351)

Since the stamps are empty, this caused `update` not to invalidate when the cache is completely missing. This works around the issue by checking if the file still exists. It also adds a warning that the file is missing.
 2019-12-12 22:39:05 -05:00