From 4a738efda91d867aa93b95d3ae0f7709585d452a Mon Sep 17 00:00:00 2001 From: ex0ns Date: Sun, 17 Sep 2023 17:48:12 +0000 Subject: [PATCH] Update mill-main to 0.11.2 (#134) --- .github/workflows/build.yaml | 2 +- .github/workflows/publish_snapshot.yaml | 2 +- .github/workflows/release.yaml | 2 +- .mill-version | 2 +- build.sc | 16 ++++++++-------- core/src/com/bot4s/zmatrix/stream/package.scala | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4649ca5..cc1061a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -22,7 +22,7 @@ jobs: arguments: "-c .scalafmt.conf --test" - uses: jodersky/setup-mill@v0.3.0 with: - mill-version: 0.10.12 + mill-version: 0.11.2 - name: Compile run: mill '__.compile' - name: Test diff --git a/.github/workflows/publish_snapshot.yaml b/.github/workflows/publish_snapshot.yaml index ef8c08f..21c594e 100644 --- a/.github/workflows/publish_snapshot.yaml +++ b/.github/workflows/publish_snapshot.yaml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v2 - uses: jodersky/setup-mill@v0.3.0 with: - mill-version: 0.10.12 + mill-version: 0.11.2 - name: Import GPG key id: import_gpg uses: crazy-max/ghaction-import-gpg@v3 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index f32e898..1b44dce 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -11,7 +11,7 @@ jobs: uses: actions/checkout@v2 - uses: jodersky/setup-mill@v0.3.0 with: - mill-version: 0.10.12 + mill-version: 0.11.2 - name: Import GPG key id: import_gpg uses: crazy-max/ghaction-import-gpg@v3 diff --git a/.mill-version b/.mill-version index 5111446..bc859cb 100644 --- a/.mill-version +++ b/.mill-version @@ -1 +1 @@ -0.10.12 \ No newline at end of file +0.11.2 diff --git a/build.sc b/build.sc index c76deb9..aac0f67 100644 --- a/build.sc +++ b/build.sc @@ -3,7 +3,7 @@ import scalalib._ import publish._ import mill.scalalib._ -import $ivy.`com.goyeau::mill-scalafix::0.2.11` +import $ivy.`com.goyeau::mill-scalafix::0.3.1` import com.goyeau.mill.scalafix.ScalafixModule object Versions { @@ -33,7 +33,7 @@ trait Publishable extends PublishModule { ) } -abstract class ExtendedCrossScalaModule(crossScalaVersion: String) extends CrossScalaModule with ScalafixModule { +trait ExtendedCrossScalaModule extends CrossScalaModule with ScalafixModule { override def scalafixIvyDeps = Agg(ivy"com.github.liancheng::organize-imports:${Versions.scalafixModuleVersion}") @@ -62,9 +62,9 @@ abstract class ExtendedCrossScalaModule(crossScalaVersion: String) extends Cross } -object core extends Cross[CoreModule](scalaVersions: _*) +object core extends Cross[CoreModule](scalaVersions) -class CoreModule(val crossScalaVersion: String) extends ExtendedCrossScalaModule(crossScalaVersion) with Publishable { +trait CoreModule extends ExtendedCrossScalaModule with Publishable { import Versions._ @@ -81,7 +81,7 @@ class CoreModule(val crossScalaVersion: String) extends ExtendedCrossScalaModule ivy"com.softwaremill.sttp.client3::zio:${sttpVersion}" ) - object test extends Tests with ScalafixModule { + object test extends ScalaTests with ScalafixModule { def ivyDeps = Agg( ivy"dev.zio::zio-test:${zioVersion}", ivy"dev.zio::zio-test-sbt:${zioVersion}" @@ -98,9 +98,9 @@ class CoreModule(val crossScalaVersion: String) extends ExtendedCrossScalaModule } } -object examples extends Cross[ExamplesModule](scalaVersions: _*) -class ExamplesModule(val crossScalaVersion: String) extends ExtendedCrossScalaModule(crossScalaVersion) { - val moduleDeps = Seq(core(crossScalaVersion)) +object examples extends Cross[ExamplesModule](scalaVersions) +trait ExamplesModule extends ExtendedCrossScalaModule { + override def moduleDeps = Seq(core(crossScalaVersion)) def mainClass = Some("com.bot4s.zmatrix.Runner") } diff --git a/core/src/com/bot4s/zmatrix/stream/package.scala b/core/src/com/bot4s/zmatrix/stream/package.scala index d7e848d..12b9772 100644 --- a/core/src/com/bot4s/zmatrix/stream/package.scala +++ b/core/src/com/bot4s/zmatrix/stream/package.scala @@ -55,7 +55,7 @@ package object stream { ZPipeline.map { (input: AssociatedEvents[T]) => val (roomId, events) = input - events.collect { + val _ = events.collect { case event if pf.isDefinedAt(roomId, event) => pf(roomId, event) }