Skip to content

Commit 8c6d4dd

Browse files
committed
Merge remote-tracking branch 'origin/main' into tr-poc-args-type
2 parents 2e31c44 + 892d399 commit 8c6d4dd

File tree

167 files changed

+55788
-300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+55788
-300
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ktlint_standard_no-wildcard-imports = disabled
2121
[example/kotlinlib/linting/**/*]
2222
ktlint = disabled
2323

24-
[example/kotlinlib/config/4-linting/**/*]
24+
[example/kotlinlib/declarative/4-linting/**/*]
2525
ktlint = disabled
2626

2727
[kotlinlib/test/resources/contrib/ktfmt/**/*]

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ project {
2626
"glob:**/mill/out/**",
2727
# don't try to format files that are purposefully malformed / misformatted
2828
"glob:**/example/scalalib/linting/1-scalafmt/src/Foo.scala",
29-
"glob:**/example/scalalib/config/4-linting/src/Foo.scala",
29+
"glob:**/example/scalalib/declarative/4-linting/src/Foo.scala",
3030
"glob:**/example/**/*-spotless*/**",
3131
"glob:**/javalib/test/resources/checkstyle/**",
3232
"glob:**/init/test/resources/giter8/hello.g8/src/main/g8/build.mill",

changelog.adoc

Lines changed: 4 additions & 4 deletions
File renamed without changes.

example/javalib/config/1-common-config/build.mill.yaml renamed to example/javalib/declarative/1-common-config/build.mill.yaml

File renamed without changes.

example/javalib/config/1-common-config/custom-resources/MyOtherResource.txt renamed to example/javalib/declarative/1-common-config/custom-resources/MyOtherResource.txt

File renamed without changes.

example/javalib/config/1-common-config/custom-src/Foo2.java renamed to example/javalib/declarative/1-common-config/custom-src/Foo2.java

File renamed without changes.

example/javalib/config/1-common-config/resources/MyResource.txt renamed to example/javalib/declarative/1-common-config/resources/MyResource.txt

File renamed without changes.

example/javalib/config/1-common-config/src/foo/Foo.java renamed to example/javalib/declarative/1-common-config/src/foo/Foo.java

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)