From 8e8d44572bc1625b10fbe92dfa6883f82d8c5a53 Mon Sep 17 00:00:00 2001 From: Todd Burnside Date: Fri, 20 Dec 2024 08:43:47 -0800 Subject: [PATCH 1/2] Update scala to 3.6.2 --- .github/workflows/ci.yml | 2 +- build.sbt | 4 ++-- explore/src/main/scala/explore/plots/SeriesType.scala | 5 +---- explore/src/main/scala/explore/tabs/GroupEditBody.scala | 4 +--- explore/src/main/scala/explore/tabs/ObsTabTiles.scala | 1 - .../src/main/scala/explore/tabs/SchedulingTabContents.scala | 1 - project/Versions.scala | 4 ++-- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88d2e4482..f81ffe8d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: diff --git a/build.sbt b/build.sbt index 573af1936..046e986ca 100644 --- a/build.sbt +++ b/build.sbt @@ -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/" diff --git a/explore/src/main/scala/explore/plots/SeriesType.scala b/explore/src/main/scala/explore/plots/SeriesType.scala index 9d27c7c79..16c3cd9e5 100644 --- a/explore/src/main/scala/explore/plots/SeriesType.scala +++ b/explore/src/main/scala/explore/plots/SeriesType.scala @@ -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 @@ -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 diff --git a/explore/src/main/scala/explore/tabs/GroupEditBody.scala b/explore/src/main/scala/explore/tabs/GroupEditBody.scala index aa44d9404..c0e8f9963 100644 --- a/explore/src/main/scala/explore/tabs/GroupEditBody.scala +++ b/explore/src/main/scala/explore/tabs/GroupEditBody.scala @@ -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 @@ -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") diff --git a/explore/src/main/scala/explore/tabs/ObsTabTiles.scala b/explore/src/main/scala/explore/tabs/ObsTabTiles.scala index 0f9b656a9..b94c0ca17 100644 --- a/explore/src/main/scala/explore/tabs/ObsTabTiles.scala +++ b/explore/src/main/scala/explore/tabs/ObsTabTiles.scala @@ -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 diff --git a/explore/src/main/scala/explore/tabs/SchedulingTabContents.scala b/explore/src/main/scala/explore/tabs/SchedulingTabContents.scala index ac6774d75..e00a71e91 100644 --- a/explore/src/main/scala/explore/tabs/SchedulingTabContents.scala +++ b/explore/src/main/scala/explore/tabs/SchedulingTabContents.scala @@ -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 diff --git a/project/Versions.scala b/project/Versions.scala index 8d8205752..ca07b30ed 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -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" From 791b8b50bfc4206b7421cebb50971ab8d0751fd8 Mon Sep 17 00:00:00 2001 From: Todd Burnside Date: Fri, 20 Dec 2024 09:08:55 -0800 Subject: [PATCH 2/2] Fix vite.config --- vite.config.mts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vite.config.mts b/vite.config.mts index bcfa518ee..e8354d7ab 100644 --- a/vite.config.mts +++ b/vite.config.mts @@ -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 = () => { return {