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

10515 Commits

Author SHA1 Message Date
eugene yokota 7969a155b0
Merge pull request #6448 from Philippus/patch-1 
Fix typo
 2021-04-12 15:24:42 -04:00
Philippus Baalman 4bf7f3a877
Fix typo 2021-04-12 21:02:14 +02:00
eugene yokota 627f72ef87
Merge pull request #6425 from ashleymercer/issues/2853-junit-config 
Allow output directory for JUnitXmlTestsListener to be configured
 2021-04-12 10:15:56 -04:00
Ashley Mercer b37fc6d5be Allow JUnitXmlTestsListener output directory to be configured 
Add `testReportsDirectory` setting to allow output directory for
JUnitXmlTestsListener to be configured.

Add `testReportSettings` which provides defaults values:

- by default this uses the build configuration name as a prefix so
  `target/test-reports` for `Test` config, but `target/it-reports`
  for `IntegrationTest` (previously this was hardcoded to always
  use `target/test-reports`). To override this set e.g.

  `Test / testReportsDirectory := target.value / "my-custom-dir"`

- the `JunitXmlTestsListener` is now only attached to the `Test`
  and `IntegrationTest` configs by default (previously it was added
  to the global configuration object). Any configs which inherit
  from one of these will continue to have the listener attached;
  but completely custom configurations will need to re-add with:

  `project.settings(testReportSettings)`

Fixes #2853
 2021-04-12 12:17:50 +01:00
eugene yokota 039c386308
Merge pull request #6434 from adpi2/fix-6432 
Fix MetaBuildLoader
 2021-04-10 12:20:10 -04:00
Adrien Piquerez 7ac35d11d9 Fix MetaBuildLoader 2021-04-07 17:11:38 +02:00
eugene yokota 34a52a40f1
Merge pull request #6431 from adpi2/fix-6430 
Fix unused nowarn in sbt plugins
 2021-04-06 17:06:33 -04:00
Adrien Piquerez 56746d5792 Fix unused nowarn in sbt plugins 2021-04-06 15:45:52 +02:00
eugene yokota 7c266e80b6
Merge pull request #6429 from eed3si9n/wip/bumplauncher 
Launcher 1.3.0
 2021-04-04 02:54:04 -04:00
Eugene Yokota b78d111333 Launcher 1.3.0 2021-04-04 02:20:52 -04:00
eugene yokota c12daab9ea
Merge pull request #6428 from eed3si9n/wip/bumpzinc 
Zinc 1.5.0
 2021-04-04 02:19:20 -04:00
Eugene Yokota c1c02853b4 Zinc 1.5.0 2021-04-04 01:29:52 -04:00
eugene yokota 113e427e6b
Merge pull request #6427 from eed3si9n/wip/util-interface 
Fixes util-interface depending on Scala
 2021-04-03 19:45:10 -04:00
Eugene Yokota 72f18bda75 Fixes util-interface depending on Scala 2021-04-03 19:23:38 -04:00
eugene yokota 521dc25df5
Merge pull request #6426 from eed3si9n/wip/bumpio 
IO 1.5.0
 2021-04-03 18:26:40 -04:00
Eugene Yokota 2709a1e8a3 Scala 2.13.5 2021-04-03 16:02:58 -04:00
Eugene Yokota ba3a808044 IO 1.5.0 2021-04-03 16:01:45 -04:00
eugene yokota 0a0e87ff22
Merge pull request #6424 from adpi2/scala3-cross-target 
Use full Scala 3 version in crossTarget
 2021-04-02 10:55:05 -04:00
Ashley Mercer 255f9c5553
Merge pull request #1 from sbt/develop 
Pull latest changes
 2021-04-02 12:34:58 +01:00
Adrien Piquerez 09dd3b09f4 Add test for Scala 3 cross-target 2021-04-01 14:00:03 +02:00
Adrien Piquerez b0ee80e34e Use full Scala 3 version in crossTarget 2021-04-01 10:23:38 +02:00
eugene yokota 59130d4703
Merge pull request #6422 from smarter/fix-sandwich 
Fix Scala 2.13-3.0 sandwich on Scala >= 3.0.0
 2021-03-31 19:11:33 -04:00
Guillaume Martres 24dba24b2a Fix Scala 2.13-3.0 sandwich on Scala >= 3.0.0 
The binary version of Scala >= 3.0.0 will be 3, but the logic was
hardcoded for 3.0.
 2021-03-31 13:54:40 +02:00
eugene yokota e31e18927c
Merge pull request #6419 from eed3si9n/wip/clean 
Fixes clean not cleaning files added to cleanFiles
 2021-03-29 00:44:53 -04:00
Eugene Yokota 2a3a0f5594 Fixes clean not cleaning files added to cleanFiles 
Fixes #6395

The current code assumes cleanFiles are only directories. This fixes that.
 2021-03-29 00:23:50 -04:00
eugene yokota 1cb23c843b
Merge pull request #6417 from mkurz/fix_warn 
Add missing versionScheme to warning
 2021-03-28 16:43:07 -04:00
eugene yokota 966dff9684
Merge pull request #6418 from VlachJosef/develop 
Instantiate only test runners needed by current TestDefinitions
 2021-03-28 16:39:01 -04:00
