Commit Graph

17940 Commits

Author SHA1 Message Date
Eugene Yokota d1ea1f27e6 1.7.0-RC2 2022-07-02 19:59:55 -04:00
eugene yokota aad0464138
Merge pull request #6947 from eed3si9n/wip/banner
Banner
2022-07-02 19:20:11 -04:00
Eugene Yokota 31a6c60df3 Banner 2022-07-02 19:07:34 -04:00
eugene yokota f9b8121d2e
Merge pull request #6946 from eed3si9n/wip/cross_fix
Remove compatibility check from ++
2022-07-02 18:59:02 -04:00
Eugene Yokota 05d3d8689b Remove compatibility check from ++
Problem
-------
Since sbt-doge merger `++ <sv> <command1>` has used binary compatibility
as a test to select subproject, but it causes surprising situations like
sbt/sbt#6915, and it blurs the responsibility of YAML file and build
file as the version specified in the version can override the Scala
version test on local laptop.

Solution
--------
This removes the compatibiliy check (backward-only or otherwise),
and require that `<sv>` match one of `crossScalaVersions` using the new
Semantic Version selector pattern.
2022-07-02 18:38:04 -04:00
eugene yokota 6d0ef2093d
Merge pull request #6943 from raboof/more-appropriate-error-when-no-versions-match
Show a more appropriate message when no Scala versions matches
2022-06-28 09:26:06 -04:00
Arnout Engelen 697e3bce51
Show a more appropriate message when no Scala versions matches
When switching scala versions with a wildcard, and no subproject
has a matching version to switch to, show a more appropriate error
message
2022-06-28 14:43:06 +02:00
eugene yokota 789ca334d7
Merge pull request #6942 from raboof/more-useful-logging-for-flexible-version-switch 2022-06-28 07:52:54 -04:00
Arnout Engelen 6a79bdb461
Show a more useful log message when doing a flexible version switch
Suggested by @SethTisue in https://github.com/sbt/sbt/pull/6894#issuecomment-1168042209

Will show multiple lines when different versions are selected for different subprojects.

When no subprojects have a matching Scala version you will get a
'Switch failed' exception anyway, so in that case there is no
change in behavior.
2022-06-28 07:59:13 +02:00
Eugene Yokota 498493599f 1.7.0-RC1 2022-06-27 04:08:31 -04:00
Eugene Yokota bec2be707a Fix sbtn building 2022-06-27 03:09:43 -04:00
eugene yokota 7cc6ad3d00
Merge pull request #6939 from eed3si9n/wip/cross-fix
[1.7.x] Filter incompatible Scala 3 projects in cross switch commands, take 2
2022-06-27 00:08:29 -04:00
eugene yokota 910ab1951f
Merge pull request #6846 from Nirvikalpa108/fix-deadlock
[1.7.x] Attempts to fix sbt#6810 - deadlock issue
2022-06-26 22:50:22 -04:00
Rui Gonçalves 705d3d58ce Filter incompatible Scala 3 projects in cross switch commands 2022-06-26 22:46:37 -04:00
eugene yokota 9c0fbb678b
Merge pull request #401 from eed3si9n/wip/scala2version
Fix isScalaBinaryCompatibleWith
2022-06-26 21:19:23 -04:00
Eugene Yokota 457af6978f Fix isScalaBinaryCompatibleWith
Problem
-------
Current impl is relaxed about comparing non-release Scala 2.x versions.

Solutution
----------
Use scalaApiVersion to compare two Scala 2 versions.
2022-06-26 21:05:52 -04:00
eugene yokota c975982b41
Merge pull request #6938 from eed3si9n/wip/ipcsocket-1.5.0
[1.7.x] ipcsocket 1.5.0
2022-06-26 15:07:24 -04:00
Eugene Yokota 0598c9fdc1 ipcsocket 1.5.0
This bumps to ipcsocket 1.5.0, which fixes the temp directory cleanup
bug.
Fixes https://github.com/sbt/sbt/issues/6931
Fixes https://github.com/sbt/sbt/issues/6173
2022-06-26 14:37:12 -04:00
eugene yokota f9609bfc1a
Merge pull request #6937 from eed3si9n/wip/graal
[1.7.x] Build Graal native image using sbt-native-image
2022-06-26 14:32:45 -04:00
Eugene Yokota 21e5838cfd Build Graal native image using sbt-native-image 2022-06-26 13:25:58 -04:00
eugene yokota 105d13e15f
Merge pull request #6936 from raboof/fuzzy-switch-semantic-instead-of-glob
More flexible Scala version switch
2022-06-26 11:02:29 -04:00
Arnout Engelen 8973fce1fa
More flexible Scala version switch
By using SemanticSelector instead of custom globbing.

