From cbb66d65cd9e8a23381d7a2e2a4bcbe15c9a9f95 Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Mon, 13 Jan 2025 09:03:15 +0100 Subject: [PATCH 1/2] Pretty print artifact on publishing --- libs/javalib/src/mill/javalib/publish/LocalIvyPublisher.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/javalib/src/mill/javalib/publish/LocalIvyPublisher.scala b/libs/javalib/src/mill/javalib/publish/LocalIvyPublisher.scala index 965bfe66da6a..593ba223f8bd 100644 --- a/libs/javalib/src/mill/javalib/publish/LocalIvyPublisher.scala +++ b/libs/javalib/src/mill/javalib/publish/LocalIvyPublisher.scala @@ -39,7 +39,9 @@ class LocalIvyPublisher(localIvyRepo: os.Path) { artifact: Artifact, contents: Map[os.SubPath, FileSetContents.Writable] )(implicit ctx: TaskCtx.Log): Seq[os.Path] = { - ctx.log.info(s"Publishing ${artifact} to ivy repo ${localIvyRepo}") + ctx.log.info( + s"Publishing ${artifact.group}:${artifact.id}:${artifact.version} to ivy repo ${localIvyRepo}" + ) val releaseDir = localIvyRepo / artifact.group / artifact.id / artifact.version FileSetContents.writeTo(releaseDir, contents) } From d05deac7641ab4c82a958e2318413df89c3d95d4 Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Tue, 15 Jul 2025 11:36:54 +0200 Subject: [PATCH 2/2] Update tests and examples to new output --- .../plugins/1-writing-mill-plugins/build.mill | 2 +- example/javalib/basic/6-realistic/build.mill | 6 +++--- .../publishing/2-publish-module/build.mill | 2 +- example/javalib/publishing/3-revapi/build.mill | 2 +- example/kotlinlib/basic/6-realistic/build.mill | 6 +++--- .../publishing/2-publish-module/build.mill | 2 +- example/scalalib/basic/6-realistic/build.mill | 10 +++++----- .../publishing/2-publish-module/build.mill | 2 +- .../build.mill | 16 ++++++++-------- .../build.mill | 16 ++++++++-------- example/thirdparty/fansi/build.mill | 2 +- .../migrating/init/src/MillInitMavenTests.scala | 2 +- 12 files changed, 34 insertions(+), 34 deletions(-) diff --git a/example/extending/plugins/1-writing-mill-plugins/build.mill b/example/extending/plugins/1-writing-mill-plugins/build.mill index 34b8fd7e9cd1..0d1a9afaa7af 100644 --- a/example/extending/plugins/1-writing-mill-plugins/build.mill +++ b/example/extending/plugins/1-writing-mill-plugins/build.mill @@ -108,7 +108,7 @@ compiling 1 Scala source... > sed -i.bak 's/0.0.1/0.0.2/g' build.mill > ./mill myplugin.publishLocal -Publishing Artifact(com.lihaoyi,myplugin_millSNAPSHOT_3,0.0.2) to ivy repo... +Publishing com.lihaoyi:myplugin_millSNAPSHOT_3:0.0.2 to ivy repo... */ // Mill plugins are JVM libraries like any other library written in Java or Scala. Thus they diff --git a/example/javalib/basic/6-realistic/build.mill b/example/javalib/basic/6-realistic/build.mill index f23038a5b082..de9c5242cf22 100644 --- a/example/javalib/basic/6-realistic/build.mill +++ b/example/javalib/basic/6-realistic/build.mill @@ -95,9 +95,9 @@ Qux.value: 31337 ...foo.FooTests.test ... > ./mill __.publishLocal -Publishing Artifact(com.lihaoyi,foo,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,bar,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,qux,0.0.1) to ivy repo... +Publishing com.lihaoyi:foo:0.0.1 to ivy repo... +Publishing com.lihaoyi:bar:0.0.1 to ivy repo... +Publishing com.lihaoyi:qux:0.0.1 to ivy repo... ... > ./mill show foo.assembly # mac/linux diff --git a/example/javalib/publishing/2-publish-module/build.mill b/example/javalib/publishing/2-publish-module/build.mill index 7498dca1cf5d..0012a5c57f87 100644 --- a/example/javalib/publishing/2-publish-module/build.mill +++ b/example/javalib/publishing/2-publish-module/build.mill @@ -24,7 +24,7 @@ object foo extends JavaModule, PublishModule { /** Usage > ./mill foo.publishLocal -Publishing Artifact(com.lihaoyi,foo,0.0.1) to ivy repo... +Publishing com.lihaoyi:foo:0.0.1 to ivy repo... */ diff --git a/example/javalib/publishing/3-revapi/build.mill b/example/javalib/publishing/3-revapi/build.mill index d5abf33f78b6..e910b11d3336 100644 --- a/example/javalib/publishing/3-revapi/build.mill +++ b/example/javalib/publishing/3-revapi/build.mill @@ -31,7 +31,7 @@ object bar extends JavaModule, RevapiModule { /** Usage > ./mill bar.publishLocal -Publishing Artifact(com.lihaoyi,bar,0.0.1) to ivy repo... +Publishing com.lihaoyi:bar:0.0.1 to ivy repo... > cp dev/src/Visibility.java bar/src/Visibility.java diff --git a/example/kotlinlib/basic/6-realistic/build.mill b/example/kotlinlib/basic/6-realistic/build.mill index 7cc8bd8d94a9..c298c187d191 100644 --- a/example/kotlinlib/basic/6-realistic/build.mill +++ b/example/kotlinlib/basic/6-realistic/build.mill @@ -103,9 +103,9 @@ Qux.value: 31337 ...foo.FooTests hello ... > ./mill __.publishLocal -Publishing Artifact(com.lihaoyi,foo,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,bar,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,qux,0.0.1) to ivy repo... +Publishing com.lihaoyi:foo:0.0.1 to ivy repo... +Publishing com.lihaoyi:bar:0.0.1 to ivy repo... +Publishing com.lihaoyi:qux:0.0.1 to ivy repo... ... > ./mill show foo.assembly # mac/linux diff --git a/example/kotlinlib/publishing/2-publish-module/build.mill b/example/kotlinlib/publishing/2-publish-module/build.mill index 67a6285a390c..275798213e71 100644 --- a/example/kotlinlib/publishing/2-publish-module/build.mill +++ b/example/kotlinlib/publishing/2-publish-module/build.mill @@ -27,7 +27,7 @@ object foo extends KotlinModule, PublishModule { /** Usage > ./mill foo.publishLocal -Publishing Artifact(com.lihaoyi,foo,0.0.1) to ivy repo... +Publishing com.lihaoyi:foo:0.0.1 to ivy repo... */ diff --git a/example/scalalib/basic/6-realistic/build.mill b/example/scalalib/basic/6-realistic/build.mill index 04262a96ded2..2bd11d5b9035 100644 --- a/example/scalalib/basic/6-realistic/build.mill +++ b/example/scalalib/basic/6-realistic/build.mill @@ -119,11 +119,11 @@ Qux.value: 31337 + foo.FooTests.test ...

