Skip to content

Commit 2cc5371

Browse files
authored
Merge branch 'main' into update/tasty-query-1.5.0
2 parents c9e2076 + c511211 commit 2cc5371

File tree

33 files changed

+32
-546
lines changed

33 files changed

+32
-546
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/checkout@v4
3232
with:
3333
submodules: true
34-
- uses: coursier/[email protected].8
34+
- uses: coursier/[email protected].9
3535
with:
3636
apps: sbt
3737
- run: sbt +Test/compile
@@ -55,7 +55,7 @@ jobs:
5555
- uses: actions/checkout@v4
5656
with:
5757
submodules: true
58-
- uses: coursier/[email protected].8
58+
- uses: coursier/[email protected].9
5959
with:
6060
jvm: ${{ matrix.jvm }}
6161
apps: sbt
@@ -80,7 +80,7 @@ jobs:
8080
- uses: actions/checkout@v4
8181
with:
8282
submodules: true
83-
- uses: coursier/[email protected].8
83+
- uses: coursier/[email protected].9
8484
with:
8585
jvm: ${{ matrix.jvm }}
8686
apps: sbt

.github/workflows/release-expression-compiler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: actions/checkout@v4
1818
with:
1919
submodules: true
20-
- uses: coursier/[email protected].8
20+
- uses: coursier/[email protected].9
2121
with:
2222
jvm: 'temurin:1.17.0.3'
2323
apps: sbt
@@ -36,7 +36,7 @@ jobs:
3636
- uses: actions/checkout@v4
3737
with:
3838
submodules: true
39-
- uses: coursier/[email protected].8
39+
- uses: coursier/[email protected].9
4040
with:
4141
apps: sbt
4242
jvm: 'adopt:1.8.0-292'

.github/workflows/release-full.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v4
1313
with:
1414
submodules: true
15-
- uses: coursier/[email protected].8
15+
- uses: coursier/[email protected].9
1616
with:
1717
apps: sbt
1818
jvm: 'adopt:1.8.0-292'

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ While it is always the case with Java 9, you probably want to use the `sbt-jdi-t
2525

2626
```scala
2727
// project/plugins.sbt
28-
addSbtPlugin("org.scala-debugger" % "sbt-jdi-tools" % "1.1.1")
28+
addSbtPlugin("com.github.sbt" % "sbt-jdi-tools" % "1.2.0")
2929
```
3030

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

103103
```scala
104104
// project/project/plugins.sbt
105-
addSbtPlugin("org.scala-debugger" % "sbt-jdi-tools" % "1.1.1")
105+
addSbtPlugin("com.github.sbt" % "sbt-jdi-tools" % "1.2.0")
106106
```
107107

108108
# Development

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ inThisBuild(
1717
developers := Developers.list,
1818
version ~= { dynVer =>
1919
if (isRelease) dynVer
20-
else "4.1.0-SNAPSHOT" // only for local publishing
20+
else "4.3.0-SNAPSHOT" // only for local publishing
2121
},
2222
resolvers ++= Resolver.sonatypeOssRepos("snapshots"),
2323
compile / javacOptions ++= Seq("-source", "1.8", "-target", "1.8")
@@ -167,10 +167,10 @@ lazy val expressionCompiler = projectMatrix
167167
// NOTE: Adding new handle for Scala version requires updating ./.github/workflows/release-expression-compiler.yml
168168
// format: off
169169
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")
170-
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")
170+
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")
171171
case (3, 0, _) => Seq("3.0.2", "3.0.1", "3.0.0")
172172
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")
173-
case (3, _, _) => Seq("3.5.2", "3.5.1", "3.5.0", "3.4.3", "3.4.2", "3.4.1", "3.4.0")
173+
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")
174174
case _ => Seq.empty
175175
// format: on
176176
}
@@ -212,7 +212,7 @@ lazy val decoder3: Project = project
212212
Compile / doc / sources := Seq.empty,
213213
libraryDependencies ++= Seq(
214214
"ch.epfl.scala" %% "tasty-query" % "1.5.0",
215-
"ch.epfl.scala" %% "scala3-binary-decoder" % "0.2.0",
215+
"ch.epfl.scala" %% "scala3-binary-decoder" % "0.3.0",
216216
Dependencies.asm,
217217
Dependencies.asmUtil,
218218
Dependencies.munit % Test

0 commit comments

Comments
 (0)