diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 76c8a62f..2a9ef54d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,8 +35,7 @@ jobs: timeout-minutes: 60 steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 @@ -99,8 +98,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 diff --git a/.scalafmt-common.conf b/.scalafmt-common.conf index 0d8610d0..18e403ee 100644 --- 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.8.0" +version = "3.8.3" style = default runner.dialect = scala3 diff --git a/modules/core/js/src/main/scala/crystal/react/reuse/Reuse.scala b/modules/core/js/src/main/scala/crystal/react/reuse/Reuse.scala index e980c30b..15e52a37 100644 --- a/modules/core/js/src/main/scala/crystal/react/reuse/Reuse.scala +++ b/modules/core/js/src/main/scala/crystal/react/reuse/Reuse.scala @@ -50,7 +50,7 @@ trait Reuse[+A] { def addReuseByFrom[C](r: Reuse[C]): Reuse[A] = addReuseBy(r.reuseBy)(using r.reusability) def replaceReuseBy[R: Reusability: ClassTag](r: R): Reuse[A] = Reuse.by(r)(value) - def replaceReuseByFrom[C](r: Reuse[C]): Reuse[A] = + def replaceReuseByFrom[C](r: Reuse[C]): Reuse[A] = replaceReuseBy(r.reuseBy)(using r.reusability, r.classTag) def map[C](f: A => C): Reuse[C] = Reuse.by(reuseBy)(f(value)) diff --git a/modules/core/js/src/main/scala/crystal/react/syntax/effect.scala b/modules/core/js/src/main/scala/crystal/react/syntax/effect.scala index 67311455..80002b9d 100644 --- a/modules/core/js/src/main/scala/crystal/react/syntax/effect.scala +++ b/modules/core/js/src/main/scala/crystal/react/syntax/effect.scala @@ -124,11 +124,11 @@ trait effect { extension [A](self: NonEmptyRef.Set[A]) inline def setIn[F[_]: Sync](a: A): F[Unit] = self.set(a).to[F] - inline def setAsync: A => DefaultA[Unit] = setIn[DefaultA](_) + inline def setAsync: A => DefaultA[Unit] = setIn[DefaultA](_) extension [A](self: NonEmptyRef.Simple[A]) inline def modIn[F[_]: Sync](f: A => A): F[Unit] = self.mod(f).to[F] - inline def modAsync: (A => A) => DefaultA[Unit] = modIn[DefaultA](_) + inline def modAsync: (A => A) => DefaultA[Unit] = modIn[DefaultA](_) extension [S](self: UseSerialState[S]) inline def setStateAsync: Reusable[S => DefaultA[Unit]] = diff --git a/project/plugins.sbt b/project/plugins.sbt index 84969e23..ee97f5f1 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("edu.gemini" % "sbt-lucuma-lib" % "0.12.0") +addSbtPlugin("edu.gemini" % "sbt-lucuma-lib" % "0.12.1")