Skip to content

Commit

Permalink
Merge branch 'main' into update/tasty-query-1.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
adpi2 authored Jan 15, 2025
2 parents c9e2076 + c511211 commit 2cc5371
Show file tree
Hide file tree
Showing 33 changed files with 32 additions and 546 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: true
- uses: coursier/[email protected].8
- uses: coursier/[email protected].9
with:
apps: sbt
- run: sbt +Test/compile
Expand All @@ -55,7 +55,7 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: true
- uses: coursier/[email protected].8
- uses: coursier/[email protected].9
with:
jvm: ${{ matrix.jvm }}
apps: sbt
Expand All @@ -80,7 +80,7 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: true
- uses: coursier/[email protected].8
- uses: coursier/[email protected].9
with:
jvm: ${{ matrix.jvm }}
apps: sbt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-expression-compiler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: true
- uses: coursier/[email protected].8
- uses: coursier/[email protected].9
with:
jvm: 'temurin:1.17.0.3'
apps: sbt
Expand All @@ -36,7 +36,7 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: true
- uses: coursier/[email protected].8
- uses: coursier/[email protected].9
with:
apps: sbt
jvm: 'adopt:1.8.0-292'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: true
- uses: coursier/[email protected].8
- uses: coursier/[email protected].9
with:
apps: sbt
jvm: 'adopt:1.8.0-292'
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ While it is always the case with Java 9, you probably want to use the `sbt-jdi-t

```scala
// project/plugins.sbt
addSbtPlugin("org.scala-debugger" % "sbt-jdi-tools" % "1.1.1")
addSbtPlugin("com.github.sbt" % "sbt-jdi-tools" % "1.2.0")
```

You can start a debug server by providing your own intance of `Debuggee`, `DebugToolsResolver` and `Logger`.
Expand Down Expand Up @@ -102,7 +102,7 @@ To do so you can use the `sbt-jdi-tools` plugin in the meta project (it goes to

```scala
// project/project/plugins.sbt
addSbtPlugin("org.scala-debugger" % "sbt-jdi-tools" % "1.1.1")
addSbtPlugin("com.github.sbt" % "sbt-jdi-tools" % "1.2.0")
```

# Development
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ inThisBuild(
developers := Developers.list,
version ~= { dynVer =>
if (isRelease) dynVer
else "4.1.0-SNAPSHOT" // only for local publishing
else "4.3.0-SNAPSHOT" // only for local publishing
},
resolvers ++= Resolver.sonatypeOssRepos("snapshots"),
compile / javacOptions ++= Seq("-source", "1.8", "-target", "1.8")
Expand Down Expand Up @@ -167,10 +167,10 @@ lazy val expressionCompiler = projectMatrix
// NOTE: Adding new handle for Scala version requires updating ./.github/workflows/release-expression-compiler.yml
// format: off
case (2, 12, _) => Seq("2.12.20", "2.12.19", "2.12.18", "2.12.17", "2.12.16", "2.12.15", "2.12.14", "2.12.13")
case (2, 13, _) => Seq("2.13.14", "2.13.13", "2.13.12", "2.13.11", "2.13.10", "2.13.9", "2.13.8", "2.13.7", "2.13.6", "2.13.5", "2.13.4")
case (2, 13, _) => Seq("2.13.16", "2.13.15", "2.13.14", "2.13.13", "2.13.12", "2.13.11", "2.13.10", "2.13.9", "2.13.8", "2.13.7", "2.13.6", "2.13.5", "2.13.4")
case (3, 0, _) => Seq("3.0.2", "3.0.1", "3.0.0")
case (3, 1 | 2 | 3, _) => Seq("3.3.4", "3.3.3", "3.3.2", "3.3.1", "3.3.0", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0")
case (3, _, _) => Seq("3.5.2", "3.5.1", "3.5.0", "3.4.3", "3.4.2", "3.4.1", "3.4.0")
case (3, _, _) => Seq("3.6.3-RC2", "3.6.2", "3.6.1", "3.5.2", "3.5.1", "3.5.0", "3.4.3", "3.4.2", "3.4.1", "3.4.0")
case _ => Seq.empty
// format: on
}
Expand Down Expand Up @@ -212,7 +212,7 @@ lazy val decoder3: Project = project
Compile / doc / sources := Seq.empty,
libraryDependencies ++= Seq(
"ch.epfl.scala" %% "tasty-query" % "1.5.0",
"ch.epfl.scala" %% "scala3-binary-decoder" % "0.2.0",
"ch.epfl.scala" %% "scala3-binary-decoder" % "0.3.0",
Dependencies.asm,
Dependencies.asmUtil,
Dependencies.munit % Test
Expand Down
Loading

0 comments on commit 2cc5371

Please sign in to comment.