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 4fd936e commit 6e2954c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1,2 +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 $ivy.`com.lihaoyi::mill-contrib-buildinfo:`
import mill.contrib.buildinfo._
import de.tobiasroeser.mill.vcs.version.VcsVersion
Expand Down Expand Up @@ -64,7 +64,7 @@ object scalatags extends Module {
trait JvmScalatagsModule
extends ScalatagsPublishModule {

object test extends ScalaModuleTests with CommonTestModule
object test extends ScalaTests with CommonTestModule
}

object js extends Cross[JSScalatagsModule](scalaVersions)
Expand All @@ -73,7 +73,7 @@ object scalatags extends Module {
def scalaJSVersion = "1.10.1"
def ivyDeps = super.ivyDeps() ++ Agg(ivy"org.scala-js::scalajs-dom::2.3.0")

object test extends ScalaJSModuleTests with CommonTestModule{
object test extends ScalaJSTests with CommonTestModule{
def ivyDeps = super.ivyDeps() ++ Agg(ivy"org.scala-js::scalajs-env-jsdom-nodejs:1.1.0").map(_.withDottyCompat(crossScalaVersion))
def jsEnvConfig = mill.scalajslib.api.JsEnvConfig.JsDom()
}
Expand All @@ -84,7 +84,7 @@ object scalatags extends Module {
def scalaNativeVersion = "0.4.5"
// No released Scala Native Scala 3 version yet
def mimaPreviousArtifacts = if(isScala3(crossScalaVersion)) Agg.empty[Dep] else super.mimaPreviousArtifacts()
object test extends ScalaNativeModuleTests with CommonTestModule
object test extends ScalaNativeTests with CommonTestModule
}
}

Expand Down
4 changes: 2 additions & 2 deletions 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 Expand Up @@ -40,7 +40,7 @@ if [ ! -s "$MILL_EXEC_PATH" ] ; then
fi
DOWNLOAD_FILE=$MILL_EXEC_PATH-tmp-download
MILL_VERSION_TAG=$(echo $MILL_VERSION | sed -E 's/([^-]+)(-M[0-9]+)?(-.*)?/\1\2/')
MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION_TAG}/$MILL_VERSION${ASSEMBLY}"
MILL_DOWNLOAD_URL="https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/$MILL_VERSION/mill-dist-$MILL_VERSION.jar"
curl --fail -L -o "$DOWNLOAD_FILE" "$MILL_DOWNLOAD_URL"
chmod +x "$DOWNLOAD_FILE"
mv "$DOWNLOAD_FILE" "$MILL_EXEC_PATH"
Expand Down

0 comments on commit 6e2954c

Please sign in to comment.