Update sbt-lucuma and clue

gemini-hlsw · Mar 18, 2024 · 31d512a · 31d512a
1 parent 818f80f
commit 31d512a
Show file tree

Hide file tree

Showing 34 changed files with 49 additions and 48 deletions.
diff --git a/.scalafix-common.conf b/.scalafix-common.conf
@@ -7,3 +7,4 @@
 rules = [
   OrganizeImports
 ]
+OrganizeImports.targetDialect = Auto
diff --git a/common/src/main/scala/explore/cache/CacheComponent.scala b/common/src/main/scala/explore/cache/CacheComponent.scala
@@ -9,7 +9,7 @@ import cats.syntax.all.*
 import crystal.react.hooks.*
 import fs2.concurrent.SignallingRef
 import japgolly.scalajs.react.*
-import japgolly.scalajs.react.util.DefaultEffects.{Async => DefaultA}
+import japgolly.scalajs.react.util.DefaultEffects.Async as DefaultA
 import japgolly.scalajs.react.vdom.html_<^.*
 
 trait CacheComponent[S, P <: CacheComponent.Props[S]: Reusability]:

diff --git a/common/src/main/scala/explore/common/RetryHelpers.scala b/common/src/main/scala/explore/common/RetryHelpers.scala
@@ -5,11 +5,11 @@ package explore.common
 
 import cats.Applicative
 import org.typelevel.log4cats.Logger
+import retry.*
 import retry.RetryDetails.*
 import retry.RetryPolicies.*
-import retry.*
 
-import java.{util => ju}
+import java.util as ju
 import scala.concurrent.duration.*
 
 import ju.concurrent.TimeUnit

diff --git a/common/src/main/scala/explore/common/package.scala b/common/src/main/scala/explore/common/package.scala
@@ -6,7 +6,7 @@ package explore
 import crystal.react.ReuseView
 import crystal.react.reuse.Reuse
 import explore.undo.UndoSetter
-import japgolly.scalajs.react.util.DefaultEffects.{Async => DefaultA}
+import japgolly.scalajs.react.util.DefaultEffects.Async as DefaultA
 import monocle.Lens
 import monocle.Optional
 import monocle.Prism

diff --git a/common/src/main/scala/explore/model/ExploreGridLayouts.scala b/common/src/main/scala/explore/model/ExploreGridLayouts.scala
@@ -9,8 +9,8 @@ import eu.timepit.refined.auto.*
 import eu.timepit.refined.cats.*
 import eu.timepit.refined.types.numeric.NonNegInt
 import explore.model.enums.GridLayoutSection
-import explore.model.layout.LayoutsMap
 import explore.model.layout.*
+import explore.model.layout.LayoutsMap
 import lucuma.react.gridlayout.BreakpointName
 import lucuma.react.gridlayout.Layout
 import lucuma.react.gridlayout.LayoutItem

diff --git a/common/src/main/scala/explore/model/enums/SEDType.scala b/common/src/main/scala/explore/model/enums/SEDType.scala
@@ -21,8 +21,8 @@ import lucuma.core.enums.StellarLibrarySpectrum
 import lucuma.core.math.BrightnessUnits.*
 import lucuma.core.math.FluxDensityContinuumValue
 import lucuma.core.math.Wavelength
-import lucuma.core.math.dimensional.Units.*
 import lucuma.core.math.dimensional.*
+import lucuma.core.math.dimensional.Units.*
 import lucuma.core.math.units.*
 import lucuma.core.model.SpectralDefinition
 import lucuma.core.model.UnnormalizedSED

diff --git a/common/src/main/scala/explore/model/layout.scala b/common/src/main/scala/explore/model/layout.scala
@@ -3,8 +3,8 @@
 
 package explore.model
 
-import cats.Order.*
 import cats.*
+import cats.Order.*
 import cats.syntax.all.*
 import explore.model.enums.GridLayoutSection
 import lucuma.react.gridlayout.*

diff --git a/common/src/main/scala/explore/undo/Action.scala b/common/src/main/scala/explore/undo/Action.scala
@@ -4,8 +4,8 @@
 package explore.undo
 
 import explore.optics.GetAdjust
