Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
lihaoyi committed Jun 7, 2023
1 parent 0d5b29a commit 6f3c2f5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
0.11.0-M11
0.11.0

10 changes: 5 additions & 5 deletions build.sc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import mill._, scalalib._, scalajslib._, scalanativelib._, publish._
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.3.1-14-7e2bd2`
import $ivy.`com.github.lolgab::mill-mima::0.0.22`
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`
import $ivy.`com.github.lolgab::mill-mima::0.0.23`
import de.tobiasroeser.mill.vcs.version.VcsVersion
import com.github.lolgab.mill.mima._
import mill.scalalib.api.ZincWorkerUtil.isScala3
Expand Down Expand Up @@ -37,18 +37,18 @@ trait FansiTestModule extends ScalaModule with TestModule.Utest {
object fansi extends Module {
object jvm extends Cross[JvmFansiModule](scalaVersions)
trait JvmFansiModule extends FansiModule with ScalaModule {
object test extends ScalaModuleTests with FansiTestModule
object test extends ScalaTests with FansiTestModule
}

object js extends Cross[JsFansiModule](scalaVersions)
trait JsFansiModule extends FansiModule with ScalaJSModule{
def scalaJSVersion = "1.10.1"
object test extends ScalaJSModuleTests with FansiTestModule
object test extends ScalaJSTests with FansiTestModule
}

object native extends Cross[NativeFansiModule](scalaVersions)
trait NativeFansiModule extends FansiModule with ScalaNativeModule{
def scalaNativeVersion = "0.4.5"
object test extends ScalaNativeModuleTests with FansiTestModule
object test extends ScalaNativeTests with FansiTestModule
}
}
2 changes: 1 addition & 1 deletion mill
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
set -e

if [ -z "${DEFAULT_MILL_VERSION}" ] ; then
DEFAULT_MILL_VERSION=0.11.0-M11
DEFAULT_MILL_VERSION=0.11.0
fi

if [ -z "$MILL_VERSION" ] ; then
Expand Down

0 comments on commit 6f3c2f5

Please sign in to comment.