Skip to content

Commit

Permalink
Merge pull request gemini-hlsw#2488 from gemini-hlsw/pr/giapi-scala
Browse files Browse the repository at this point in the history
Switch to shared giapi-scala lib
  • Loading branch information
armanbilge authored Oct 4, 2023
2 parents 254c246 + 0a0a6d9 commit 2cb53d9
Show file tree
Hide file tree
Showing 22 changed files with 5 additions and 3,513 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Scala
uses: olafurpg/setup-scala@v12
with:
java-version: adopt@1.11
java-version: openjdk@1.17.0
- name: Cache Coursier
uses: actions/[email protected]
with:
Expand Down
29 changes: 2 additions & 27 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -94,31 +94,6 @@ publish / skip := true
// Projects
//////////////

lazy val giapi = project
.in(file("modules/giapi"))
.enablePlugins(GitBranchPrompt)
.settings(commonSettings: _*)
.settings(
addCompilerPlugin(Plugins.kindProjectorPlugin),
libraryDependencies ++= Seq(
Cats.value,
Mouse.value,
Shapeless.value,
CatsEffect.value,
Fs2,
GiapiJmsUtil,
GiapiJmsProvider,
GiapiStatusService,
Giapi,
GiapiCommandsClient
) ++ Logging.value ++ Monocle.value ++ LucumaCore.value,
libraryDependencies ++= Seq(GmpStatusGateway % "test",
GmpStatusDatabase % "test",
GmpCmdJmsBridge % "test",
NopSlf4j % "test"
) ++ MUnit.value
)

lazy val ocs2_api = crossProject(JVMPlatform, JSPlatform)
.crossType(CrossType.Pure)
.in(file("modules/ocs2_api"))
Expand Down Expand Up @@ -282,7 +257,8 @@ lazy val seqexec_server = project
Log4CatsNoop.value,
TestLibs.value,
PPrint.value,
ACM
ACM,
GiapiScala
) ++ MUnit.value ++ Http4s ++ Http4sClient ++ PureConfig ++ SeqexecOdb ++ Monocle.value ++ WDBAClient ++
Circe.value
)
Expand All @@ -293,7 +269,6 @@ lazy val seqexec_server = project
buildInfoPackage := "seqexec.server"
)
.dependsOn(seqexec_engine % "compile->compile;test->test",
giapi,
ocs2_api.jvm,
seqexec_model.jvm % "compile->compile;test->test"
)
Expand Down
108 changes: 0 additions & 108 deletions modules/giapi/src/main/scala/giapi/client/GiapiClient.scala

This file was deleted.

23 changes: 0 additions & 23 deletions modules/giapi/src/main/scala/giapi/client/GiapiConfig.scala

This file was deleted.

74 changes: 0 additions & 74 deletions modules/giapi/src/main/scala/giapi/client/GiapiDb.scala

This file was deleted.

Loading

0 comments on commit 2cb53d9

Please sign in to comment.