From 5f78dd1c177407babe2b2641f5512e6c9a950f8b Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Thu, 7 Feb 2019 16:50:38 +0100 Subject: [PATCH 1/2] Also export compileIvyDeps as provided scope Fixes https://github.com/lihaoyi/mill/issues/535 --- scalalib/src/PublishModule.scala | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scalalib/src/PublishModule.scala b/scalalib/src/PublishModule.scala index cd1c436a51b..0fd862b398c 100644 --- a/scalalib/src/PublishModule.scala +++ b/scalalib/src/PublishModule.scala @@ -22,9 +22,17 @@ trait PublishModule extends JavaModule { outer => def publishXmlDeps = T.task { val ivyPomDeps = ivyDeps().map(resolvePublishDependency().apply(_)) + + val compileIvyPomDeps = compileIvyDeps() + .map(resolvePublishDependency().apply(_)) + .filter(!ivyPomDeps.contains(_)) + .map(_.copy(scope = Scope.Provided)) + val modulePomDeps = Task.sequence(moduleDeps.map(_.publishSelfDependency))() - ivyPomDeps ++ modulePomDeps.map(Dependency(_, Scope.Compile)) + + ivyPomDeps ++ compileIvyPomDeps ++ modulePomDeps.map(Dependency(_, Scope.Compile)) } + def pom = T { val pom = Pom(artifactMetadata(), publishXmlDeps(), artifactId(), pomSettings()) val pomPath = T.ctx().dest / s"${artifactId()}-${publishVersion()}.pom" From 6862db441559bb76b3daf605bab1763948c4d3ba Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Thu, 7 Feb 2019 16:52:03 +0100 Subject: [PATCH 2/2] Updated Changelog --- readme.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/readme.md b/readme.md index 002b2f30e15..d51762696d1 100644 --- a/readme.md +++ b/readme.md @@ -155,6 +155,10 @@ optimizer without classpath conflicts. ## Changelog +### {master} + +- Publish compileIvyDeps as provided scope + ### 0.3.6 - Started to splitting out mill.api from mill.core