Merge pull request #1057 from gemini-hlsw/update/sbt-lucuma-css-0.11.15

Update sbt-lucuma-css, sbt-lucuma-lib to 0.11.15
gemini-hlsw · Mar 19, 2024 · b076553 · b076553
2 parents 65ede6b + 5e4c498
commit b076553
Show file tree

Hide file tree

Showing 31 changed files with 35 additions and 34 deletions.
diff --git a/.scalafix-common.conf b/.scalafix-common.conf
@@ -7,3 +7,4 @@
 rules = [
   OrganizeImports
 ]
+OrganizeImports.targetDialect = Auto
diff --git a/.scalafmt-common.conf b/.scalafmt-common.conf
@@ -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.17"
+version = "3.8.0"
 style = default
 
 runner.dialect = scala3

diff --git a/modules/tests/src/test/scala/lucuma/ui/input/FormatUtilsSpec.scala b/modules/tests/src/test/scala/lucuma/ui/input/FormatUtilsSpec.scala
@@ -6,9 +6,9 @@ package lucuma.ui.input
 import eu.timepit.refined.types.numeric.NonNegInt
 import lucuma.ui.input.FormatUtils.*
 import munit.DisciplineSuite
+import org.scalacheck.*
 import org.scalacheck.Arbitrary.*
 import org.scalacheck.Prop.*
-import org.scalacheck.*
 
 final class FormatUtilsSpec extends DisciplineSuite:
   val Zero = BigInt(0)

diff --git a/modules/ui/src/main/scala/lucuma/ui/components/UserSelectionForm.scala b/modules/ui/src/main/scala/lucuma/ui/components/UserSelectionForm.scala
@@ -8,7 +8,7 @@ import crystal.react.*
 import crystal.react.hooks.*
 import eu.timepit.refined.types.string.NonEmptyString
 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_<^.*
 import lucuma.core.util.NewType
 import lucuma.react.common.*

diff --git a/modules/ui/src/main/scala/lucuma/ui/components/state/ConnectionManager.scala b/modules/ui/src/main/scala/lucuma/ui/components/state/ConnectionManager.scala
@@ -9,7 +9,7 @@ import crystal.react.hooks.*
 import io.circe.Json
 import io.circe.syntax.*
 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_<^.*
 import lucuma.react.common.ReactFnPropsWithChildren
 import lucuma.ui.components.SolarProgress

diff --git a/modules/ui/src/main/scala/lucuma/ui/components/state/IfLogged.scala b/modules/ui/src/main/scala/lucuma/ui/components/state/IfLogged.scala
@@ -10,7 +10,7 @@ import eu.timepit.refined.types.string.NonEmptyString
 import fs2.dom.Serializer
 import io.circe.Json
 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_<^.*
 import lucuma.react.common.*
 import lucuma.ui.components.UserSelectionForm

diff --git a/modules/ui/src/main/scala/lucuma/ui/components/state/LogoutTracker.scala b/modules/ui/src/main/scala/lucuma/ui/components/state/LogoutTracker.scala
@@ -10,7 +10,7 @@ import eu.timepit.refined.types.string.NonEmptyString
 import fs2.dom.BroadcastChannel
 import fs2.dom.Serializer
 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_<^.*
 import lucuma.react.common.ReactFnProps
 import lucuma.refined.*

diff --git a/modules/ui/src/main/scala/lucuma/ui/components/state/SSOManager.scala b/modules/ui/src/main/scala/lucuma/ui/components/state/SSOManager.scala
@@ -9,7 +9,7 @@ import crystal.react.*
 import crystal.react.hooks.*
 import eu.timepit.refined.types.string.NonEmptyString
 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_<^.*
 import lucuma.react.common.ReactFnProps
 import lucuma.refined.*

diff --git a/modules/ui/src/main/scala/lucuma/ui/enums/Theme.scala b/modules/ui/src/main/scala/lucuma/ui/enums/Theme.scala
@@ -6,7 +6,7 @@ package lucuma.ui.enums
 import cats.syntax.all.*
 import japgolly.scalajs.react.ReactCats.*
 import japgolly.scalajs.react.Reusability
-import japgolly.scalajs.react.util.DefaultEffects.{Sync => DefaultS}
+import japgolly.scalajs.react.util.DefaultEffects.Sync as DefaultS
 import lucuma.core.util.Display
 import lucuma.core.util.Enumerated
 import lucuma.react.common.style.Css

