Commit Graph

17910 Commits

Author SHA1 Message Date
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
dependabot[bot] 913a4789f3
Bump actions/setup-java from 2 to 3
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2 to 3.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v2...v3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 06:08:38 +00:00
dependabot[bot] 3376448701
Bump actions/setup-python from 2 to 4
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 4.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2...v4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 06:08:36 +00:00
dependabot[bot] 4be80a8fa0
Bump actions/checkout from 2 to 3
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 06:08:33 +00:00
eugene yokota 290925fd99
Merge pull request #6916 from eed3si9n/wip/revert-6814
[1.7.x] Revert "Add support for scala-output-version flag in Scala 3"
2022-06-13 01:57:48 -04:00
eugene yokota a4b05466c4
Merge pull request #6917 from eed3si9n/wip/bump-scala
[1.7.x] Bump to Scala 2.12.16
2022-06-13 01:49:22 -04:00
Eugene Yokota d9e43ecfdf Revert "Add support for scala-output-version flag in Scala 3"
This reverts commit 1e89d71311.
2022-06-13 01:28:37 -04:00
Eugene Yokota d5889d3ce3 Bump to Scala 2.12.16 2022-06-13 01:27:24 -04:00
eugene yokota 6afc6b53be
Merge pull request #6919 from eed3si9n/wip/lm
[1.7.x] lm 1.7.0-M1
2022-06-13 01:25:32 -04:00
eugene yokota 747e336e51
Merge pull request #6918 from sbt/dependabot/github_actions/actions/setup-python-4
Bump actions/setup-python from 3 to 4
2022-06-13 01:02:42 -04:00
Eugene Yokota c04b2a4f73 lm 1.7.0-M1
This removes OkHttp dependency.
This also removes an experimental feature to customize HTTP for Ivy called
CustomHttp we added in sbt 1.3.0.
Since LM got switched to Coursier in 1.3.0, I don't think we advertized
CustomHttp.
2022-06-13 00:52:32 -04:00
dependabot[bot] 4bc880bfae
Bump actions/setup-python from 3 to 4
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3 to 4.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v3...v4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 04:02:43 +00:00
Eugene Yokota c896641f1c Turn off semanticdb on CI 2022-06-12 23:46:55 -04:00
eugene yokota da80b6a72f
Merge pull request #399 from eed3si9n/wip/gigahorse
Drop OkHttp dependency
2022-06-12 22:39:37 -04:00
Eugene Yokota 76452e53ff Drop OkHttp dependency
Ref https://github.com/sbt/sbt/issues/6912

Problem
-------
There's apparently a security issue with OkHttp 3.x,
which I am not really sure how applicable it is to our usage
of OkHttp but it is there.

