Skip to content

Commit

Permalink
Merge pull request #4409 from gemini-hlsw/scala-3.6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
toddburnside authored Dec 20, 2024
2 parents 9a17a65 + 791b8b5 commit cbba530
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.5.2]
scala: [3.6.2]
java: [temurin@17]
runs-on: ${{ matrix.os }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ addCommandAlias(
ThisBuild / description := "Explore"
Global / onChangedBuildSource := ReloadOnSourceChanges
ThisBuild / scalafixDependencies += "edu.gemini" % "lucuma-schemas_3" % Versions.lucumaSchemas
ThisBuild / scalaVersion := "3.5.2"
ThisBuild / crossScalaVersions := Seq("3.5.2")
ThisBuild / scalaVersion := "3.6.2"
ThisBuild / crossScalaVersions := Seq("3.6.2")
ThisBuild / scalacOptions ++= Seq("-language:implicitConversions")
ThisBuild / scalafixResolvers += coursierapi.MavenRepository.of(
"https://s01.oss.sonatype.org/content/repositories/snapshots/"
Expand Down
5 changes: 1 addition & 4 deletions explore/src/main/scala/explore/plots/SeriesType.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

package explore.plots

import cats.Eq
import cats.derived.*
import lucuma.core.util.Display
import lucuma.core.util.Enumerated
import lucuma.react.highcharts.Chart
Expand All @@ -16,8 +14,7 @@ enum SeriesType(
val yAxis: Int,
val threshold: Int,
val data: ObjectPlotData.SeriesData => js.Array[Chart.Data]
) derives Eq,
Enumerated:
) derives Enumerated:
val tag: String = name

case Elevation
Expand Down
4 changes: 1 addition & 3 deletions explore/src/main/scala/explore/tabs/GroupEditBody.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@

package explore.tabs

import cats.derived.*
import cats.effect.IO
import cats.kernel.Eq
import cats.syntax.all.*
import clue.data.syntax.*
import crystal.Pot
Expand Down Expand Up @@ -53,7 +51,7 @@ case class GroupEditBody(
object GroupEditBody:
private type Props = GroupEditBody

private enum GroupEditType(val tag: String) derives Enumerated, Eq:
private enum GroupEditType(val tag: String) derives Enumerated:
case And extends GroupEditType("And")
case Or extends GroupEditType("Or")

Expand Down
1 change: 0 additions & 1 deletion explore/src/main/scala/explore/tabs/ObsTabTiles.scala
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ import explore.undo.UndoSetter
import japgolly.scalajs.react.*
import japgolly.scalajs.react.extra.router.SetRouteVia
import japgolly.scalajs.react.vdom.html_<^.*
import lucuma.core.enums.Site
import lucuma.core.math.Angle
import lucuma.core.math.Offset
import lucuma.core.math.skycalc.averageParallacticAngle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import explore.*
import explore.actions.ObservationPasteIntoSchedulingGroupAction
import explore.common.TimingWindowsQueries
import explore.components.FocusedStatus
import explore.components.Tile
import explore.components.TileController
import explore.model.*
import explore.model.AppContext
Expand Down
4 changes: 2 additions & 2 deletions project/Versions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ object Versions {
val log4Cats = "2.7.0"
val log4CatsLogLevel = "0.3.1"
val lucumaBC = "0.4.0"
val lucumaCore = "0.112.0"
val lucumaCore = "0.112.1"
val lucumaCatalog = "0.48.11"
val lucumaITC = "0.24.2"
val lucumaReact = "0.74.0"
val lucumaRefined = "0.1.3"
val lucumaSchemas = "0.110.1"
val lucumaSchemas = "0.110.2"
val lucumaOdbSchema = "0.17.2"
val lucumaSSO = "0.7.1"
val lucumaUI = "0.125.0"
Expand Down
2 changes: 1 addition & 1 deletion vite.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { VitePWA } from 'vite-plugin-pwa';
import type { RuntimeCaching } from 'workbox-build';
import env from 'vite-plugin-env-compatible';

const scalaVersion = '3.5.2';
const scalaVersion = '3.6.2';

const fixCssRoot: PluginCreator<void> = () => {
return {
Expand Down

0 comments on commit cbba530

Please sign in to comment.