Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scalafmt-core to 3.8.4 #100

Closed
wants to merge 3 commits into from
Closed

Update scalafmt-core to 3.8.4 #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae75a4f
Update scalafmt-core to 3.8.4
scala-steward Jan 14, 2025
dab03f7
Reformat with scalafmt 3.8.4
scala-steward Jan 14, 2025
fc84775
Add 'Reformat with scalafmt 3.8.4' to .git-blame-ignore-revs
scala-steward Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.8.4
dab03f7425954a2a7dca1fc14cf1939c9f58a5fb
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.3
version = 3.8.4
runner.dialect = scala213source3
project.git = true
maxColumn = 120
Expand Down
66 changes: 22 additions & 44 deletions mill-git/test/resources/custom/build.mill
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,47 +9,25 @@ object project extends JavaModule {
}

/** 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-..."
*/
30 changes: 15 additions & 15 deletions mill-git/test/src/com/goyeau/mill/git/DockerProjectIntegrationTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ class DockerProjectIntegrationTests extends FunSuite {
assert(result.isSuccess, result.err)
assert(
result.out.matches("""\[
| "project:[\da-f]{7}",
| "project:latest"
|\]""".stripMargin),
| "project:[\da-f]{7}",
| "project:latest"
|\]""".stripMargin),
s"${result.out} is not an array with 7 chars hash and latest tags"
)
}
Expand Down Expand Up @@ -47,9 +47,9 @@ class DockerProjectIntegrationTests extends FunSuite {
assert(result.isSuccess, result.err)
assert(
result.out.matches("""\[
| "project:[\da-f]{7}",
| "project:latest"
|\]""".stripMargin),
| "project:[\da-f]{7}",
| "project:latest"
|\]""".stripMargin),
s"${result.out} is not a 7 chars hash"
)
}
Expand Down Expand Up @@ -84,9 +84,9 @@ class DockerProjectIntegrationTests extends FunSuite {
assert(result.isSuccess, result.err)
assert(
result.out.matches("""\[
| "project:1\.0\.0-1-[\da-f]{7}",
| "project:latest"
|\]""".stripMargin),
| "project:1\.0\.0-1-[\da-f]{7}",
| "project:latest"
|\]""".stripMargin),
s"${result.out} is not a version and distance from it, followed by a 7 chars hash"
)
}
Expand All @@ -107,9 +107,9 @@ class DockerProjectIntegrationTests extends FunSuite {
assertEquals(
result.out,
s"""[
| "project:1.0.0-1-$hash",
| "project:latest"
|]""".stripMargin
| "project:1.0.0-1-$hash",
| "project:latest"
|]""".stripMargin
)
}

Expand All @@ -128,9 +128,9 @@ class DockerProjectIntegrationTests extends FunSuite {
assert(result.isSuccess, result.err)
assert(
result.out.matches("""\[
| "project:1\.0\.0-2-[\da-f]{7}",
| "project:latest"
|\]""".stripMargin),
| "project:1\.0\.0-2-[\da-f]{7}",
| "project:latest"
|\]""".stripMargin),
s"${result.out} is not a version and distance from it, followed by a 7 chars hash"
)
}
Expand Down
Loading