From 4ae7a62a0b31e2335d9372c05ceafda919d87c22 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sun, 4 Feb 2018 02:56:55 -0800 Subject: Publish all modules to support intellij navigation within build files, and remove hardcoded mill version from `ScalaWorkerApi` --- build.sc | 4 ++++ scalalib/src/mill/scalalib/GenIdea.scala | 2 +- scalalib/src/mill/scalalib/ScalaWorkerApi.scala | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.sc b/build.sc index 819b8dd6..5e3a9af2 100755 --- a/build.sc +++ b/build.sc @@ -241,6 +241,10 @@ def uploadToGithub(assembly: Path, authKey: String, release: String, label: Stri def releaseCI(githubAuthKey: String, sonatypeCreds: String, gpgPassphrase: String) = if (isMasterCommit) T.command() else T.command{ + moduledefs.publish(sonatypeCreds, gpgPassphrase)() + core.publish(sonatypeCreds, gpgPassphrase)() + scalalib.publish(sonatypeCreds, gpgPassphrase)() + scalajslib.publish(sonatypeCreds, gpgPassphrase)() scalaworker.publish(sonatypeCreds, gpgPassphrase)() scalajslib.jsbridges("0.6").publish(sonatypeCreds, gpgPassphrase)() scalajslib.jsbridges("1.0").publish(sonatypeCreds, gpgPassphrase)() diff --git a/scalalib/src/mill/scalalib/GenIdea.scala b/scalalib/src/mill/scalalib/GenIdea.scala index eb04cf1c..f4d90068 100644 --- a/scalalib/src/mill/scalalib/GenIdea.scala +++ b/scalalib/src/mill/scalalib/GenIdea.scala @@ -46,7 +46,7 @@ object GenIdea { Seq(Cache.ivy2Local, MavenRepository("https://repo1.maven.org/maven2")), "2.12.4", for(name <- artifactNames) - yield Dep("com.lihaoyi", s"mill-${name}", "0.0.1-SNAPSHOT") + yield Dep("com.lihaoyi", s"mill-${name}", sys.props("MILL_VERSION")) ) res.items.toSeq.map(_.path) } diff --git a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala index a587a48c..cfa7dda4 100644 --- a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala +++ b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala @@ -19,7 +19,7 @@ object ScalaWorkerApi extends mill.define.ExternalModule { val mill.eval.Result.Success(v) = resolveDependencies( Seq(Cache.ivy2Local, MavenRepository("https://repo1.maven.org/maven2")), "2.12.4", - Seq(ivy"com.lihaoyi::mill-scalaworker:0.0.1-SNAPSHOT") + Seq(ivy"com.lihaoyi::mill-scalaworker:" + sys.props("MILL_VERSION")) ) v.map(_.path) } -- cgit v1.2.3