hello

> ./mill __.publishLocal -Publishing Artifact(com.lihaoyi,foo_2.13,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,bar_2.13,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,foo_3,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,bar_3,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,qux,0.0.1) to ivy repo... +Publishing com.lihaoyifoo_2.13:0.0.1 to ivy repo... +Publishing com.lihaoyibar_2.13:0.0.1 to ivy repo... +Publishing com.lihaoyifoo_3:0.0.1 to ivy repo... +Publishing com.lihaoyibar_3:0.0.1 to ivy repo... +Publishing com.lihaoyiqux:0.0.1 to ivy repo... > ./mill show foo[2.13.16].assembly # mac/linux ".../out/foo/2.13.16/assembly.dest/out.jar" diff --git a/example/scalalib/publishing/2-publish-module/build.mill b/example/scalalib/publishing/2-publish-module/build.mill index 4c1065611135..46f2de7f5859 100644 --- a/example/scalalib/publishing/2-publish-module/build.mill +++ b/example/scalalib/publishing/2-publish-module/build.mill @@ -27,7 +27,7 @@ object foo extends ScalaModule, PublishModule { > ./mill foo.publishLocal # publish specific modules > ./mill __.publishLocal # publish every eligible module -Publishing Artifact(com.lihaoyi,foo_3,0.0.1) to ivy repo... +Publishing com.lihaoyi:foo_3:0.0.1 to ivy repo... */ diff --git a/example/scalalib/web/7-cross-version-platform-publishing/build.mill b/example/scalalib/web/7-cross-version-platform-publishing/build.mill index 50b6ccd116cb..36c478f8f14c 100644 --- a/example/scalalib/web/7-cross-version-platform-publishing/build.mill +++ b/example/scalalib/web/7-cross-version-platform-publishing/build.mill @@ -96,13 +96,13 @@ Qux.main: Set(

