diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 496a9c3..c6fb220 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.7.1 b4d1c74ff671d51ee24c267306ee2bb268b106cd + +# Scala Steward: Reformat with scalafmt 3.7.4 +9a4d3154c1412b8fc8935643c5fb94a16fa5145e diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cfee23e..781b5fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,13 +26,13 @@ jobs: - name: Check formatting run: - ./mill -j 0 -i '__.checkFormat' + ./mill -i '__.checkFormat' test: strategy: matrix: os: [ ubuntu-latest ] - scala: [ '2.13.10', '3.2.2' ] + scala: [ '2.13.10', '3.3.0' ] java: [ '8', '19' ] platform: [ 'jvm', 'js' ] runs-on: ${{ matrix.os }} diff --git a/.scalafmt.conf b/.scalafmt.conf index cb9b765..cfbf2c9 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.3" +version = "3.7.6" runner.dialect = scala213source3 maxColumn = 100 diff --git a/build.sc b/build.sc index 196e705..5040c7f 100644 --- a/build.sc +++ b/build.sc @@ -1,5 +1,5 @@ import $ivy.`com.yoohaemin::mill-mdoc::0.0.3` -import $ivy.`io.chris-kipp::mill-ci-release::0.1.5` +import $ivy.`io.chris-kipp::mill-ci-release::0.1.9` import mill._, scalalib._, scalafmt._, publish._, define.Command import de.tobiasroeser.mill.vcs.version.VcsVersion import de.wayofquality.mill.mdoc.MDocModule @@ -145,15 +145,15 @@ object D { object V { val scala213 = "2.13.10" - val scala3 = "3.2.2" + val scala3 = "3.3.0" val scalaAll = scala213 :: scala3 :: Nil val scalaJS = "1.13.0" def cats = "2.9.0" - def zio = "2.0.12" + def zio = "2.0.15" def zioQuery = "0.4.0" def fetch = "3.1.2" - def izumiReflect = "2.3.2" + def izumiReflect = "2.3.8" def scalacheck = "1.17.0" def hedgehog = "0.10.1" diff --git a/scalacheck/test/src/decrel/scalacheck/genSpec.scala b/scalacheck/test/src/decrel/scalacheck/genSpec.scala index f0d5089..0d8831c 100644 --- a/scalacheck/test/src/decrel/scalacheck/genSpec.scala +++ b/scalacheck/test/src/decrel/scalacheck/genSpec.scala @@ -88,7 +88,7 @@ object genSpec extends Properties("Relations") { User.currentRentals.type & Relation.Many[User, List, Rental], User, List, - Rental, + Rental ] = Gen.relationMany(User.currentRentals) { user => Gen // Use `expand` even when implementing other relations