Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scala-library, scala-reflect to 2.13.12 #1255

Merged
merged 3 commits into from
Oct 17, 2023
Merged

Update scala-library, scala-reflect to 2.13.12 #1255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b38e5ea
Drop support for Scala versions that Metals doesn't support anymore
alexarchambault Oct 16, 2023
e00b624
Update metabrowse to 0.2.12, revert scalameta back to 4.8.3
alexarchambault Oct 16, 2023
aa12a59
Update scala-library, scala-reflect to 2.13.12
scala-steward Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ jobs:
matrix:
OS: [ubuntu-latest]
JDK: [8]
SCALA: [2.12.17, 2.12.18, 2.13.10, 2.13.11, 3.3.0]
SCALA: [2.12.17, 2.12.18, 2.13.11, 2.13.12, 3.3.0]
include:
- OS: windows-latest
JDK: 8
SCALA: 2.13.11
SCALA: 2.13.12
- OS: macos-latest
JDK: 8
SCALA: 2.13.11
SCALA: 2.13.12
- OS: ubuntu-latest
JDK: 17
SCALA: 2.12.18
Expand Down
4 changes: 2 additions & 2 deletions ...ala/scala-interpreter/src/main/scala-2/almond/internals/ScalaInterpreterInspections.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import almond.logger.{Logger, LoggerContext}
import ammonite.runtime.Frame
import ammonite.util.Util.newLine
import scala.meta.dialects
import scala.meta.internal.metals.Docstrings
import scala.meta.internal.metals.{Docstrings, EmptyReportContext}
import scala.meta.internal.mtags.MtagsEnrichments._
import scala.meta.internal.mtags.{IndexingExceptions, OnDemandSymbolIndex}
import scala.meta.internal.semanticdb.scalac.SemanticdbOps
Expand Down Expand Up @@ -56,7 +56,7 @@ final class ScalaInterpreterInspections(
dialects.Scala213
else
dialects.Scala212
val index = OnDemandSymbolIndex.empty()
val index = OnDemandSymbolIndex.empty()(EmptyReportContext)
for (p <- sourcePaths)
try index.addSourceJar(AbsolutePath(p), dialect)
catch {
Expand Down
20 changes: 5 additions & 15 deletions project/deps.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ object Deps {
def jvmRepr = ivy"com.github.jupyter:jvm-repr:0.4.0"
def mdoc = ivy"org.scalameta::mdoc:2.3.8"
def munit = ivy"org.scalameta::munit:0.7.29"
def metabrowseServer = ivy"org.scalameta:::metabrowse-server:0.2.10"
def metabrowseServer = ivy"org.scalameta:::metabrowse-server:0.2.12"
def osLib = ivy"com.lihaoyi::os-lib:0.9.1"
def pprint = ivy"com.lihaoyi::pprint:0.8.1"
def scalafmtDynamic = ivy"org.scalameta::scalafmt-dynamic:${Versions.scalafmt}"
def scalameta = ivy"org.scalameta::scalameta:4.8.10"
def scalameta = ivy"org.scalameta::scalameta:4.8.3"
def scalaparse = ivy"com.lihaoyi::scalaparse:3.0.2"
def scalapy = ivy"me.shadaj::scalapy-core:0.5.2"
def scalaReflect(sv: String) = ivy"org.scala-lang:scala-reflect:$sv"
Expand All @@ -88,30 +88,20 @@ object ScalaVersions {
def scala3Latest = "3.3.1"
def scala3Compat = "3.3.0"
def cross2_3Version(sv: String) = "2.13.11"
def scala213 = "2.13.11"
def scala213 = "2.13.12"
def scala212 = "2.12.18"
val binaries = Seq(scala3Compat, scala213, scala212)
val all = Seq(
scala3Latest,
scala3Compat,
scala213,
"2.13.11",
"2.13.10",
"2.13.9",
"2.13.8",
"2.13.7",
"2.13.6",
"2.13.5",
"2.13.4",
"2.13.3",
scala212,
"2.12.17",
"2.12.16",
"2.12.15",
"2.12.14",
"2.12.13",
"2.12.12",
"2.12.11",
"2.12.10"
"2.12.15"
).distinct

def binary(sv: String) =
Expand Down