Josef Vlach 0c7bc71403
Instantiate only test runners needed by current TestDefinitions 2021-03-28 20:58:18 +01:00
Matthias Kurz dc2865d407
Add missing versionScheme to warning 2021-03-28 21:31:48 +02:00
eugene yokota 3e125fa040
Merge pull request #6414 from adpi2/fix-6410 
Fix internal dependency configurations
 2021-03-23 16:13:53 -04:00
Adrien Piquerez 6bfe741052 Add scripted for bspInternalDependencyConfigurations 2021-03-23 16:21:59 +01:00
Adrien Piquerez 54c27d575b Fix internal dependency configurations 2021-03-23 15:58:23 +01:00
eugene yokota 0e9ddf4afc
Merge pull request #6409 from eed3si9n/wip/bump 
Zinc 1.5.0-M5 and lm 1.5.0-M9
 2021-03-22 04:20:26 -04:00
Eugene Yokota f5cba5209a Zinc 1.5.0-M5 and lm 1.5.0-M9 2021-03-22 03:47:51 -04:00
eugene yokota 4d8258ba67
Merge pull request #6408 from eed3si9n/wip/windows_cache 
Use LOCALAPPDATA or $HOME/AppData/Local on Windows
 2021-03-21 23:59:55 -04:00
Eugene Yokota 01e3d9e9d8 Use LOCALAPPDATA or $HOME/AppData/Local on Windows 
Fixes https://github.com/sbt/sbt/issues/5206

Problem
--------
Coursier uses directories-jvm to determine its default cache directory.
Currently directories-jvm shells out to Powershell to call the [Known Folders API](https://docs.microsoft.com/en-us/windows/win32/shell/knownfolderid), which doesn't work in various environments, and instead of an error, it apparently returns `null/Coursier/cache` as the directory name.

Solution
--------
With due respect to the heroic effort directories-jvm is making to comply to the directory standards on all operating systems, including that of Microsoft, I don't think the majority of the sbt users care exactly where that directory is as long as it is well-documented, and calculated in a fast and predictable way.

Instead of shelling out to Powershell, or using JNI, to hit the Known Folders API, I propose we first look at `LOCALAPPDATA` environment variable. When it is not found, it will fall back to `$HOME/AppData/Local`. Per discussion in https://github.com/dirs-dev/directories-jvm/issues/43, `LOCALAPPDATA` environment variable may NOT represent the one-true Known Folders API value of the AppData directory in case the user happened to have set the `LOCALAPPDATA` environmental variable. For the purpose of picking a directory for Coursier cache, I don't find that to be a problem because it will be faster, more reliable, and predictable.
 2021-03-21 20:50:03 -04:00
eugene yokota 07687e51e4
Merge pull request #6407 from eed3si9n/wip/bumpcoursier 
lm-coursier-shaded 2.0.8
 2021-03-21 18:51:03 -04:00
Eugene Yokota d19b2faaa5 Clear .sbt/scripted/ directory 2021-03-21 18:11:01 -04:00
Eugene Yokota 79d7832a35 lm-coursier-shaded 2.0.8 
Fixes https://github.com/sbt/sbt/issues/6243
This updates the underlying Coursier from 2.0.12 to 2.0.15

https://github.com/coursier/coursier/releases/tag/v2.0.13
- NumberFormatException fix

https://github.com/coursier/coursier/releases/tag/v2.0.15
- Updates directories-jvm to 24
 2021-03-21 16:00:31 -04:00
eugene yokota 65309c890f
Merge pull request #6406 from eed3si9n/wip/launcher 
Launcher 1.3.0-M3
 2021-03-21 13:15:00 -04:00
Eugene Yokota 34eed6f24c Launcher 1.3.0-M3 2021-03-21 05:46:18 -04:00
eugene yokota bc40c75964
Merge pull request #6393 from sbt/dependabot/github_actions/coursier/cache-action-v6 
Bump coursier/cache-action from v5 to v6
 2021-03-20 23:53:45 -04:00
eugene yokota b8691cba88
Merge pull request #6397 from arixmkii/bsp-env-var 
Environment variables support in BSP debug session
 2021-03-19 11:45:01 -04:00
Arthur Sengileyev 75a5135417 Adding env vars at ScalaMainClass creation time 2021-03-18 23:13:03 +02:00
eugene yokota cc94de91b6
Merge pull request #6403 from adpi2/fix-6398 
Silence unused-nowarn in meta-build
 2021-03-18 15:46:35 -04:00
Adrien Piquerez 332b53735e Silence unused-nowarn in meta-build 2021-03-18 18:27:26 +01:00
eugene yokota 2e930987e1
Merge pull request #6401 from adpi2/fix-6176 
Sanitize sbt-launch-jar in BSP connection details
 2021-03-17 17:44:59 -04:00
Adrien Piquerez 503e09ce00 sanitize sbt-launch-jar 2021-03-17 17:44:33 +01:00
Arthur Sengileyev 970ce22aca Environment variables support in BSP debug session 2021-03-15 13:41:50 +02:00
eugene yokota 699ffe57cd
Merge pull request #6391 from eed3si9n/wip/bump 
Bump Zinc, LM, and Launcher
 2021-03-15 03:00:32 -04:00