Skip to content

Commit d951b93

Browse files
committed
Update scala dependencies
- Update scala 2.13 version 2.13.18 from 2.13.16 to prevent errors. - cat-effects Hotswap was deprecated so needed to move to NonEmptyHotswap. Closes apache#1628 Closes apache#1631 Closes apache#1634 Closes apache#1642 Closes apache#1643 fix format Remove bad .empty file
1 parent b52826f commit d951b93

3 files changed

Lines changed: 12 additions & 14 deletions

File tree

build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,12 @@ lazy val debugger =
205205
"com.microsoft.java" % "com.microsoft.java.debug.core" % "0.34.0",
206206
"org.fusesource.jansi" % "jansi" % "1.18",
207207
// scala-steward:on
208-
"co.fs2" %% "fs2-io" % "3.12.2",
209-
"com.monovore" %% "decline-effect" % "2.6.0",
210-
"org.typelevel" %% "log4cats-slf4j" % "2.7.1",
208+
"co.fs2" %% "fs2-io" % "3.13.0",
209+
"com.monovore" %% "decline-effect" % "2.6.1",
210+
"org.typelevel" %% "log4cats-slf4j" % "2.8.0",
211211
"org.scalameta" %% "munit" % "1.2.4" % Test
212212
),
213-
dependencyOverrides += "commons-io" % "commons-io" % "[2.14.0,)",
213+
dependencyOverrides += "commons-io" % "commons-io" % "2.21.0",
214214
libraryDependencies ++= getPlatformSpecificLibraries(scalaBinaryVersion.value),
215215
buildInfoPackage := "org.apache.daffodil.debugger.dap",
216216
buildInfoKeys := Seq[BuildInfoKey](
@@ -223,7 +223,7 @@ lazy val debugger =
223223
)
224224
.jvmPlatform(
225225
scalaVersions =
226-
Seq("2.12.20", "2.13.16") ++ (if (scala.util.Properties.isJavaAtLeast("17")) Seq("3.3.6") else Seq())
226+
Seq("2.12.20", "2.13.18") ++ (if (scala.util.Properties.isJavaAtLeast("17")) Seq("3.3.6") else Seq())
227227
)
228228

229229
def getPlatformSpecificLibraries(scalaBinaryVersion: String) =

debugger/src/main/scala/org.apache.daffodil.debugger.dap/DAPodil.scala

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ object DAPSession {
127127
class DAPodil(
128128
session: DAPSession[Request, Response, DebugEvent],
129129
state: Ref[IO, DAPodil.State],
130-
hotswap: Hotswap[IO, DAPodil.State], // manages those states that have their own resource management
130+
hotswap: NonEmptyHotswap[IO, DAPodil.State], // manages those states that have their own resource management
131131
debugee: Request => EitherNel[String, Resource[IO, DAPodil.Debugee]],
132132
whenDone: Deferred[IO, DAPodil.Done]
133133
) {
@@ -229,7 +229,7 @@ class DAPodil(
229229
case Right(dbgee) =>
230230
for {
231231
launched <- hotswap.swap {
232-
DAPodil.State.Launched.resource(session, dbgee)
232+
DAPodil.State.Launched.resource(session, dbgee).evalTap(state.set)
233233
}.attempt
234234

235235
_ <- launched match {
@@ -239,9 +239,8 @@ class DAPodil(
239239
.FailedToLaunch(request, NonEmptyList.of("couldn't launch from created debuggee"), Some(t))
240240
) *>
241241
session.abort(ErrorEvent.RequestError(t.getMessage), show"couldn't launch, request $request", t)
242-
case Right(launchedState) =>
243-
state.set(launchedState) *>
244-
session.sendResponse(request.respondSuccess())
242+
case Right(_) => // launchedState is now Unit, so we just send the success response
243+
session.sendResponse(request.respondSuccess())
245244
}
246245
} yield ()
247246
}
@@ -362,7 +361,7 @@ class DAPodil(
362361
session
363362
.sendResponse(request.respondSuccess())
364363
.guarantee {
365-
hotswap.clear *> whenDone.complete(DAPodil.Done(args.restart)).void
364+
whenDone.complete(DAPodil.Done(args.restart)).void
366365
}
367366

368367
def scopes(request: Request, args: ScopesArguments): IO[Unit] =
@@ -545,8 +544,7 @@ object DAPodil extends IOApp {
545544
): Resource[IO, IO[Done]] =
546545
for {
547546
state <- Ref[IO].of[State](State.Uninitialized).toResource
548-
hotswap <- Hotswap
549-
.create[IO, State]
547+
hotswap <- NonEmptyHotswap[IO, State](Resource.pure(State.Uninitialized))
550548
.onFinalizeCase(ec => Logger[IO].debug(s"hotswap: $ec"))
551549
whenDone <- Deferred[IO, Done].toResource
552550
dapodil = new DAPodil(

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
sbt.version = 1.12.6
16+
sbt.version = 1.12.7

0 commit comments

Comments
 (0)