Skip to content

Commit f00d137

Browse files
committed
Merge branch 'master' into haemin/hedgehog-support
2 parents 7037618 + d61c7a6 commit f00d137

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
# Scala Steward: Reformat with scalafmt 3.7.1
22
b4d1c74ff671d51ee24c267306ee2bb268b106cd
3+
4+
# Scala Steward: Reformat with scalafmt 3.7.4
5+
9a4d3154c1412b8fc8935643c5fb94a16fa5145e

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626

2727
- name: Check formatting
2828
run:
29-
./mill -j 0 -i '__.checkFormat'
29+
./mill -i '__.checkFormat'
3030

3131
test:
3232
strategy:
3333
matrix:
3434
os: [ ubuntu-latest ]
35-
scala: [ '2.13.10', '3.2.2' ]
35+
scala: [ '2.13.10', '3.3.0' ]
3636
java: [ '8', '19' ]
3737
platform: [ 'jvm', 'js' ]
3838
runs-on: ${{ matrix.os }}

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.7.3"
1+
version = "3.7.6"
22

33
runner.dialect = scala213source3
44
maxColumn = 100

build.sc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import $ivy.`com.yoohaemin::mill-mdoc::0.0.3`
2-
import $ivy.`io.chris-kipp::mill-ci-release::0.1.5`
2+
import $ivy.`io.chris-kipp::mill-ci-release::0.1.9`
33
import mill._, scalalib._, scalafmt._, publish._, define.Command
44
import de.tobiasroeser.mill.vcs.version.VcsVersion
55
import de.wayofquality.mill.mdoc.MDocModule
@@ -145,15 +145,15 @@ object D {
145145

146146
object V {
147147
val scala213 = "2.13.10"
148-
val scala3 = "3.2.2"
148+
val scala3 = "3.3.0"
149149
val scalaAll = scala213 :: scala3 :: Nil
150150
val scalaJS = "1.13.0"
151151

152152
def cats = "2.9.0"
153-
def zio = "2.0.12"
153+
def zio = "2.0.15"
154154
def zioQuery = "0.4.0"
155155
def fetch = "3.1.2"
156-
def izumiReflect = "2.3.2"
156+
def izumiReflect = "2.3.8"
157157
def scalacheck = "1.17.0"
158158
def hedgehog = "0.10.1"
159159

scalacheck/test/src/decrel/scalacheck/genSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ object genSpec extends Properties("Relations") {
8888
User.currentRentals.type & Relation.Many[User, List, Rental],
8989
User,
9090
List,
91-
Rental,
91+
Rental
9292
] = Gen.relationMany(User.currentRentals) { user =>
9393
Gen
9494
// Use `expand` even when implementing other relations

0 commit comments

Comments
 (0)