diff --git a/modules/ui/src/main/scala/lucuma/ui/input/ChangeAuditor.scala b/modules/ui/src/main/scala/lucuma/ui/input/ChangeAuditor.scala
@@ -4,7 +4,7 @@
 package lucuma.ui.input
 
 import cats.syntax.all.*
-import eu.timepit.refined.api.{Validate => RefinedValidate}
+import eu.timepit.refined.api.Validate as RefinedValidate
 import eu.timepit.refined.numeric.NonNegative
 import eu.timepit.refined.numeric.Positive
 import eu.timepit.refined.refineV

diff --git a/modules/ui/src/main/scala/lucuma/ui/primereact/BooleanRadioButtons.scala b/modules/ui/src/main/scala/lucuma/ui/primereact/BooleanRadioButtons.scala
@@ -5,7 +5,7 @@ package lucuma.ui.primereact
 
 import eu.timepit.refined.types.string.NonEmptyString
 import japgolly.scalajs.react.*
-import japgolly.scalajs.react.vdom.html_<^._
+import japgolly.scalajs.react.vdom.html_<^.*
 import lucuma.react.common.*
 
 import scalajs.js

diff --git a/modules/ui/src/main/scala/lucuma/ui/primereact/CheckboxView.scala b/modules/ui/src/main/scala/lucuma/ui/primereact/CheckboxView.scala
@@ -5,7 +5,7 @@ package lucuma.ui.primereact
 
 import eu.timepit.refined.types.string.NonEmptyString
 import japgolly.scalajs.react.*
-import japgolly.scalajs.react.vdom.html_<^._
+import japgolly.scalajs.react.vdom.html_<^.*
 import lucuma.react.common.*
 import lucuma.react.primereact.Checkbox
 

diff --git a/modules/ui/src/main/scala/lucuma/ui/primereact/EnumDropdown.scala b/modules/ui/src/main/scala/lucuma/ui/primereact/EnumDropdown.scala
@@ -6,7 +6,7 @@ package lucuma.ui.primereact
 import cats.syntax.all.*
 import eu.timepit.refined.types.string.NonEmptyString
 import japgolly.scalajs.react.*
-import japgolly.scalajs.react.vdom.html_<^._
+import japgolly.scalajs.react.vdom.html_<^.*
 import lucuma.core.util.Display
 import lucuma.core.util.Enumerated
 import lucuma.react.common.*

diff --git a/modules/ui/src/main/scala/lucuma/ui/primereact/EnumDropdownOptionalView.scala b/modules/ui/src/main/scala/lucuma/ui/primereact/EnumDropdownOptionalView.scala
@@ -6,7 +6,7 @@ package lucuma.ui.primereact
 import cats.syntax.all.*
 import eu.timepit.refined.types.string.NonEmptyString
 import japgolly.scalajs.react.*
-import japgolly.scalajs.react.vdom.html_<^._
+import japgolly.scalajs.react.vdom.html_<^.*
 import lucuma.core.util.Display
 import lucuma.core.util.Enumerated
 import lucuma.react.common.*

diff --git a/modules/ui/src/main/scala/lucuma/ui/primereact/EnumDropdownView.scala b/modules/ui/src/main/scala/lucuma/ui/primereact/EnumDropdownView.scala
@@ -6,7 +6,7 @@ package lucuma.ui.primereact
 import cats.syntax.all.*
 import eu.timepit.refined.types.string.NonEmptyString
 import japgolly.scalajs.react.*
-import japgolly.scalajs.react.vdom.html_<^._
+import japgolly.scalajs.react.vdom.html_<^.*
 import lucuma.core.util.Display
 import lucuma.core.util.Enumerated
 import lucuma.react.common.*

diff --git a/modules/ui/src/main/scala/lucuma/ui/primereact/EnumOptionalDropdown.scala b/modules/ui/src/main/scala/lucuma/ui/primereact/EnumOptionalDropdown.scala
@@ -6,7 +6,7 @@ package lucuma.ui.primereact
 import cats.syntax.all.*
 import eu.timepit.refined.types.string.NonEmptyString
 import japgolly.scalajs.react.*
-import japgolly.scalajs.react.vdom.html_<^._
+import japgolly.scalajs.react.vdom.html_<^.*
 import lucuma.core.util.Display
 import lucuma.core.util.Enumerated
 import lucuma.react.common.*

