# HG changeset patch # User Tomas Zeman # Date 1571898841 -7200 # Node ID c4534300acdc37b05f25c08fb12023661a558ef0 # Parent 6ba55bf93ab794e786189f6552d3100f32c3f54f Mill upgrade -> 0.5.2, using PublishM2Module, fixed project urls diff -r 6ba55bf93ab7 -r c4534300acdc build.sc --- 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 diff -r 6ba55bf93ab7 -r c4534300acdc example5.html --- 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 @@ -

Please run sbt fastOptJS to build the demo. Then reload this page.

Please run mill example.fastOpt to build the demo. Then reload this page.