From f7a46fe9fb756803e3fdd81f427a7fd42001e71e Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sun, 4 Feb 2018 00:25:29 -0800 Subject: Remove the default `publishVersion` from `PublishModule`, and add `--batch` to gpg shellout to avoid popping up a password screen --- scalalib/src/mill/scalalib/PublishModule.scala | 2 +- scalalib/src/mill/scalalib/ScalaModule.scala | 2 +- scalalib/src/mill/scalalib/publish/SonatypePublisher.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'scalalib') diff --git a/scalalib/src/mill/scalalib/PublishModule.scala b/scalalib/src/mill/scalalib/PublishModule.scala index cedcdf8a..58334e41 100644 --- a/scalalib/src/mill/scalalib/PublishModule.scala +++ b/scalalib/src/mill/scalalib/PublishModule.scala @@ -11,7 +11,7 @@ trait PublishModule extends ScalaModule { outer => import mill.scalalib.publish._ def pomSettings: T[PomSettings] - def publishVersion: T[String] = "0.0.1-SNAPSHOT" + def publishVersion: T[String] def pom = T { val dependencies = diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index 01f0d7ac..88c2e82e 100644 --- a/scalalib/src/mill/scalalib/ScalaModule.scala +++ b/scalalib/src/mill/scalalib/ScalaModule.scala @@ -189,7 +189,7 @@ trait ScalaModule extends mill.Module with TaskModule { outer => mainArgs = (files ++ options).toSeq ) - createJar(Agg(javadocDir))(outDir / "javadoc.jar") + createJar(Agg(javadocDir))(outDir) } def sourcesJar = T { diff --git a/scalalib/src/mill/scalalib/publish/SonatypePublisher.scala b/scalalib/src/mill/scalalib/publish/SonatypePublisher.scala index 0749b0c5..52271a48 100644 --- a/scalalib/src/mill/scalalib/publish/SonatypePublisher.scala +++ b/scalalib/src/mill/scalalib/publish/SonatypePublisher.scala @@ -128,7 +128,7 @@ class SonatypePublisher(uri: String, private def poorMansSign(file: Path, passphrase: String): Path = { val fileName = file.toString import ammonite.ops.ImplicitWd._ - %("gpg", "--yes", "-a", "-b", "--passphrase", passphrase, fileName) + %("gpg", "--yes", "-a", "-b", "--batch", "--passphrase", passphrase, fileName) Path(fileName + ".asc") } -- cgit v1.2.3