Commit Graph

11707 Commits

Author SHA1 Message Date
eugene yokota 894789cd36
Merge pull request #7096 from adpi2/sbt-plugins-maven-path
[1.9.x] Smooth transition to valid Maven pattern of sbt plugins
2023-02-28 11:00:18 -05:00
Adrien Piquerez ada716fc1f Bump librarymanagement to 1.9.0-M1 2023-02-27 09:42:36 +01:00
Adrien Piquerez d05913f3b9 Bump lm-coursier-shaded to 2.0.16 2023-02-22 10:09:26 +01:00
Adrien Piquerez 8020ec4d7c Smooth transition to valid Maven pattern of sbt plugin
For an sbt plugin, we publish two POM files, the legacy one, and the
new Maven compatible one. The name of the new POM file contains the sbt
cross-version _2.12_1.0. The format of the new POM file is also slightly
different, because we append the sbt cross-version to all artifactIds of
sbt plugins. Hence Maven can resolve the new sbt plugin POM and its
dependencies.

When resolving an sbt plugin, we first try to resolve the new Maven POM
and if it fails we fallback on the legacy one. When parsing the new POM
format, we remove the sbt cross-version from all artifact IDs so that
there is no mismatch between old and new format of dependencies.
2023-02-22 10:09:26 +01:00
Adrien Piquerez 8e64caae8f Add scripted to test the sbt plugin resolution
As of sbt 1.9, we publish deprecated and valid poms. In this test
we check that sbt resolve the valid pom of an sbt plugin and fallback
to the deprecated pom if the valid pom cannot be found.
2023-02-22 10:09:26 +01:00
eugene yokota a326ee19c6
Merge pull request #7154 from mzuehlke/replace_olafurpg-setup-scala
Replace olafurpg/setup-scala with actions/setup-java
2023-02-21 00:08:52 -05:00
Marco Zühlke 8e4e2067fc Replace olafurpg/setup-scala with actions/setup-java
https://github.com/olafurpg/setup-scala/releases/tag/v14 is deprecated and migration to actions/setup-java is encouraged.
That action is already used in `ci.yml`
2023-02-20 21:14:51 +01:00
eugene yokota b5527cb358
Merge pull request #7153 from sbt/dependabot/github_actions/olafurpg/setup-scala-14
Bump olafurpg/setup-scala from 13 to 14
2023-02-20 10:40:54 -05:00
dependabot[bot] f9637e047f
Bump olafurpg/setup-scala from 13 to 14
Bumps [olafurpg/setup-scala](https://github.com/olafurpg/setup-scala) from 13 to 14.
- [Release notes](https://github.com/olafurpg/setup-scala/releases)
- [Commits](https://github.com/olafurpg/setup-scala/compare/v13...v14)

---
updated-dependencies:
- dependency-name: olafurpg/setup-scala
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-20 04:56:46 +00:00
adpi2 78f9b318e2
Merge pull request #7142 from adpi2/bsp-java-diags
Fix forwarding Java diagnostics through BSP
2023-02-06 11:06:01 +01:00
Adrien Piquerez ecc4469c3e Test diagnostics from Java 2023-01-27 12:10:32 +01:00
Adrien Piquerez 799adcda2b Some refacto of BuildServerTest
Generate BSP ids automatically
2023-01-27 10:22:23 +01:00
Adrien Piquerez 9b4d5a5a5a Fix reporting Java diagnostics through BSP
Java diagnostics don't have a pointer but we should report them.
Copied implementation from Bloop to translate the position of an
xsbti.Problem to a BSP range.
2023-01-27 10:21:44 +01:00
eugene yokota 3f1ff98790
Merge pull request #7134 from keynmol/patch-1 2023-01-21 05:36:03 -05:00
Anton Sviridov 60236f3b34
Remove spurious whitespace in the launcher script
It causes an error in (at least) fish shell: "sbt: line 174: local: `=': not a valid identifier"
2023-01-21 09:25:55 +00:00
eugene yokota a7f6717c6e
Merge pull request #7122 from eed3si9n/wip/sbtn
Fixes Debian 11 compat
2023-01-04 22:38:10 -05:00
Eugene Yokota b0b7705739 Fixes Debian 11 compat
Fixes https://github.com/sbt/sbt/issues/7118

Problem
-------
sbtn 1.8.1 was built using ubuntu-latest, which meant picking up newer
glibc.

Solution
--------
This downgraded the ubuntu machine to build sbtn.
2023-01-04 17:19:29 -05:00
eugene yokota 3257a48f3e
Merge pull request #7120 from eed3si9n/wip/m1
Fixes M1 support
2023-01-04 16:57:09 -05:00
Eugene Yokota 28f0c075ac Fixes M1 support
Fixes https://github.com/sbt/sbt/issues/7117

Problem
-------
sbt no longer works on a Mac with M1 (aarch64) chips because it fails on
ipcsocket library, which we maintain.
This was caused by architecture detection that was added in 1.6.1,
which did not take in account for macOS universal binary.

Solution
--------
Update to ipcsocket 1.6.2.
2023-01-04 15:46:08 -05:00
eugene yokota 377c4d6cf9
Merge pull request #7115 from eed3si9n/wip/bumpcoursier
lm-coursier-shaded 2.0.15
2023-01-03 14:29:32 -05:00
Eugene Yokota 59be97660c lm-coursier-shaded 2.0.15
Fixes https://github.com/sbt/sbt/issues/7062
2023-01-03 14:00:29 -05:00
eugene yokota 527dcfc7ce
Merge pull request #7113 from mkurz/use_latest_sbtn
Use latest sbtn
2023-01-03 13:55:57 -05:00
Matthias Kurz ac638a764d
Use latest sbtn 2023-01-03 16:02:18 +01:00
eugene yokota 31c09c114e
Merge pull request #7111 from mkurz/sbtn-aarch64-1.9.x
[1.9.x] Make use of sbtn aarch64 binary where possible
2023-01-03 09:56:09 -05:00
Matthias Kurz 8f4841de92
Define default arch variable 2023-01-03 12:41:50 +01:00
Matthias Kurz 5fa46859d2
Make use of sbtn aarch64 binary where possible 2023-01-03 12:41:49 +01:00
eugene yokota 82f48c758c
Merge pull request #7110 from eed3si9n/wip/aarch64_script
Add sbtn for aarch64 support
2023-01-03 01:11:50 -05:00
Eugene Yokota 0a3e3aad98 Add sbtn for aarch64 support 2023-01-03 00:39:17 -05:00
eugene yokota 94215a3e8b
Merge pull request #7109 from sbt/1.8.x
[1.9.x] Merge 1.8.x
2023-01-02 21:12:52 -05:00
eugene yokota e529c9a3a1
Merge pull request #7108 from mkurz/sbtn-aarch64
[1.8.x] Prepare aarch64 support for sbtn binary
2023-01-02 20:24:49 -05:00
Matthias Kurz 03ae9f452e
Set correct page size for aarch64 binaries 2023-01-02 23:48:13 +01:00
Matthias Kurz b522825464
Add aarch64 libsbtipcsocket.so native-image/resource-config.json 2023-01-02 22:22:11 +01: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 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
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
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 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 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