From 57b13a50b31fcc5bab14948cf429dde581b601d9 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 1 Feb 2026 14:15:13 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.10.6 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 51e5258..4be057b 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.10.3 +version = 3.10.6 runner.dialect = scala3 maxColumn = 120 align.preset = more From 407ebdb3e8789f834dc1734d765f9ebaf3a3ece2 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 1 Feb 2026 14:15:21 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.10.6 Executed command: scalafmt --non-interactive --- mill-git/test/resources/custom/build.mill | 73 ++++++++-------------- mill-git/test/resources/docker/build.mill | 10 ++- mill-git/test/resources/publish/build.mill | 7 +-- 3 files changed, 32 insertions(+), 58 deletions(-) diff --git a/mill-git/test/resources/custom/build.mill b/mill-git/test/resources/custom/build.mill index 0d04e07..24a0893 100644 --- a/mill-git/test/resources/custom/build.mill +++ b/mill-git/test/resources/custom/build.mill @@ -2,56 +2,33 @@ //| mvnDeps: //| - com.goyeau::mill-git::0.3.0 import com.goyeau.mill.git.GitVersionModule -import mill._ +import mill.* import mill.scalalib.JavaModule -import os._ +import os.* -object project extends JavaModule { +object project extends JavaModule: def jobVersion = Task(GitVersionModule.version()()) -} /** Usage - -> git init -... - -// Uncommitted changes -> ./mill show project.jobVersion -"..." - -// Commit without tag -> git add --all -> git commit -m "Some commit" - -> ./mill show project.jobVersion -"..." - -// Uncommitted changes after commit without tag -> echo "Some change!" > some-file -> ./mill show project.jobVersion -"..." - -// Head tagged -> git add --all -> git commit -m "Some commit 2" -> git tag -a v1.0.0 -m "v1.0.0" -> ./mill show project.jobVersion -"1.0.0" - -// Uncommitted changes after tag -> echo "Some change 2!" > some-file -> ./mill show project.jobVersion -"1.0.0-..." - -// Commit after tag -> git add --all -> git commit -m "Some commit 3" -> ./mill show project.jobVersion -"1.0.0-1-..." - -// Uncommitted changes after tag and after commit -> echo "Some change 3!" > some-file -> ./mill show project.jobVersion -"1.0.0-2-..." - -*/ + * + * > git init ... + * + * // Uncommitted changes > ./mill show project.jobVersion "..." + * + * // Commit without tag > git add --all > git commit -m "Some commit" + * + * > ./mill show project.jobVersion "..." + * + * // Uncommitted changes after commit without tag > echo "Some change!" > some-file > ./mill show project.jobVersion + * "..." + * + * // Head tagged > git add --all > git commit -m "Some commit 2" > git tag -a v1.0.0 -m "v1.0.0" > ./mill show + * project.jobVersion "1.0.0" + * + * // Uncommitted changes after tag > echo "Some change 2!" > some-file > ./mill show project.jobVersion "1.0.0-..." + * + * // Commit after tag > git add --all > git commit -m "Some commit 3" > ./mill show project.jobVersion "1.0.0-1-..." + * + * // Uncommitted changes after tag and after commit > echo "Some change 3!" > some-file > ./mill show + * project.jobVersion "1.0.0-2-..." + */ diff --git a/mill-git/test/resources/docker/build.mill b/mill-git/test/resources/docker/build.mill index 010efc7..73a9372 100644 --- a/mill-git/test/resources/docker/build.mill +++ b/mill-git/test/resources/docker/build.mill @@ -3,13 +3,11 @@ //| - com.goyeau::mill-git::0.3.0 //| - com.lihaoyi::mill-contrib-docker:$MILL_VERSION import com.goyeau.mill.git.GitTaggedDockerModule -import mill._ +import mill.* import mill.contrib.docker.DockerModule import mill.scalalib.JavaModule -import os._ +import os.* -object project extends JavaModule with GitTaggedDockerModule { - object docker extends DockerConfig with GitTaggedDocker { +object project extends JavaModule with GitTaggedDockerModule: + object docker extends DockerConfig with GitTaggedDocker: override def tagLatest = true // Default is false - } -} diff --git a/mill-git/test/resources/publish/build.mill b/mill-git/test/resources/publish/build.mill index 0b3fd86..7807ee3 100644 --- a/mill-git/test/resources/publish/build.mill +++ b/mill-git/test/resources/publish/build.mill @@ -2,12 +2,12 @@ //| mvnDeps: //| - com.goyeau::mill-git::0.3.0 import com.goyeau.mill.git.GitVersionedPublishModule -import mill._ +import mill.* import mill.scalalib.JavaModule import mill.scalalib.publish.{Developer, License, PomSettings, VersionControl} -import os._ +import os.* -object project extends JavaModule with GitVersionedPublishModule { +object project extends JavaModule with GitVersionedPublishModule: override def pomSettings = PomSettings( description = "JVM Project", organization = "com.goyeau", @@ -16,4 +16,3 @@ object project extends JavaModule with GitVersionedPublishModule { versionControl = VersionControl.github("joan38", "mill-git"), developers = Seq(Developer("joan38", "Joan Goyeau", "https://github.com/joan38")) ) -} From c9ab35834d7f7ad34ce4e2501fc5e9fbeac8b182 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 1 Feb 2026 14:15:22 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.10.6' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..9cc915a --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.10.6 +407ebdb3e8789f834dc1734d765f9ebaf3a3ece2