Solution
--------
Since most of OkHttp-specic usage within LM is for Apache Ivy
downloading, I am going to drop this.
Since `sbt.librarymanagement.Http.http` is a public API,
I am substituting this with Apache HTTP backed implementation.
2022-06-12 22:24:44 -04:00
Eugene Yokota 91bf2649b2 Bump sbt 2022-06-12 22:03:23 -04:00
eugene yokota 1b4b9f3618
Merge pull request #6907 from eed3si9n/bport/6887
[1.7.x] Use XDG_RUNTIME_DIR environment variable to choose the path used for the creation of sockets
2022-05-29 01:51:37 -04:00
Alonso Montero 120014bd65 Use XDG_RUNTIME_DIR environment variable to choose the path used for the creation of sockets (#6887)
The `XDG_RUNTIME_DIR` environment variable will be used to choose the base directory in which the sockets will be created by **sbt**. This can help when issues such as #6777 appear. There are other related issues, such as #6101, [Metals issue #2235](https://github.com/scalameta/metals/issues/2235), [Che issue #18394](https://github.com/eclipse/che/issues/18394). Those are closed issues, but there are some cases in which the solution does not work (such as the case in #6777). Furthermore, the solution given seems more like a workaround than an actual fix.

**What causes this issue?**
At least in my case, the **ServerAlreadyBootingException** is thrown after **sbt** tries to create a Unix domain socket and fails. In my specific environment, I was not able to create the sockets in some directories because they were mounted on an NFS. This prevented me from using any automated sbt command on any of those directories (Metals uses sbt under the hood, and it was not able to start because of the ServerAlreadyBootingException), which in turn resulted in me not being able to use Metals on a project that was created on any of those directories. 

**How is the issue solved in this PR?**
If the `XDG_RUNTIME_DIR` environment variable is set, then sockets will be created in a folder with a hashed name, inside the directory `XDG_RUNTIME_DIR/.sbt/`. If this variable is not set, everything works exactly the same as always.

Let's see an example:

1. My environment variable `XDG_RUNTIME_DIR` is set to /home/alonso/.runtime-dir`
2. I create my project in `/home/alonso/workspace/hello-world`
3. I run `sbt compile`
4. The socket is created in `/home/alonso/.runtime-dir/.sbt/sbt-socket102030405060/sbt-load.sock`. The number **102030405060** is a hash that is computed from the base directory of the project (it is actually the same hash that is produced in order to create sockets in Windows) and it will be different depending on the location of the project
5. The sbt command executed correctly, which would not have happened if the socket had been created in the `home/alonso/workspace` directory or any of its subdirectories (in this example, `/home/BlackDiamond/workspace` corresponds to a network file share)

Co-authored-by: Alonso Montero <lumontero@mobilize.net>
2022-05-28 23:38:56 -04:00
eugene yokota e0f67601ca
Merge pull request #6903 from gontard/testQuickFix5504
Fix testQuick on changed function in object
2022-05-28 18:54:18 -04:00
Alonso Montero 86fd6dc058
Use XDG_RUNTIME_DIR environment variable to choose the path used for the creation of sockets (#6887)
The `XDG_RUNTIME_DIR` environment variable will be used to choose the base directory in which the sockets will be created by **sbt**. This can help when issues such as #6777 appear. There are other related issues, such as #6101, [Metals issue #2235](https://github.com/scalameta/metals/issues/2235), [Che issue #18394](https://github.com/eclipse/che/issues/18394). Those are closed issues, but there are some cases in which the solution does not work (such as the case in #6777). Furthermore, the solution given seems more like a workaround than an actual fix.

**What causes this issue?**
At least in my case, the **ServerAlreadyBootingException** is thrown after **sbt** tries to create a Unix domain socket and fails. In my specific environment, I was not able to create the sockets in some directories because they were mounted on an NFS. This prevented me from using any automated sbt command on any of those directories (Metals uses sbt under the hood, and it was not able to start because of the ServerAlreadyBootingException), which in turn resulted in me not being able to use Metals on a project that was created on any of those directories. 

**How is the issue solved in this PR?**
If the `XDG_RUNTIME_DIR` environment variable is set, then sockets will be created in a folder with a hashed name, inside the directory `XDG_RUNTIME_DIR/.sbt/`. If this variable is not set, everything works exactly the same as always.

Let's see an example:

1. My environment variable `XDG_RUNTIME_DIR` is set to /home/alonso/.runtime-dir`
2. I create my project in `/home/alonso/workspace/hello-world`
3. I run `sbt compile`
4. The socket is created in `/home/alonso/.runtime-dir/.sbt/sbt-socket102030405060/sbt-load.sock`. The number **102030405060** is a hash that is computed from the base directory of the project (it is actually the same hash that is produced in order to create sockets in Windows) and it will be different depending on the location of the project
5. The sbt command executed correctly, which would not have happened if the socket had been created in the `home/alonso/workspace` directory or any of its subdirectories (in this example, `/home/BlackDiamond/workspace` corresponds to a network file share)

Co-authored-by: Alonso Montero <lumontero@mobilize.net>
2022-05-26 23:10:41 -04:00
eugene yokota c571b466ee
Merge pull request #397 from xuwei-k/remove-bintray-resolver
remove bintray resolver
2022-05-25 12:27:05 -04:00
eugene yokota 359dbed6a8
Merge pull request #6902 from unkarjedy/oldshell-fix-1.7.x
"oldshell" command should use `OldShell` on failure instead of `Shell`
2022-05-25 12:18:33 -04:00
gontard 3c497addd1 Fix testQuick on changed function in object
Fix https://github.com/sbt/sbt/issues/5504
2022-05-24 10:56:25 +02:00
gontard 903fd6ae7a Reproduce issue #5504 in scripted test 2022-05-24 10:55:42 +02:00
gontard 65cdcf434d Activate test-quick scripted test 2022-05-23 21:31:26 +02:00
gontard e42c6ccaed Fix scripted tests doc 2022-05-23 20:54:11 +02:00
dmitrii.naumenko 9565e33ea8 "oldshell" command should use `OldShell` on failure instead of `Shell`
following up https://github.com/sbt/sbt/pull/3098
2022-05-23 19:58:41 +03:00
xuwei-k f6ff6996a5 fix typo 2022-05-23 07:37:34 +09:00
kenji yoshida 85271660c7
remove bintray resolver 2022-05-22 10:02:26 +09:00
eugene yokota e15f0c149a
Merge pull request #393 from armanbilge/feature/sonatypeRepos
Deprecate `sonatypeRepo`, add `sonatypeOssRepos` to `Resolver`
2022-05-07 19:04:44 -04:00
eugene yokota 3a9a384035
Merge pull request #6889 from eed3si9n/wip/oldLastGrep
Fix Main.scala referencing oldLastGrep
2022-05-01 14:29:04 -04:00