From db852551bccaa05dad8dfce8413c3b7a94f5d672 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Thu, 20 Sep 2018 20:01:02 +0800 Subject: Re-order `publishAll` arguments to get rarely used `signed` arg out of the way --- scalalib/src/mill/scalalib/PublishModule.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scalalib') diff --git a/scalalib/src/mill/scalalib/PublishModule.scala b/scalalib/src/mill/scalalib/PublishModule.scala index 0b7e52c8..5c567452 100644 --- a/scalalib/src/mill/scalalib/PublishModule.scala +++ b/scalalib/src/mill/scalalib/PublishModule.scala @@ -97,11 +97,11 @@ object PublishModule extends ExternalModule { def publishAll(sonatypeCreds: String, gpgPassphrase: String = null, - signed: Boolean = true, publishArtifacts: mill.main.Tasks[PublishModule.PublishData], release: Boolean = false, sonatypeUri: String = "https://oss.sonatype.org/service/local", - sonatypeSnapshotUri: String = "https://oss.sonatype.org/content/repositories/snapshots") = T.command { + sonatypeSnapshotUri: String = "https://oss.sonatype.org/content/repositories/snapshots", + signed: Boolean = true) = T.command { val x: Seq[(Seq[(Path, String)], Artifact)] = Task.sequence(publishArtifacts.value)().map{ case PublishModule.PublishData(a, s) => (s.map{case (p, f) => (p.path, f)}, a) -- cgit v1.2.3 From 114208c4cbdbc2bc8a224b986d358526542a69b2 Mon Sep 17 00:00:00 2001 From: Brandon Elam Barker Date: Fri, 5 Oct 2018 08:58:30 -0400 Subject: fix for allowing subgroups of a given staging profile (#441) --- scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scalalib') diff --git a/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala b/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala index 927d4515..12defa93 100644 --- a/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala +++ b/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala @@ -36,7 +36,8 @@ class SonatypeHttpApi(uri: String, credentials: String) { ujson .read(response.body)("data") .arr - .find(profile => profile("name").str == groupId) + .find(profile => + groupId.split('.').startsWith(profile("name").str.split('.'))) .map(_("resourceURI").str.toString) resourceUri.getOrElse( -- cgit v1.2.3 From 482f5407082ff44b0c084ad80adbf903d7fdc6b9 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Tue, 9 Oct 2018 03:36:46 +0200 Subject: Configure Idea project generator per module (#458) * Sketched how to skip some projects from Idea project generator * Better trait comment * Moved skipIdea flag into JavaModule --- scalalib/src/mill/scalalib/GenIdeaImpl.scala | 6 ++++-- scalalib/src/mill/scalalib/JavaModule.scala | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'scalalib') diff --git a/scalalib/src/mill/scalalib/GenIdeaImpl.scala b/scalalib/src/mill/scalalib/GenIdeaImpl.scala index f71a7856..b4f77f16 100644 --- a/scalalib/src/mill/scalalib/GenIdeaImpl.scala +++ b/scalalib/src/mill/scalalib/GenIdeaImpl.scala @@ -26,6 +26,7 @@ object GenIdea extends ExternalModule { implicit def millScoptEvaluatorReads[T] = new mill.main.EvaluatorScopt[T]() lazy val millDiscover = Discover[this.type] } + object GenIdeaImpl { def apply(ctx: Log with Home, @@ -225,8 +226,9 @@ object GenIdeaImpl { Tuple2( ".idea"/"modules.xml", allModulesXmlTemplate( - for((path, mod) <- modules) - yield moduleName(path) + modules + .filter(!_._2.skipIdea) + .map { case (path, mod) => moduleName(path) } ) ), Tuple2( diff --git a/scalalib/src/mill/scalalib/JavaModule.scala b/scalalib/src/mill/scalalib/JavaModule.scala index b15e0bdb..15fa7264 100644 --- a/scalalib/src/mill/scalalib/JavaModule.scala +++ b/scalalib/src/mill/scalalib/JavaModule.scala @@ -527,6 +527,11 @@ trait JavaModule extends mill.Module with TaskModule { outer => def intellijModulePath: Path = millSourcePath def forkWorkingDir = T{ ammonite.ops.pwd } + + /** + * Skip Idea project file generation. + */ + def skipIdea: Boolean = false } trait TestModule extends JavaModule with TaskModule { -- cgit v1.2.3