i

,

cow

,

me

) + qux.QuxTests.parseJsonGetKeys ... Set(i, cow, me) > ./mill __.publishLocal -Publishing Artifact(com.lihaoyi,foo-bar_sjs1_2.13,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,foo-bar_2.13,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,foo-qux_sjs1_2.13,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,foo-qux_2.13,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,foo-bar_sjs1_3,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,foo-bar_3,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,foo-qux_sjs1_3,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,foo-qux_3,0.0.1) to ivy repo... +Publishing com.lihaoyi:foo-bar_sjs1_2.13:0.0.1 to ivy repo... +Publishing com.lihaoyi:foo-bar_2.13:0.0.1 to ivy repo... +Publishing com.lihaoyi:foo-qux_sjs1_2.13:0.0.1 to ivy repo... +Publishing com.lihaoyi:foo-qux_2.13:0.0.1 to ivy repo... +Publishing com.lihaoyi:foo-bar_sjs1_3:0.0.1 to ivy repo... +Publishing com.lihaoyi:foo-bar_3:0.0.1 to ivy repo... +Publishing com.lihaoyi:foo-qux_sjs1_3:0.0.1 to ivy repo... +Publishing com.lihaoyi:foo-qux_3:0.0.1 to ivy repo... */ diff --git a/example/scalalib/web/8-cross-platform-version-publishing/build.mill b/example/scalalib/web/8-cross-platform-version-publishing/build.mill index 17d09a57579f..55df9c2853cd 100644 --- a/example/scalalib/web/8-cross-platform-version-publishing/build.mill +++ b/example/scalalib/web/8-cross-platform-version-publishing/build.mill @@ -100,13 +100,13 @@ Qux.main: Set(

i

,

cow

,

me

) > ./mill __.publishLocal ... -Publishing Artifact(com.lihaoyi,bar_sjs1_2.13,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,bar_2.13,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,qux_sjs1_2.13,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,qux_2.13,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,bar_sjs1_3,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,bar_3,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,qux_sjs1_3,0.0.1) to ivy repo... -Publishing Artifact(com.lihaoyi,qux_3,0.0.1) to ivy repo... +Publishing com.lihaoyi:bar_sjs1_2.13:0.0.1 to ivy repo... +Publishing com.lihaoyi:bar_2.13:0.0.1 to ivy repo... +Publishing com.lihaoyi:qux_sjs1_2.13:0.0.1 to ivy repo... +Publishing com.lihaoyi:qux_2.13:0.0.1 to ivy repo... +Publishing com.lihaoyi:bar_sjs1_3:0.0.1 to ivy repo... +Publishing com.lihaoyi:bar_3:0.0.1 to ivy repo... +Publishing com.lihaoyi:qux_sjs1_3:0.0.1 to ivy repo... +Publishing com.lihaoyi:qux_3:0.0.1 to ivy repo... */ diff --git a/example/thirdparty/fansi/build.mill b/example/thirdparty/fansi/build.mill index 1f2bad0b0c90..b05fa5cb5ec7 100644 --- a/example/thirdparty/fansi/build.mill +++ b/example/thirdparty/fansi/build.mill @@ -89,7 +89,7 @@ Starting process: node ... > ./mill fansi.native[3.1.3].publishLocal -Publishing Artifact(com.lihaoyi,fansi_native0.4_3,1.3.3.7) to ivy repo... +Publishing com.lihaoyi:fansi_native0.4_3:1.3.3.7 to ivy repo... ... */ diff --git a/integration/migrating/init/src/MillInitMavenTests.scala b/integration/migrating/init/src/MillInitMavenTests.scala index c74d995cc836..ead1939977b3 100644 --- a/integration/migrating/init/src/MillInitMavenTests.scala +++ b/integration/migrating/init/src/MillInitMavenTests.scala @@ -45,7 +45,7 @@ object MillInitMavenJansiTests extends BuildGenTestSuite { val ivy2Repo = tester.baseWorkspacePath / "ivy2Local" val publishLocalRes = eval(("publishLocal", "--localIvyRepo", ivy2Repo.toString)) assert( - publishLocalRes.err.contains("Publishing Artifact(org.fusesource.jansi,jansi,2.4.1)"), + publishLocalRes.err.contains("Publishing org.fusesource.jansi:jansi:2.4.1"), publishLocalRes.isSuccess ) }