Skip to content

Commit

Permalink
Merge branch 'master' into haemin/hedgehog-support
Browse files Browse the repository at this point in the history
  • Loading branch information
yoohaemin committed Jul 5, 2023
2 parents 7037618 + d61c7a6 commit f00d137
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.7.1
b4d1c74ff671d51ee24c267306ee2bb268b106cd

# Scala Steward: Reformat with scalafmt 3.7.4
9a4d3154c1412b8fc8935643c5fb94a16fa5145e
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.3"
version = "3.7.6"

runner.dialect = scala213source3
maxColumn = 100
Expand Down
8 changes: 4 additions & 4 deletions build.sc
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion scalacheck/test/src/decrel/scalacheck/genSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f00d137

Please sign in to comment.