Skip to content

Commit

Permalink
Merge branch 'develop' into update/mouse-1.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
jluhrs authored Oct 1, 2024
2 parents 2a3d866 + d56c43a commit edc2186
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Setup Java (temurin@17)
id: setup-java-temurin-17
if: matrix.java == 'temurin@17'
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
Expand All @@ -54,7 +54,7 @@ jobs:
run: sbt githubWorkflowCheck

- name: Check headers and formatting
if: matrix.java == 'temurin@17'
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest'
run: sbt '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck lucumaScalafmtCheck lucumaScalafixCheck

- name: Check scalafix lints
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt-common.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# this file by hand! Instead, if you wish to make changes, you should
# make a PR to sbt-lucuma.

version = "3.7.14"
version = "3.7.17"
style = default

runner.dialect = scala3
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version = "3.7.17"
version = "3.8.3"
include ".scalafmt-common.conf"
runner.dialect = scala3
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version := "0.1.0-SNAPSHOT"

name := "tcssim"

scalaVersion := "3.3.1"
scalaVersion := "3.3.4"

lazy val epics = project
.in(file("./modules/epics"))
Expand Down
26 changes: 13 additions & 13 deletions project/Settings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,34 @@ object Settings {

object LibraryVersion {
// Scala libraries
lazy val catsEffect = "3.5.2"
lazy val cats = "2.10.0"
lazy val catsEffect = "3.5.4"
lazy val cats = "2.12.0"
lazy val mouse = "1.2.4"
lazy val fs2 = "3.9.2"
lazy val fs2 = "3.9.4"
lazy val kittens = "3.1.0"

lazy val munit = "0.7.29"
lazy val munitCatsEffect = "1.0.7"
lazy val munitDiscipline = "1.0.9"
lazy val munitCatsEffect = "2.0.0"
lazy val munitDiscipline = "2.0.0"

// EPICS Libraries
lazy val jca = "2.4.8"
lazy val jca = "2.4.10"

// Lucuma
lazy val lucumaCore = "0.89.1"
lazy val lucumaCore = "0.91.1"

val slf4j = "2.0.9"
val slf4j = "2.0.16"
val log4s = "1.10.0"
val log4cats = "2.6.0"
val log4cats = "2.7.0"
val logback = "1.4.12"
val janino = "3.1.10"
val janino = "3.1.12"
}

val MUnit = Def.setting(
Seq(
"org.scalameta" %%% "munit" % LibraryVersion.munit % Test,
"org.typelevel" %%% "munit-cats-effect-3" % LibraryVersion.munitCatsEffect % Test,
"org.typelevel" %%% "discipline-munit" % LibraryVersion.munitDiscipline % Test
"org.scalameta" %%% "munit" % LibraryVersion.munit % Test,
"org.typelevel" %%% "munit-cats-effect" % LibraryVersion.munitCatsEffect % Test,
"org.typelevel" %%% "discipline-munit" % LibraryVersion.munitDiscipline % Test
)
)

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.9.7
sbt.version = 1.9.9
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("edu.gemini" % "sbt-lucuma" % "0.11.9")
addSbtPlugin("edu.gemini" % "sbt-lucuma" % "0.11.11")
addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
// sbt revolver lets launching applications from the sbt console
Expand Down

0 comments on commit edc2186

Please sign in to comment.