diff --git a/modules/ui/src/main/scala/lucuma/ui/primereact/FormInputText.scala b/modules/ui/src/main/scala/lucuma/ui/primereact/FormInputText.scala
@@ -12,7 +12,7 @@ import lucuma.react.floatingui
 import lucuma.react.floatingui.syntax.*
 import lucuma.react.primereact.InputText
 import lucuma.react.primereact.PrimeStyles
-import lucuma.typed.primereact.components.{Button => CButton}
+import lucuma.typed.primereact.components.Button as CButton
 
 import scalajs.js
 

diff --git a/modules/ui/src/main/scala/lucuma/ui/primereact/FormInputTextView.scala b/modules/ui/src/main/scala/lucuma/ui/primereact/FormInputTextView.scala
@@ -13,7 +13,7 @@ import japgolly.scalajs.react.vdom.html_<^.*
 import lucuma.core.validation.*
 import lucuma.react.common.*
 import lucuma.react.primereact.PrimeStyles
-import lucuma.typed.primereact.components.{Button => CButton}
+import lucuma.typed.primereact.components.Button as CButton
 import lucuma.ui.input.AuditResult
 import lucuma.ui.input.ChangeAuditor
 import org.scalajs.dom.Element

diff --git a/modules/ui/src/main/scala/lucuma/ui/primereact/RadioButtonView.scala b/modules/ui/src/main/scala/lucuma/ui/primereact/RadioButtonView.scala
@@ -4,10 +4,10 @@
 package lucuma.ui.primereact
 
 import cats.Eq
-import cats.syntax.all._
+import cats.syntax.all.*
 import eu.timepit.refined.types.string.NonEmptyString
 import japgolly.scalajs.react.*
-import japgolly.scalajs.react.vdom.html_<^._
+import japgolly.scalajs.react.vdom.html_<^.*
 import lucuma.react.common.*
 import lucuma.react.primereact.RadioButton
 

diff --git a/modules/ui/src/main/scala/lucuma/ui/primereact/SliderView.scala b/modules/ui/src/main/scala/lucuma/ui/primereact/SliderView.scala
@@ -7,7 +7,7 @@ import cats.syntax.all.*
 import crystal.react.View
 import eu.timepit.refined.types.string.NonEmptyString
 import japgolly.scalajs.react.*
-import japgolly.scalajs.react.vdom.html_<^._
+import japgolly.scalajs.react.vdom.html_<^.*
 import lucuma.react.common.*
 import lucuma.react.primereact.Slider
 

diff --git a/modules/ui/src/main/scala/lucuma/ui/primereact/primereact.scala b/modules/ui/src/main/scala/lucuma/ui/primereact/primereact.scala
@@ -13,7 +13,7 @@ import lucuma.react.primereact.Button
 import lucuma.react.primereact.InputText
 import lucuma.react.primereact.PrimeStyles
 import lucuma.typed.StBuildingComponent
-import lucuma.typed.primereact.components.{Button => CButton}
+import lucuma.typed.primereact.components.Button as CButton
 
 import scalajs.js
 

diff --git a/modules/ui/src/main/scala/lucuma/ui/reusability/package.scala b/modules/ui/src/main/scala/lucuma/ui/reusability/package.scala
@@ -12,12 +12,12 @@ import coulomb.Quantity
 import eu.timepit.refined.api.RefType
 import io.circe.Json
 import japgolly.scalajs.react.Key
-import japgolly.scalajs.react.ReactCats._
+import japgolly.scalajs.react.ReactCats.*
 import japgolly.scalajs.react.Reusability
 import lucuma.core.data.EnumZipper
 import lucuma.core.geom.Area
-import lucuma.core.math.BrightnessUnits.*
 import lucuma.core.math.*
+import lucuma.core.math.BrightnessUnits.*
 import lucuma.core.math.dimensional.*
 import lucuma.core.model.*
 import lucuma.core.model.sequence.*

diff --git a/modules/ui/src/main/scala/lucuma/ui/sequence/package.scala b/modules/ui/src/main/scala/lucuma/ui/sequence/package.scala
@@ -14,8 +14,8 @@ import lucuma.core.util.NewType
 import lucuma.react.common.*
 import lucuma.react.floatingui.Placement
 import lucuma.react.floatingui.syntax.*
-import lucuma.ui.utils.Render
 import lucuma.ui.utils.*