-import japgolly.scalajs.react.util.DefaultEffects.{Async => DefaultA}
-import japgolly.scalajs.react.util.DefaultEffects.{Sync => DefaultS}
+import japgolly.scalajs.react.util.DefaultEffects.Async as DefaultA
+import japgolly.scalajs.react.util.DefaultEffects.Sync as DefaultS
 import monocle.Lens
 
 /*

diff --git a/common/src/main/scala/explore/undo/UndoContext.scala b/common/src/main/scala/explore/undo/UndoContext.scala
@@ -8,8 +8,8 @@ import cats.syntax.all.*
 import crystal.*
 import crystal.react.*
 import japgolly.scalajs.react.*
-import japgolly.scalajs.react.util.DefaultEffects.{Async => DefaultA}
-import japgolly.scalajs.react.util.DefaultEffects.{Sync => DefaultS}
+import japgolly.scalajs.react.util.DefaultEffects.Async as DefaultA
+import japgolly.scalajs.react.util.DefaultEffects.Sync as DefaultS
 
 /*
  * Combines a view of a model `M` and a view of `UndoStacks` over `M`.

diff --git a/common/src/main/scala/explore/undo/UndoSetter.scala b/common/src/main/scala/explore/undo/UndoSetter.scala
@@ -4,8 +4,8 @@
 package explore.undo
 
 import crystal.react.*
-import japgolly.scalajs.react.util.DefaultEffects.{Async => DefaultA}
-import japgolly.scalajs.react.util.DefaultEffects.{Sync => DefaultS}
+import japgolly.scalajs.react.util.DefaultEffects.Async as DefaultA
+import japgolly.scalajs.react.util.DefaultEffects.Sync as DefaultS
 import monocle.Lens
 import monocle.Optional
 import monocle.Prism

diff --git a/common/src/main/scala/explore/undo/Undoer.scala b/common/src/main/scala/explore/undo/Undoer.scala
@@ -3,7 +3,7 @@
 
 package explore.undo
 
-import japgolly.scalajs.react.util.DefaultEffects.{Sync => DefaultS}
+import japgolly.scalajs.react.util.DefaultEffects.Sync as DefaultS
 
 /** Undo controls */
 trait Undoer:

diff --git a/common/src/main/scala/explore/utils/package.scala b/common/src/main/scala/explore/utils/package.scala
@@ -6,8 +6,8 @@ package explore.utils
 import cats.Applicative
 import cats.Endo
 import cats.Semigroup
-import cats.effect.Temporal
 import cats.effect.*
+import cats.effect.Temporal
 import cats.effect.syntax.all.*
 import cats.syntax.all.*
 import clue.data.*

diff --git a/common/src/test/scala/explore/undo/TestUndoable.scala b/common/src/test/scala/explore/undo/TestUndoable.scala
@@ -8,8 +8,8 @@ import cats.effect.std.Dispatcher
 import crystal.react.View
 import explore.optics.GetAdjust
 import japgolly.scalajs.react.ReactCats.*
