Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,12 @@ lazy val debugger =
"com.microsoft.java" % "com.microsoft.java.debug.core" % "0.34.0",
"org.fusesource.jansi" % "jansi" % "1.18",
// scala-steward:on
"co.fs2" %% "fs2-io" % "3.12.2",
"com.monovore" %% "decline-effect" % "2.6.0",
"org.typelevel" %% "log4cats-slf4j" % "2.7.1",
"co.fs2" %% "fs2-io" % "3.13.0",
"com.monovore" %% "decline-effect" % "2.6.1",
"org.typelevel" %% "log4cats-slf4j" % "2.8.0",
"org.scalameta" %% "munit" % "1.2.4" % Test
),
dependencyOverrides += "commons-io" % "commons-io" % "[2.14.0,)",
dependencyOverrides += "commons-io" % "commons-io" % "2.21.0",
libraryDependencies ++= getPlatformSpecificLibraries(scalaBinaryVersion.value),
buildInfoPackage := "org.apache.daffodil.debugger.dap",
buildInfoKeys := Seq[BuildInfoKey](
Expand All @@ -223,7 +223,7 @@ lazy val debugger =
)
.jvmPlatform(
scalaVersions =
Seq("2.12.20", "2.13.16") ++ (if (scala.util.Properties.isJavaAtLeast("17")) Seq("3.3.6") else Seq())
Seq("2.12.20", "2.13.18") ++ (if (scala.util.Properties.isJavaAtLeast("17")) Seq("3.3.6") else Seq())
)

def getPlatformSpecificLibraries(scalaBinaryVersion: String) =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ object DAPSession {
class DAPodil(
session: DAPSession[Request, Response, DebugEvent],
state: Ref[IO, DAPodil.State],
hotswap: Hotswap[IO, DAPodil.State], // manages those states that have their own resource management
hotswap: NonEmptyHotswap[IO, DAPodil.State], // manages those states that have their own resource management
debugee: Request => EitherNel[String, Resource[IO, DAPodil.Debugee]],
whenDone: Deferred[IO, DAPodil.Done]
) {
Expand Down Expand Up @@ -229,7 +229,7 @@ class DAPodil(
case Right(dbgee) =>
for {
launched <- hotswap.swap {
DAPodil.State.Launched.resource(session, dbgee)
DAPodil.State.Launched.resource(session, dbgee).evalTap(state.set)
}.attempt

_ <- launched match {
Expand All @@ -239,9 +239,8 @@ class DAPodil(
.FailedToLaunch(request, NonEmptyList.of("couldn't launch from created debuggee"), Some(t))
) *>
session.abort(ErrorEvent.RequestError(t.getMessage), show"couldn't launch, request $request", t)
case Right(launchedState) =>
state.set(launchedState) *>
session.sendResponse(request.respondSuccess())
case Right(_) => // launchedState is now Unit, so we just send the success response
session.sendResponse(request.respondSuccess())
}
} yield ()
}
Expand Down Expand Up @@ -362,7 +361,7 @@ class DAPodil(
session
.sendResponse(request.respondSuccess())
.guarantee {
hotswap.clear *> whenDone.complete(DAPodil.Done(args.restart)).void
whenDone.complete(DAPodil.Done(args.restart)).void
}

def scopes(request: Request, args: ScopesArguments): IO[Unit] =
Expand Down Expand Up @@ -545,8 +544,7 @@ object DAPodil extends IOApp {
): Resource[IO, IO[Done]] =
for {
state <- Ref[IO].of[State](State.Uninitialized).toResource
hotswap <- Hotswap
.create[IO, State]
hotswap <- NonEmptyHotswap[IO, State](Resource.pure(State.Uninitialized))
.onFinalizeCase(ec => Logger[IO].debug(s"hotswap: $ec"))
whenDone <- Deferred[IO, Done].toResource
dapodil = new DAPodil(
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

sbt.version = 1.12.6
sbt.version = 1.12.7