Follow-up on https://github.com/sbt/sbt/pull/6894,
fixes https://github.com/sbt/sbt/issues/6934
2022-06-26 12:43:41 +02:00
eugene yokota eb62b4f65d
Merge pull request #400 from ruippeixotog/add_is_compatible_with
Add CrossVersionExtra.isBinaryCompatible utility
2022-06-25 22:30:15 -04:00
eugene yokota 1db7dd328a
Merge pull request #6935 from eed3si9n/wip/temp-directories
[1.7.x] Fix sbt trying to delete /tmp on ARM Macs
2022-06-25 20:23:39 -04:00
eugene yokota 2fc446b395
Merge pull request #6933 from adpi2/backport-6929
[1.7.x] Backport #6929: Fix publishing BSP diagnostics
2022-06-25 19:06:47 -04:00
Eugene Yokota 87dc5da93a Fix sbt trying to delete /tmp on ARM Macs
Problem
-------
There's a bug in ipcsocket cleanup logic that effectively
tries to wipe out /tmp.

Workaround
----------
We should fix the underlying bug, but we can start by
explicitly configuring the temp directories ipcsocket uses.

Ref https://github.com/sbt/sbt/issues/6931
2022-06-25 18:58:19 -04:00
Rui Gonçalves daec6265c4
Rename function and extend support to Scala 4+ 2022-06-25 22:54:08 +01:00
Rui Gonçalves 2318269dc5
Add CrossVersionExtra.isBinaryCompatible utility 2022-06-25 21:41:10 +01:00
Kamil Podsiadlo 7921cab7e3 fix: publishing bsp diagnostics
* do not publish bsp diagnostics if there were and there are no problems
* publish diagnostics if problems needs to be updated
2022-06-25 11:14:51 +02:00
Adrien Piquerez a2060c9ba0
Merge pull request #6929 from kpodsiad/bsp-diagnostics-fix
fix: publish BSP diagnostics when it's necessary
2022-06-25 11:10:57 +02:00
eugene yokota 4a006cb79d
Merge pull request #6932 from eed3si9n/bport/6894
[1.7.x] Add support for wildcards in Scala version switch
2022-06-24 12:40:16 -04:00
Adrien Piquerez d0b8982bf4
Merge branch 'develop' into bsp-diagnostics-fix 2022-06-24 14:08:56 +02:00
Arnout Engelen cd915845db Add support for wildcards in Scala version switch
Picking from the `crossScalaVersions`

As discussed in https://github.com/sbt/sbt/discussions/6893
2022-06-24 01:41:38 -04:00
eugene yokota a12ef40485
Merge pull request #6894 from raboof/fuzzy-switch
Add support for wildcards in Scala version switch
2022-06-23 12:18:25 -04:00
Kamil Podsiadlo e8d60efbb4 fix: publishing bsp diagnostics
* do not publish bsp diagnostics if there were and there are no problems
* publish diagnostics if problems needs to be updated
2022-06-23 08:25:36 +02:00
Scala Steward 18a72e4975
Update scala-xml to 2.1.0 (#387)
Co-authored-by: Alexandre Archambault <alexarchambault@users.noreply.github.com>
2022-06-21 18:39:35 +02:00
Scala Steward ddd910559f
Update scalatest to 3.2.12 (#389) 2022-06-21 18:39:30 +02:00
Arnout Engelen 0d0a654c6f
Add support for wildcards in Scala version switch
Picking from the `crossScalaVersions`

As discussed in https://github.com/sbt/sbt/discussions/6893
2022-06-21 17:01:04 +02:00
eugene yokota 99a1baa7a8
Merge pull request #6930 from sbt/eed3si9n-patch-1
Turn off Nightly
2022-06-19 21:41:13 -04:00
eugene yokota ac8a17d2a3
Turn off Nightly 2022-06-19 21:09:49 -04:00
eugene yokota 5e3f547710
Merge pull request #6856 from opencastsoftware/remove-for-set-and-map
Add Remove instances for Set and Map
2022-06-16 18:24:28 -04:00
David Gregory 833483960f
Merge branch 'develop' into remove-for-set-and-map 2022-06-16 13:53:36 +01:00
eugene yokota f816aed059
Merge pull request #6924 from sbt/dependabot/github_actions/actions/cache-3.0.4
Bump actions/cache from 2.1.6 to 3.0.4
2022-06-13 13:41:40 -04:00
eugene yokota e8fcfd6152
Merge pull request #6923 from sbt/dependabot/github_actions/actions/setup-java-3
Bump actions/setup-java from 2 to 3
2022-06-13 13:41:22 -04:00
eugene yokota 203ec0dafa
Merge pull request #6922 from sbt/dependabot/github_actions/actions/setup-python-4
Bump actions/setup-python from 2 to 4
2022-06-13 13:41:07 -04:00
Eugene Yokota 171383f2ad Fix javadoc 2022-06-13 03:17:44 -04:00
eugene yokota 26cef6dcc2
Merge pull request #6921 from sbt/dependabot/github_actions/actions/checkout-3
Bump actions/checkout from 2 to 3
2022-06-13 03:04:31 -04:00
eugene yokota ddbb367573
Merge pull request #6920 from eed3si9n/wip/merge-1.7.x
Merge 1.7.x
2022-06-13 03:04:14 -04:00
Eugene Yokota 060a85f0d5 Merge branch '1.7.x' into wip/merge-1.7.x 2022-06-13 02:27:30 -04:00
dependabot[bot] eb98dbf9c0
Bump actions/cache from 2.1.6 to 3.0.4
Bumps [actions/cache](https://github.com/actions/cache) from 2.1.6 to 3.0.4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v2.1.6...v3.0.4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 06:08:40 +00:00