+import lucuma.ui.utils.Render
 
 object StepIndex extends NewType[PosInt]
 type StepIndex = StepIndex.Type

diff --git a/modules/ui/src/main/scala/lucuma/ui/sso/SSOClient.scala b/modules/ui/src/main/scala/lucuma/ui/sso/SSOClient.scala
@@ -23,7 +23,7 @@ import retry.*
 
 import java.time.Instant
 import java.time.temporal.ChronoUnit
-import java.{util => ju}
+import java.util as ju
 import scala.concurrent.duration.*
 
 case class JwtOrcidProfile(exp: Long, `lucuma-user`: User) derives Decoder

diff --git a/modules/ui/src/main/scala/lucuma/ui/table/PrimeTable.scala b/modules/ui/src/main/scala/lucuma/ui/table/PrimeTable.scala
@@ -11,8 +11,8 @@ import lucuma.react.SizePx
 import lucuma.react.common.*
 import lucuma.react.common.style.Css
 import lucuma.react.table.*
-import lucuma.typed.{tanstackTableCore => raw}
-import lucuma.typed.{tanstackVirtualCore => rawVirtual}
+import lucuma.typed.tanstackTableCore as raw
+import lucuma.typed.tanstackVirtualCore as rawVirtual
 import org.scalajs.dom.HTMLElement
 
 import scalajs.js

diff --git a/modules/ui/src/main/scala/lucuma/ui/table/hooks/DynTable.scala b/modules/ui/src/main/scala/lucuma/ui/table/hooks/DynTable.scala
@@ -6,8 +6,8 @@ package lucuma.ui.table.hooks
 import cats.syntax.all.*
 import lucuma.react.SizePx
 import lucuma.react.table.*
-import lucuma.ui.table.ColumnSize.*
 import lucuma.ui.table.*
+import lucuma.ui.table.ColumnSize.*
 import monocle.Focus
 import monocle.Lens
 

diff --git a/modules/ui/src/main/scala/lucuma/ui/table/hooks/UseReactTableWithStateStore.scala b/modules/ui/src/main/scala/lucuma/ui/table/hooks/UseReactTableWithStateStore.scala
@@ -8,7 +8,7 @@ import cats.syntax.all.*
 import crystal.react.*
 import japgolly.scalajs.react.*
 import japgolly.scalajs.react.hooks.CustomHook
-import japgolly.scalajs.react.util.DefaultEffects.{Async => DefaultA}
+import japgolly.scalajs.react.util.DefaultEffects.Async as DefaultA
 import lucuma.core.util.NewType
 import lucuma.react.table.*
 import lucuma.ui.reusability.given

diff --git a/modules/ui/src/main/scala/lucuma/ui/utils/ReactUtils.scala b/modules/ui/src/main/scala/lucuma/ui/utils/ReactUtils.scala
@@ -5,7 +5,7 @@ package lucuma.ui.utils
 
 import eu.timepit.refined.api.Refined
 import japgolly.scalajs.react.*
-import japgolly.scalajs.react.util.DefaultEffects.{Sync => DefaultS}
+import japgolly.scalajs.react.util.DefaultEffects.Sync as DefaultS
 import japgolly.scalajs.react.vdom.*
 
 def linkOverride(f: => DefaultS[Unit]): ReactMouseEvent => Callback =

diff --git a/modules/ui/src/main/scala/lucuma/ui/utils/RetryHelpers.scala b/modules/ui/src/main/scala/lucuma/ui/utils/RetryHelpers.scala
@@ -5,11 +5,11 @@ package lucuma.ui.utils
 
 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/modules/ui/src/main/scala/lucuma/ui/utils/UAParser.scala b/modules/ui/src/main/scala/lucuma/ui/utils/UAParser.scala
@@ -5,7 +5,7 @@ package lucuma.ui.utils
 
 import scala.annotation.nowarn
 import scala.scalajs.js
-import scala.scalajs.js.annotation._
+import scala.scalajs.js.annotation.*
 
 @nowarn
 @js.native

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.1")
-val sbtLucumaVersion = "0.11.13"
+val sbtLucumaVersion = "0.11.15"
 addSbtPlugin("edu.gemini" % "sbt-lucuma-lib" % sbtLucumaVersion)
 addSbtPlugin("edu.gemini" % "sbt-lucuma-css" % sbtLucumaVersion)