-import japgolly.scalajs.react.util.DefaultEffects.{Async => DefaultA}
-import japgolly.scalajs.react.util.DefaultEffects.{Sync => DefaultS}
+import japgolly.scalajs.react.util.DefaultEffects.Async as DefaultA
+import japgolly.scalajs.react.util.DefaultEffects.Sync as DefaultS
 import org.typelevel.log4cats.Logger
 
 class TestUndoable[M](

diff --git a/common/src/test/scala/explore/undo/UndoContextSpec.scala b/common/src/test/scala/explore/undo/UndoContextSpec.scala
@@ -8,8 +8,8 @@ import cats.effect.std.Dispatcher
 import cats.kernel.Eq
 import cats.syntax.all.*
 import explore.data.KeyedIndexedList
-import explore.data.tree.KeyedIndexedTree.Index
 import explore.data.tree.*
+import explore.data.tree.KeyedIndexedTree.Index
 import explore.optics.Adjuster
 import explore.optics.GetAdjust
 import explore.undo.*

diff --git a/explore/src/clue/scala/queries/common/GroupQueriesGQL.scala b/explore/src/clue/scala/queries/common/GroupQueriesGQL.scala
@@ -5,10 +5,10 @@ package queries.common
 
 import clue.GraphQLOperation
 import clue.GraphQLSubquery
+import clue.annotation.GraphQL
 import explore.model.GroupElement
 import explore.model.Grouping
 import lucuma.schemas.ObservationDB
-import clue.annotation.GraphQL
 import lucuma.schemas.odb.TimeSpanSubquery
 
 object GroupQueriesGQL:

diff --git a/explore/src/clue/scala/queries/common/ObsAttachmentSubquery.scala b/explore/src/clue/scala/queries/common/ObsAttachmentSubquery.scala
@@ -4,9 +4,9 @@
 package queries.common
 
 import clue.GraphQLSubquery
+import clue.annotation.GraphQL
 import explore.model.ObsAttachment
 import lucuma.schemas.ObservationDB
-import clue.annotation.GraphQL
 
 @GraphQL
 object ObsAttachmentSubquery

diff --git a/explore/src/clue/scala/queries/common/ObservationSummarySubquery.scala b/explore/src/clue/scala/queries/common/ObservationSummarySubquery.scala
@@ -4,10 +4,10 @@
 package queries.common
 
 import clue.GraphQLSubquery
+import clue.annotation.GraphQL
 import explore.model.ObsSummary
 import lucuma.schemas.ObservationDB
 import lucuma.schemas.odb.*
-import clue.annotation.GraphQL
 
 @GraphQL
 object ObservationSummarySubquery

diff --git a/explore/src/clue/scala/queries/common/ProgramInfoSubquery.scala b/explore/src/clue/scala/queries/common/ProgramInfoSubquery.scala
@@ -4,9 +4,9 @@
 package queries.common
 
 import clue.GraphQLSubquery
+import clue.annotation.GraphQL
 import explore.model.ProgramInfo
 import lucuma.schemas.ObservationDB
-import clue.annotation.GraphQL
 
 @GraphQL
 object ProgramInfoSubquery extends GraphQLSubquery.Typed[ObservationDB, ProgramInfo]("Program"):

diff --git a/explore/src/clue/scala/queries/common/ProposalAttachmentSubquery.scala b/explore/src/clue/scala/queries/common/ProposalAttachmentSubquery.scala
@@ -4,9 +4,9 @@
 package queries.common
 
 import clue.GraphQLSubquery
+import clue.annotation.GraphQL
 import explore.model.ProposalAttachment
 import lucuma.schemas.ObservationDB
-import clue.annotation.GraphQL
 
 @GraphQL
 object ProposalAttachmentSubquery

diff --git a/explore/src/clue/scala/queries/common/TargetQueriesGQL.scala b/explore/src/clue/scala/queries/common/TargetQueriesGQL.scala
@@ -6,8 +6,8 @@ package queries.common
 import clue.GraphQLOperation
 import clue.annotation.GraphQL
 import lucuma.schemas.ObservationDB
+import lucuma.schemas.model as schemasModel
 import lucuma.schemas.odb.*
-import lucuma.schemas.{model => schemasModel}
 // gql: import lucuma.schemas.decoders.given
 
 object TargetQueriesGQL {

diff --git a/explore/src/clue/scala/queries/common/UserPreferencesQueriesGQL.scala b/explore/src/clue/scala/queries/common/UserPreferencesQueriesGQL.scala
@@ -5,8 +5,8 @@ package queries.common
 
 import clue.GraphQLOperation
 import clue.annotation.GraphQL
-import queries.schemas.UserPreferencesDB
 import explore.model.GlobalPreferences
+import queries.schemas.UserPreferencesDB
 // gql: import queries.schemas.UserPreferencesDB.given
 
 object UserPreferencesQueriesGQL {

diff --git a/model/shared/src/main/scala/explore/model/Asterism.scala b/model/shared/src/main/scala/explore/model/Asterism.scala
@@ -12,8 +12,8 @@ import lucuma.core.data.Zipper
 import lucuma.core.model.ObjectTracking
 import lucuma.core.model.SiderealTracking
 import lucuma.core.model.Target
-import lucuma.schemas.model.TargetWithId
 import lucuma.schemas.model.*
+import lucuma.schemas.model.TargetWithId
 import monocle.*
 
 import java.time.Instant

diff --git a/model/shared/src/main/scala/explore/model/Page.scala b/model/shared/src/main/scala/explore/model/Page.scala
@@ -6,7 +6,7 @@ package explore.model
 import cats.Eq
 import cats.data.NonEmptySet
 import cats.derived.*
-import cats.syntax.all._
+import cats.syntax.all.*
 import lucuma.core.model.Group
 import lucuma.core.model.Observation
 import lucuma.core.model.Program

diff --git a/model/shared/src/main/scala/explore/model/boopickle/ItcPickler.scala b/model/shared/src/main/scala/explore/model/boopickle/ItcPickler.scala
@@ -17,13 +17,13 @@ import explore.model.itc.ItcRequestParams
 import explore.model.itc.ItcResult
 import explore.model.itc.ItcTarget
 import explore.model.itc.OverridenExposureTime
+import explore.modes.*
 import explore.modes.InstrumentRow
 import explore.modes.ModeAO
 import explore.modes.ModeSlitSize
 import explore.modes.ModeWavelength
 import explore.modes.SpectroscopyModeRow
 import explore.modes.SpectroscopyModesMatrix
-import explore.modes.*
 import lucuma.core.enums.FocalPlane
 import lucuma.core.enums.SpectroscopyCapabilities
 import lucuma.core.math.BrightnessUnits

diff --git a/model/shared/src/main/scala/explore/model/expandedIds.scala b/model/shared/src/main/scala/explore/model/expandedIds.scala
@@ -3,8 +3,8 @@
 
 package explore.model
 
-import cats.Order.*
 import cats.*
+import cats.Order.*
 import cats.derived.*
 import lucuma.core.model.Group
 import lucuma.core.model.Target

diff --git a/model/shared/src/main/scala/explore/model/formats.scala b/model/shared/src/main/scala/explore/model/formats.scala
@@ -7,8 +7,8 @@ import cats.syntax.all.*
 import coulomb.*
 import eu.timepit.refined.collection.NonEmpty
 import explore.optics.all.*
-import lucuma.core.math.HourAngle.HMS
 import lucuma.core.math.*
+import lucuma.core.math.HourAngle.HMS
 import lucuma.core.math.units.*
 import lucuma.core.optics.*
 import lucuma.core.syntax.string.*

diff --git a/model/shared/src/main/scala/explore/model/package.scala b/model/shared/src/main/scala/explore/model/package.scala
@@ -14,14 +14,14 @@ import explore.data.KeyedIndexedList
 import lucuma.core.math.Coordinates
 import lucuma.core.model.ConstraintSet
 import lucuma.core.model.Group
+import lucuma.core.model.ObsAttachment as ObsAtt
 import lucuma.core.model.Observation
 import lucuma.core.model.Program
 import lucuma.core.model.SiderealTracking
 import lucuma.core.model.SourceProfile
 import lucuma.core.model.SpectralDefinition
 import lucuma.core.model.Target
 import lucuma.core.model.TimingWindow
-import lucuma.core.model.{ObsAttachment => ObsAtt}
 import lucuma.core.util.NewType
 import lucuma.refined.*
 

diff --git a/model/shared/src/main/scala/explore/model/parsers.scala b/model/shared/src/main/scala/explore/model/parsers.scala
@@ -3,11 +3,11 @@
 
 package explore.model
 
+import cats.parse.*
 import cats.parse.Numbers.digit
 import cats.parse.Numbers.digits
 import cats.parse.Parser.char
 import cats.parse.Rfc5234.sp
-import cats.parse.*
 import cats.syntax.all.*
 import lucuma.core.math.parser.AngleParsers
 import lucuma.core.parser.MiscParsers

diff --git a/model/shared/src/main/scala/explore/modes/SpectroscopyModesMatrix.scala b/model/shared/src/main/scala/explore/modes/SpectroscopyModesMatrix.scala
@@ -6,24 +6,24 @@ package explore.modes
 import cats.Eq
 import cats.data.NonEmptyList
 import cats.derived.*
-import cats.implicits._
-import coulomb._
+import cats.implicits.*
+import coulomb.*
 import coulomb.conversion.ValueConversion
-import eu.timepit.refined._
-import eu.timepit.refined.cats._
+import eu.timepit.refined.*
+import eu.timepit.refined.cats.*
 import eu.timepit.refined.collection.NonEmpty
-import eu.timepit.refined.types.numeric._
-import eu.timepit.refined.types.string._
-import explore.model.syntax.all._
-import fs2.data.csv._
-import lucuma.core.enums._
+import eu.timepit.refined.types.numeric.*
+import eu.timepit.refined.types.string.*
+import explore.model.syntax.all.*
+import fs2.data.csv.*
+import lucuma.core.enums.*
 import lucuma.core.math.Angle
 import lucuma.core.math.BoundedInterval
 import lucuma.core.math.BoundedInterval.*
 import lucuma.core.math.Declination
 import lucuma.core.math.Wavelength
 import lucuma.core.math.WavelengthDelta
-import lucuma.core.math.units._
+import lucuma.core.math.units.*
 import lucuma.core.model.sequence.gmos.GmosCcdMode
 import lucuma.core.util.Enumerated
 import lucuma.schemas.model.CentralWavelength

diff --git a/model/shared/src/main/scala/explore/optics/GetAdjust.scala b/model/shared/src/main/scala/explore/optics/GetAdjust.scala
@@ -3,7 +3,7 @@
 
 package explore.optics
 
-import explore.optics.all._
+import explore.optics.all.*
 import monocle.Getter
 import monocle.Lens
 

diff --git a/model/shared/src/main/scala/explore/optics/ModelOptics.scala b/model/shared/src/main/scala/explore/optics/ModelOptics.scala
@@ -16,9 +16,9 @@ import lucuma.core.math.dimensional.Measure
 import lucuma.core.math.units.*
 import lucuma.core.model.SourceProfile
 import lucuma.core.model.Target
+import monocle.*
 import monocle.Getter
 import monocle.Optional
-import monocle.*
 
 import scala.collection.immutable.SortedMap
 

diff --git a/model/shared/src/main/scala/explore/undo/IndexedCollMod.scala b/model/shared/src/main/scala/explore/undo/IndexedCollMod.scala
@@ -6,8 +6,8 @@ package explore.undo
 import cats.syntax.all.*
 import explore.optics.Adjuster
 import explore.optics.GetAdjust
-import monocle.Focus
 import monocle.*
+import monocle.Focus
 import monocle.std.option.some
 import mouse.boolean.*
 

diff --git a/project/Versions.scala b/project/Versions.scala
@@ -7,7 +7,7 @@ object Versions {
   val circe                  = "0.14.6"
   val circeGolden            = "0.3.0"
   val coulomb                = "0.8.0"
-  val clue                   = "0.35.0"
+  val clue                   = "0.35.1"
   val crystal                = "0.37.3"
   val discipline             = "1.5.1"
   val disciplineMUnit        = "1.0.9"
@@ -38,7 +38,7 @@ object Versions {
   val reactAladin            = "0.31.3"
   val refinedAlgebra         = "0.1.1"
   val sbtBuildInfo           = "0.11.0"
-  val sbtLucuma              = "0.11.13"
+  val sbtLucuma              = "0.11.15"
   val scalaCollectionContrib = "0.3.0"
   val scalaJsDom             = "2.8.0"
   val scalaJsReact           = "3.0.0-beta3"

diff --git a/workers/src/main/scala/workers/CacheIDBStores.scala b/workers/src/main/scala/workers/CacheIDBStores.scala
@@ -9,8 +9,8 @@ import explore.model.boopickle.CatalogPicklers.given
 import japgolly.scalajs.react.callback.*
 import japgolly.webapputil.binary.*
 import japgolly.webapputil.boopickle.*
-import japgolly.webapputil.indexeddb.IndexedDb.DatabaseName
 import japgolly.webapputil.indexeddb.*
+import japgolly.webapputil.indexeddb.IndexedDb.DatabaseName
 import lucuma.ags.GuideStarCandidate
 
 import scala.annotation.nowarn