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

17422 Commits

Author SHA1 Message Date
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 f2ed2224ff
Merge pull request #374 from adpi2/fix-6420 
Fix binary version of 3.0.1-RC1
 2021-03-30 14:17:57 -04:00
Adrien Piquerez c98e51418f Fix binary version of 3.0.1-RC1 2021-03-30 17:50:50 +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 8b67a07007
Merge pull request #349 from eed3si9n/wip/export-rt 
Remove export-rt
 2021-03-22 04:39:18 -04: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 73f473efce Remove export-rt 
The feature of export-rt is now folded into sbt-launcher
 2021-03-22 04:19:27 -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 23b7d923af
Merge pull request #373 from eed3si9n/wip/6388-take2 
Fix binary Scala warning, take 2
 2021-03-22 02:46:10 -04:00
Eugene Yokota fe33ed19de Fix binary Scala warning, take 2 
Ref https://github.com/sbt/librarymanagement/pull/372
 2021-03-22 02:30:00 -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
Scala Steward 6f887c6cd8
Update sbt-ci-release to 1.5.6 (#329) 2021-03-21 17:16:36 +01:00
Scala Steward b79b094269
Update sbt-shading to 2.0.1 (#332) 2021-03-21 17:16:30 +01:00
Scala Steward 2bea3ad0cf
Update coursier to 2.0.15 (#333) 2021-03-21 17:16:22 +01: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 beb45007dc
Merge pull request #372 from adpi2/fix-6388 
No binary scala warning if 3 and 2.13
 2021-03-18 10:45:01 -04:00
Adrien Piquerez fd9e1cd929 No binary scala warning if 3 and 2.13 2021-03-18 15:15:11 +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
Eugene Yokota 8c3f0970eb launcher 1.3.0-M2 2021-03-15 02:25:55 -04:00
dependabot[bot] 5542e9a720
Bump coursier/cache-action from v5 to v6 
Bumps [coursier/cache-action](https://github.com/coursier/cache-action) from v5 to v6.
- [Release notes](https://github.com/coursier/cache-action/releases)
- [Commits](https://github.com/coursier/cache-action/compare/v5...730a6a454f386fff4be026f3e304ee7fe68912ac)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-15 06:13:23 +00:00
Eugene Yokota 4a0ebac52a Bump Zinc, LM, and Launcher 2021-03-15 01:34:23 -04:00
eugene yokota 685eb71aa9
Merge pull request #371 from eed3si9n/wip/bintray_less 
Remove sbt-bintray
 2021-03-15 00:51:50 -04:00
Eugene Yokota 7f6bbafb9b Remove sbt-bintray 2021-03-14 23:57:13 -04:00
Eugene Yokota d39d6a6186 crossScalaVersions 2021-03-14 23:29:35 -04:00
eugene yokota 7b46f03b62
Merge pull request #6390 from eed3si9n/fport/bintray_less 
[fport] Drop Bintray from release
 2021-03-14 03:12:21 -04:00
Scala Steward ace31a3cda
Update scala-collection-compat to 2.4.2 (#319) 2021-03-11 11:32:09 +01:00
Scala Steward 9790495669
Update sbt, scripted-plugin to 1.4.9 (#328) 2021-03-10 14:22:53 +01:00
eugene yokota deb5139e12
Merge pull request #6380 from sbt/eed3si9n-patch-1 
Use fully qualified name in the macro
 2021-03-09 15:54:06 -05:00