# HG changeset patch # User Tomas Zeman # Date 1609009488 -3600 # Node ID c0cf0150cb4cdf24596883d1139c2ea0998d41e6 # Parent f934655234572f5c0d75e6b43cd335e709dfa493 Upgrade mill -> 0.9.4, Scala -> 2.12.12, ScalaJS -> 0.6.33 diff -r f93465523457 -r c0cf0150cb4c build.sc --- a/build.sc Sat Dec 26 19:56:35 2020 +0100 +++ b/build.sc Sat Dec 26 20:04:48 2020 +0100 @@ -1,3 +1,13 @@ +/* + * REPL: + * + * ./mill --repl -w + * + * Generate Idea project: + * + * ./mill mill.scalalib.GenIdea/idea + * + */ import mill._ import mill.api.Loose import mill.define.{Command, Input, Sources, Target} @@ -7,9 +17,9 @@ object V { val app = "0.3-SNAPSHOT" - val scalaJs = "0.6.28" + val scalaJs = "0.6.33" val scala211 = "2.11.12" - val scala212 = "2.12.9" + val scala212 = "2.12.12" } object D { @@ -18,7 +28,7 @@ trait Common extends CrossSbtModule with PublishModule { - def pomSettings = PomSettings( + def pomSettings: T[PomSettings] = PomSettings( description = "Scalatags DSL for purecss.io framework", organization = "cz.functionals", url = "https://hg.functionals.cz/purecss", @@ -44,7 +54,7 @@ "-unchecked", // Enable additional warnings where generated code depends on assumptions. "-Xcheckinit", // Wrap field accessors to throw an exception on uninitialized access. "-Xfuture", // Turn on future language features. - "-target:jvm-1.8", + "-target:jvm-1.8" )} def hgId: Input[String] = T.input { @@ -82,6 +92,14 @@ object jvm extends Cross[JvmModule](V.scala211, V.scala212) object js extends Cross[JsModule](V.scala211, V.scala212) +def compileAll(): Command[Unit] = T.command{ + jvm(V.scala212).compile() + js(V.scala212).compile() + jvm(V.scala211).compile() + js(V.scala211).compile() + () +} + def publishLocal(): Command[Unit] = T.command{ jvm(V.scala212).publishLocal()() js(V.scala212).publishLocal()() diff -r f93465523457 -r c0cf0150cb4c mill --- a/mill Sat Dec 26 19:56:35 2020 +0100 +++ b/mill Sat Dec 26 20:04:48 2020 +0100 @@ -3,7 +3,7 @@ # 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.7.3 +DEFAULT_MILL_VERSION=0.9.4 set -e