Skip to content

Commit

Permalink
Update mill-main to 0.11.2 (#134)
Browse files Browse the repository at this point in the history
  • Loading branch information
ex0ns authored Sep 17, 2023
1 parent cfa089c commit 4a738ef
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
arguments: "-c .scalafmt.conf --test"
- uses: jodersky/[email protected]
with:
mill-version: 0.10.12
mill-version: 0.11.2
- name: Compile
run: mill '__.compile'
- name: Test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_snapshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
uses: actions/checkout@v2
- uses: jodersky/[email protected]
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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
uses: actions/checkout@v2
- uses: jodersky/[email protected]
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
Expand Down
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.10.12
0.11.2
16 changes: 8 additions & 8 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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}")

Expand Down Expand Up @@ -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._

Expand All @@ -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}"
Expand All @@ -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")
}
2 changes: 1 addition & 1 deletion core/src/com/bot4s/zmatrix/stream/package.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down

0 comments on commit 4a738ef

Please sign in to comment.