--- a/build.sc Tue Jun 18 09:04:00 2019 +0200
+++ b/build.sc Thu Oct 24 08:34:01 2019 +0200
@@ -1,10 +1,12 @@
import ammonite.ops._
import mill._
+import mill.api.Loose
import mill.define.{Input, Sources, Target}
import mill.scalajslib._
import mill.scalalib._
import mill.scalalib.publish._
-import mill.util.Loose
+import $ivy.`de.tototec::de.tobiasroeser.mill.publishM2:0.1.0`
+import de.tobiasroeser.mill.publishM2._
import scala.language.postfixOps
@@ -29,7 +31,7 @@
inner(s toList) mkString ""
}
-trait Common extends CrossSbtModule with PublishModule {
+trait Common extends CrossSbtModule with PublishM2Module {
override def artifactName = "fatags"
@@ -38,10 +40,10 @@
def pomSettings = PomSettings(
description = "FontAwesome Scala DSL (tags)",
organization = "net.tz",
- url = "https://bitbucket.org/tzeman/fatags",
+ url = "https://hg.functionals.cz/fatags",
licenses = Seq(License.`Apache-2.0`),
versionControl = VersionControl(developerConnection = Some(
- "ssh://hg@bitbucket.org/tzeman/fatags")),
+ "ssh://tzeman@hg.functionals.cz/repos/public/fatags")),
developers = Seq(
Developer("tzeman", "Tomas Zeman", "")
)
@@ -142,6 +144,14 @@
js(V.scala211).publishLocal()()
}
+def publishM2Local(p: os.Path): define.Command[Unit] = T.command{
+ jvm(V.scala212).publishM2Local(p)()
+ js(V.scala212).publishM2Local(p)()
+ jvm(V.scala211).publishM2Local(p)()
+ js(V.scala211).publishM2Local(p)()
+ ()
+}
+
object example extends ScalaModule with ScalaJSModule {
override def scalaVersion: Target[String] = T{V.scala212}
override def scalaJSVersion: Target[String] = V.scalaJs
--- a/example5.html Tue Jun 18 09:04:00 2019 +0200
+++ b/example5.html Thu Oct 24 08:34:01 2019 +0200
@@ -9,7 +9,7 @@
</head>
<body>
-<div id="main">Please run sbt fastOptJS to build the demo. Then reload this page.</div>
+<div id="main">Please run mill example.fastOpt to build the demo. Then reload this page.</div>
<script type="text/javascript" src="out/example/fastOpt/dest/out.js"></script>
<script>
Example5.main();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mill Thu Oct 24 08:34:01 2019 +0200
@@ -0,0 +1,44 @@
+#!/usr/bin/env sh
+
+# This is a wrapper script, that automatically download mill from GitHub release pages
+# You can give the required mill version with MILL_VERSION env variable
+# If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
+DEFAULT_MILL_VERSION=0.5.2
+
+set -e
+
+if [ -z "$MILL_VERSION" ] ; then
+ if [ -f ".mill-version" ] ; then
+ MILL_VERSION="$(head -n 1 .mill-version 2> /dev/null)"
+ elif [ -f "mill" ] && [ "$BASH_SOURCE" != "mill" ] ; then
+ MILL_VERSION=$(grep -F "DEFAULT_MILL_VERSION=" "mill" | head -n 1 | cut -d= -f2)
+ else
+ MILL_VERSION=$DEFAULT_MILL_VERSION
+ fi
+fi
+
+MILL_DOWNLOAD_PATH="$HOME/.mill/download"
+MILL_EXEC_PATH="${MILL_DOWNLOAD_PATH}/$MILL_VERSION"
+
+version_remainder="$MILL_VERSION"
+MILL_MAJOR_VERSION="${version_remainder%%.*}"; version_remainder="${version_remainder#*.}"
+MILL_MINOR_VERSION="${version_remainder%%.*}"; version_remainder="${version_remainder#*.}"
+
+if [ ! -x "$MILL_EXEC_PATH" ] ; then
+ mkdir -p $MILL_DOWNLOAD_PATH
+ if [ $MILL_MAJOR_VERSION -gt 0 ] || [ $MILL_MINOR_VERSION -ge 5 ] ; then
+ ASSEMBLY="-assembly"
+ fi
+ DOWNLOAD_FILE=$MILL_EXEC_PATH-tmp-download
+ MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION%%-*}/$MILL_VERSION${ASSEMBLY}"
+ curl --fail -L -o "$DOWNLOAD_FILE" "$MILL_DOWNLOAD_URL"
+ chmod +x "$DOWNLOAD_FILE"
+ mv "$DOWNLOAD_FILE" "$MILL_EXEC_PATH"
+ unset DOWNLOAD_FILE
+ unset MILL_DOWNLOAD_URL
+fi
+
+unset MILL_DOWNLOAD_PATH
+unset MILL_VERSION
+
+exec $MILL_EXEC_PATH "$@"