summaryrefslogtreecommitdiff
path: root/scalalib
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-04 00:25:29 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-04 00:25:29 -0800
commitf7a46fe9fb756803e3fdd81f427a7fd42001e71e (patch)
treed4ab21a64cf08833a28c0b11898c889c5a361122 /scalalib
parentf3ea6a59233a05792df49ede660c904c67f6c684 (diff)
downloadmill-f7a46fe9fb756803e3fdd81f427a7fd42001e71e.tar.gz
mill-f7a46fe9fb756803e3fdd81f427a7fd42001e71e.tar.bz2
mill-f7a46fe9fb756803e3fdd81f427a7fd42001e71e.zip
Remove the default `publishVersion` from `PublishModule`, and add `--batch` to gpg shellout to avoid popping up a password screen
Diffstat (limited to 'scalalib')
-rw-r--r--scalalib/src/mill/scalalib/PublishModule.scala2
-rw-r--r--scalalib/src/mill/scalalib/ScalaModule.scala2
-rw-r--r--scalalib/src/mill/scalalib/publish/SonatypePublisher.scala2
3 files changed, 3 insertions, 3 deletions
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")
}