Commit Graph

17910 Commits

Author SHA1 Message Date
Matthias Kurz b522825464
Add aarch64 libsbtipcsocket.so native-image/resource-config.json 2023-01-02 22:22:11 +01:00
Eugene Yokota 774d6be24f Revert "Update slf4j-api to 2.0.3"
This reverts commit 8f594cf0f78060019b5a75ee083a8bd35872ca6c.
2023-01-01 22:55:24 -05:00
eugene yokota 1d027ec655
Merge pull request #7105 from eed3si9n/wip/merge-1.9.x
Merge 1.9.x into develop branch
2023-01-01 22:05:03 -05:00
eugene yokota b5c01a9f4d
Merge pull request #7107 from eed3si9n/bk/6eaad925fbae66df5bc44b2d3aa2401d22f1833b
[1.8.x] ipcsocket 1.6.1
2023-01-01 22:04:36 -05:00
Eugene Yokota 0bd5e77068 ipcsocket 1.6.1 2022-12-31 22:20:54 -05:00
eugene yokota d619d8007a
Merge pull request #7106 from eed3si9n/wip/ipcsocket
ipcsocket 1.6.1
2022-12-31 22:20:09 -05:00
Eugene Yokota 6eaad925fb ipcsocket 1.6.1 2022-12-31 16:48:52 -05:00
Eugene Yokota bb40e1bc87 Merge branch '1.9.x' into wip/merge-1.9.x 2022-12-31 16:28:47 -05:00
eugene yokota 8f1dfb802b
Merge pull request #7104 from sbt/1.8.x
Merge 1.8.x
2022-12-31 13:47:16 -05:00
eugene yokota cc7a93b95b
Merge pull request #7102 from eed3si9n/wip/note
Note on developing
2022-12-31 13:42:06 -05:00
Eugene Yokota ff56e88532 Note on developing 2022-12-31 13:38:17 -05:00
Adrien Piquerez e8c58df337
Merge pull request #7100 from ckipp01/debugProvider
fix: ensure sbt server says it's a debugProvider
2022-12-29 17:50:00 +01:00
Chris Kipp 4a6832f281 fix: ensure sbt server says it's a debugProvider
I believe this was just an oversight that it's not marked as true since
sbt can handle `debugSession/start`. This change just ensures that
during the initialization process sbt says it's a `debugProvider` for
the same languages as `runProvider` and `testProvider`. It also
correctly marks the build targets as `canDebug`, unless they are sbt
targets.
2022-12-29 17:08:22 +01:00
eugene yokota 06d42e76ad
Merge pull request #7097 from sbt/dependabot/github_actions/actions/cache-3.2.1
Bump actions/cache from 3.0.11 to 3.2.1
2022-12-26 21:23:50 -05:00
eugene yokota 9afd3200f4
Update ci.yml 2022-12-26 19:03:20 -05:00
dependabot[bot] 0067bec213
Bump actions/cache from 3.0.11 to 3.2.1
Bumps [actions/cache](https://github.com/actions/cache) from 3.0.11 to 3.2.1.
- [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/v3.0.11...v3.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-26 04:00:43 +00:00
Adrien Piquerez 5a0e9b2fe7 Try resolve sbt plugin from valid Maven pattern
sbt plugins were published to an invalid path with regard to Maven's
specifictation.

As of sbt 1.9 we produce two POMs, a deprecated one and a new one,
that is valid with regard to Maven resolution. When resolving,
we first try to resolve the new valid POM and we fallback to
the invalid one if needed.

In the new POM format, we append the sbt cross-version to all
artifactIds of sbt plugins. This is because we want Maven to be
able to resolve the plugin and all its dependencies.

When parsing it, we remove the cross-version suffix so that
the result of parsing the valid POM format is exactly the same
as parsing the deprecated POM format. Hence conflict resolution
happens as intended.

More details can be found at https://github.com/sbt/sbt/pull/7096
2022-12-23 16:08:05 +01:00
Adrien Piquerez 458381eb3f
Merge pull request #439 from scala-steward/update/sbt-shading-2.1.1
Update sbt-shading to 2.1.1
2022-12-20 16:18:18 +01:00
Scala Steward e4286a0113
Update sbt-shading to 2.1.1 2022-12-20 14:44:08 +00:00
Scala Steward da501892e0
Update coursier to 2.1.0-RC3-1 (#438) 2022-12-19 10:50:53 +01:00
Scala Steward 6c2acf8847
Update slf4j-api to 2.0.6 (#437) 2022-12-19 10:50:35 +01:00
Matthew de Detrich 6611ccf94d
Set socket backlog to default size of 50 2022-12-08 11:21:43 +01:00
eugene yokota 973cd63e0b
Merge pull request #7085 from dos65/bspconfig_windows_path_fix 2022-12-06 21:57:57 -05:00
Vadim Chelyshov a2de0643a6 fix: bspConfig sbt.script - use `Path` env variable as a fallback for Windows
Originally reported in https://github.com/scalameta/metals/issues/4702#issuecomment-1339137772
2022-12-06 20:41:14 +03:00
eugene yokota 4318386f70
Merge pull request #7081 from SethTisue/fix-help-text
fix -debug-inc help text
2022-11-30 18:41:15 -05:00
Seth Tisue 49af47b9f8 fix -debug-inc help text 2022-11-30 13:48:09 -06:00
Scala Steward 214e2b67a8
Update slf4j-api to 2.0.5 (#434) 2022-11-29 09:54:42 +01:00
Scala Steward 9c5f2cf681
Update scala-collection-compat to 2.9.0 (#435) 2022-11-29 09:54:28 +01:00
eugene yokota a56de64daf
Merge pull request #79 from keynmol/fix-native-configure
Fix configure function not being called on nativePlatform
2022-11-23 00:41:09 -05:00
Anton Sviridov a230f8dd24 Fix configure function not being called on nativePlatform 2022-11-19 09:36:38 +00:00
eugene yokota 84774e5532
Merge pull request #432 from scala-steward/update/coursier-2.1.0-RC2
Update coursier to 2.1.0-RC2
2022-11-17 13:06:40 -05:00
Alexandre Archambault 35305810d8 Update allowed-files-in-shaded-jar list
Kind of annoying to have to update that list everytime plexus-archiver
in bumped in coursier… Hopefully, we can get rid of that dependency at
some point.
2022-11-17 14:44:57 +01:00
Scala Steward 0faa7291fb
Update coursier to 2.1.0-RC2 2022-11-16 16:42:58 +00:00
Scala Steward 3df025313b
Update sbt, scripted-plugin to 1.8.0 (#431) 2022-11-14 16:49:57 +01:00
Eugene Yokota 09e06c45f0 sbt 1.8.0 2022-11-10 16:30:41 -05:00
eugene yokota e8d272890d
Merge pull request #7073 from eed3si9n/wip/zinc
Zinc 1.8.0, lm 1.8.0
2022-11-10 16:10:40 -05:00
Eugene Yokota 05fe27226e Zinc 1.8.0, lm 1.8.0 2022-11-10 15:41:52 -05:00
eugene yokota 436656f719
Merge pull request #406 from eed3si9n/wip/bump
Bump io, util, and scala-xml
2022-11-10 13:59:56 -05:00
Eugene Yokota adc246ea9a Bump io, util, and scala-xml 2022-11-10 13:45:08 -05:00
eugene yokota 1b3f9a6357
Merge pull request #7072 from eed3si9n/wip/io
[1.8.x] lm-coursier-shaded 2.0.13
2022-11-10 12:26:36 -05:00
Eugene Yokota 03e1b3cadc Wipe out boot directory 2022-11-10 12:02:37 -05:00
Eugene Yokota e55955d918 lm-coursier-shaded 2.0.13 2022-11-10 11:19:57 -05:00
eugene yokota c8b7ee7d54
Merge pull request #405 from eed3si9n/wip/ivy
Ivy 2.3.0-sbt-a8f9eb5bf09d0539ea3658a2c2d4e09755b5133e
2022-11-10 10:11:23 -05:00
Eugene Yokota adc682c926 Ivy 2.3.0-sbt-a8f9eb5bf09d0539ea3658a2c2d4e09755b5133e 2022-11-10 10:04:52 -05:00
Adrien Piquerez 3ddf025c55
Merge pull request #429 from adpi2/coursier-2.1.0-RC1
Update coursier to 2.1.0-RC1
2022-11-10 15:42:06 +01:00
Adrien Piquerez ce16f8914e Update coursier to 2.1.0-RC1 2022-11-10 14:59:06 +01:00
Eugene Yokota f974cd3bab sbt 1.8.0-RC1 2022-11-06 23:25:22 -05:00
eugene yokota 34349e810e
Merge pull request #7068 from eed3si9n/wip/bump
Bump lm and zinc
2022-11-06 22:12:03 -05:00
Eugene Yokota 92c6903ec5 Bump lm and zinc 2022-11-06 21:35:26 -05:00
Tomasz Godzik e662168496
Merge pull request #428 from scala-steward/update/sbt-1.7.3
Update sbt, scripted-plugin to 1.7.3
2022-11-02 15:52:48 +01:00