Commit Graph

17422 Commits

Author SHA1 Message Date
Alexandre Archambault f3a28b97b7
Merge pull request #404 from alexarchambault/sbt-1.5.6
Update sbt to 1.5.6
2022-08-12 20:15:54 +02:00
Alexandre Archambault 117ff375b9 Ignore scala-xml version mismatch in 2.13
Hope this isn't a problem downstream…
2022-08-12 17:57:37 +02:00
Alexandre Archambault f73ea018ed Revert "Update scala-xml to 2.1.0 (#387)"
This reverts commit 18a72e4975.
2022-08-12 17:44:13 +02:00
Alexandre Archambault 240725e35f Update sbt to 1.5.6 2022-08-12 17:31:51 +02:00
Alexandre Archambault 8501e265b5
Merge pull request #401 from alexarchambault/sbt-mainline
Use mainline sbt launcher on CI
2022-08-12 17:24:31 +02:00
Alexandre Archambault b587076320 Address deprecation warning 2022-08-12 14:51:31 +02:00
Alexandre Archambault c89ba1c4ff Remove unused script 2022-08-12 14:51:31 +02:00
Alexandre Archambault a301c86d6d Use mainline sbt launcher on CI 2022-08-12 14:51:31 +02:00
Alexandre Archambault 9ac7e77c1c
Update coursier to 2.1.0-M6-49-gff26f8e39 (#402) 2022-08-12 14:48:39 +02:00
dependabot[bot] c82bb68a1e
Bump actions/checkout from 2 to 3 (#385)
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>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-08-12 12:20:13 +02:00
Alexandre Archambault 890efe1619
Update coursier to 2.1.0-M6-28-gbad85693f (#392) 2022-08-12 11:58:04 +02:00
Eugene Yokota f9453d67c6 Temporarily fork to org.scala-sbt 2022-08-12 00:43:36 -04:00
Eugene Yokota cf98ce2ee0 Scala 3 support 2022-08-12 00:14:58 -04:00
Eugene Yokota b807671ec5 Downgrade scala-xml to _2.13 on Scala 3
Since Coursier doesn't have Scala 3 artifacts yet, downgrade scala-xml
so we can use for3Use2_13.
2022-08-11 23:40:40 -04:00
Eugene Yokota 58912ff8f6 Use dataclass-scalafix for code gen
This is a prepration step for Scala 3 support.
Instead of data-class, this uses
https://github.com/hamnis/dataclass-scalafix.

Since it cannot use `withX` method in the data class itself with this
approach, I created `syntax` package object to extend some methods to
the generated classes.
2022-08-11 23:23:16 -04:00
eugene yokota 3b12ebcf98
Merge pull request #7002 from eed3si9n/fport/1.7.x
Merge 1.7.x commits to develop
2022-08-10 23:34:33 -04:00
Eugene Yokota bbc91a4788 Merge branch '1.7.x' into fport/1.7.x 2022-08-10 21:53:50 -04:00
eugene yokota e05acf9ca1
Merge pull request #6999 from eed3si9n/bport/6994
[1.8.x] add output when boot server socket fails to create
2022-08-10 20:46:47 -04:00
eugene yokota 5abb51f3ef
Merge pull request #7001 from eed3si9n/bport/6998
[1.7.x] feat: start forwarding diagnosticCode via BSP
2022-08-10 20:34:39 -04:00
Chris Kipp 92a9f0e583 feat: start forwarding diagnosticCode via BSP
This change is a continuation of the work that was done in
https://github.com/sbt/sbt/pull/6874 to allow the Scala 3 compiler to
forward the `diagnosticCode` of an error as well as the other normal
things. This change in dotty was merged in
https://github.com/lampepfl/dotty/pull/15565 and also backported so it
will be in the 3.2.x series release. This change captures the
`diagnosticCode` and forwards it on via BSP so that tools like Metals
can can use this code.

You can see this in the BSP trace now for a diagnostic:

For example with some code that contains the following:

```scala
val x: Int = "hi"
```

You'll see the code in the BSP diagnostic:
```  "diagnostics": [
    {
      "range": {
        "start": {
          "line": 9,
          "character": 15
        },
        "end": {
          "line": 9,
          "character": 19
        }
      },
      "severity": 1,
      "code": "7",
      "source": "sbt",
      "message": "Found:    (\u001b[32m\"hi\"\u001b[0m : String)\nRequired: Int\n\nThe following import might make progress towards fixing the problem:\n\n  import sourcecode.Text.generate\n\n"
    }
  ]
```

Co-authored-by: Adrien Piquerez <adrien.piquerez@gmail.com>
Refs: https://github.com/lampepfl/dotty/issues/14904
2022-08-10 10:12:54 -04:00
Devin Fisher 9f9b08edbd refactor printing error to an in-function function 2022-08-10 10:08:49 -04:00
Devin Fisher 5874ad920e add output when book server socket fails to create 2022-08-10 10:08:42 -04:00
eugene yokota 2d00c693b7
Merge pull request #6994 from devin-fisher/develop
add output when boot server socket fails to create
2022-08-10 10:06:07 -04:00
eugene yokota ab59e4c6ba
Merge pull request #6998 from ckipp01/captureCodeBsp
feat: start forwarding diagnosticCode via BSP
2022-08-10 10:03:40 -04:00
Chris Kipp 15a45cb3c0 feat: start forwarding diagnosticCode via BSP
This change is a continuation of the work that was done in
https://github.com/sbt/sbt/pull/6874 to allow the Scala 3 compiler to
forward the `diagnosticCode` of an error as well as the other normal
things. This change in dotty was merged in
https://github.com/lampepfl/dotty/pull/15565 and also backported so it
will be in the 3.2.x series release. This change captures the
`diagnosticCode` and forwards it on via BSP so that tools like Metals
can can use this code.

You can see this in the BSP trace now for a diagnostic:

For example with some code that contains the following:

```scala
val x: Int = "hi"
```

You'll see the code in the BSP diagnostic:
```  "diagnostics": [
    {
      "range": {
        "start": {
          "line": 9,
          "character": 15
        },
        "end": {
          "line": 9,
          "character": 19
        }
      },
      "severity": 1,
      "code": "7",
      "source": "sbt",
      "message": "Found:    (\u001b[32m\"hi\"\u001b[0m : String)\nRequired: Int\n\nThe following import might make progress towards fixing the problem:\n\n  import sourcecode.Text.generate\n\n"
    }
  ]
```

Co-authored-by: Adrien Piquerez <adrien.piquerez@gmail.com>
Refs: https://github.com/lampepfl/dotty/issues/14904
2022-08-09 19:02:52 +02:00
eugene yokota a1e0f6a904
Merge pull request #6995 from sbt/dependabot/github_actions/actions/cache-3.0.6
Bump actions/cache from 3.0.5 to 3.0.6
2022-08-08 18:23:57 -04:00
Devin Fisher 157030212a refactor printing error to an in-function function 2022-08-08 11:21:43 -06:00
dependabot[bot] 5b09ba03a3
Bump actions/cache from 3.0.5 to 3.0.6
Bumps [actions/cache](https://github.com/actions/cache) from 3.0.5 to 3.0.6.
- [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.5...v3.0.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-08 04:04:59 +00:00
Adrien Piquerez 73fd426847
Merge pull request #6992 from adpi2/fix-bg-logging
Fix background job logging
2022-08-06 09:19:42 +02:00
Devin Fisher 0d37a9eae2 add output when book server socket fails to create 2022-08-05 09:57:22 -06:00
Adrien Piquerez 634e8799e7 Catch ClosedChannelException in background job logger
We want the background job to stay alive even if its terminal
has been closed and we cannot write to it anymore
2022-08-05 14:45:38 +02:00
Adrien Piquerez 592086b889 Don't use ProxyTerminal in background job
If we use the ProxyTerminal in the background jobs, the logs
would be spread across different terminals, switching from active
client to active client. We want the logs to stick
to the client that started the job.
2022-08-04 16:48:13 +02:00
Adrien Piquerez 6bcda6684a Use BackgroundJobService context instead of MainLoop context
A new context is created and closed for each state of the MainLoop.
But the context of the backgroundJob must stay alive.
So we use a context that is owned by the BackgroundJobService.
It creates a new logger for each background job and cleans it when
the job stops.
2022-08-04 16:48:13 +02:00
Adrien Piquerez 59ee1b1d37
Merge pull request #6990 from adpi2/bckp_bsp_output_paths
[1.8.x] Add support for BSP's buildTarget/outputPaths method
2022-08-03 15:26:57 +02:00
Krzysztof Pado 2bffb2731e Add support for BSP's buildTarget/outputPaths method 2022-08-03 10:13:48 +02:00
Adrien Piquerez 4de480fa03
Merge pull request #6985 from povder/bsp_output_paths
Add support for BSP's buildTarget/outputPaths method
2022-08-03 10:12:32 +02:00
Krzysztof Pado 58f0ff612c Add support for BSP's buildTarget/outputPaths method 2022-08-01 19:31:43 -07:00
Scala Steward 65e506280f
Update scalatest to 3.2.13 (#399) 2022-07-31 18:24:46 +02:00
Scala Steward e4677cb58f
Update utest to 0.8.0 (#393) 2022-07-30 20:20:29 +02:00
Scala Steward 7e22af8a8b
Update scala-library to 2.12.16 (#394) 2022-07-30 20:20:23 +02:00
Scala Steward 9bb84922c4
Update scala-collection-compat to 2.8.1 (#398) 2022-07-30 20:20:16 +02:00
eugene yokota 62421879e1
Merge pull request #6983 from steinybot/fix/bsp-jvm-env-working-dir
fix: change BSP JVM environment working directory to be a path
2022-07-29 23:19:14 -04:00
eugene yokota 8b016c7555
Merge pull request #404 from armanbilge/patch-1
Better deprecation message for `sonatypeRepo`
2022-07-29 23:18:29 -04:00
Arman Bilge f17280780d Formatting 2022-07-30 02:51:02 +00:00
Arman Bilge d2fba6fde0
Better deprecation message for `sonatypeRepo` 2022-07-29 19:32:14 -07:00
Jason Pickens 5c933679fa
fix: change BSP JVM environment working directory to be a path 2022-07-27 11:56:27 +12:00
frosforever 1b21ecb1ce Protect against missing edges in graph by using map get vs apply 2022-07-19 09:55:45 -04:00
eugene yokota 1f29c9053c
Merge pull request #6977 from sbt/dependabot/github_actions/actions/cache-3.0.5
Bump actions/cache from 3.0.4 to 3.0.5
2022-07-18 01:19:16 -04:00
dependabot[bot] 683f2e9291
Bump actions/cache from 3.0.4 to 3.0.5
Bumps [actions/cache](https://github.com/actions/cache) from 3.0.4 to 3.0.5.
- [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.4...v3.0.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-18 04:02:58 +00:00
Adrien Piquerez 992dfd5649
Merge pull request #6972 from adpi2/dependency-submission-v2
Bump sbt-dependency-submission
2022-07-15 13:03:56 +02:00