From 925820df32177f826c15609209c9c74539e7ae2d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 14 Jan 2024 17:53:10 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.7.17 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 0bb1e45..d87347a 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.14" +version = "3.7.17" runner.dialect = scala213 project.git = true From 100f74096258a21b1fb4559b990ff5dfb23eaef0 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 14 Jan 2024 17:53:19 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.7.17 Executed command: scalafmt --non-interactive --- itest/src/do-not-fail-on-conflicts/build.sc | 3 +-- .../src/test/ProblematicDependency.scala | 8 ++++---- itest/src/exclude-problematic-dependency/build.sc | 3 +-- .../src/test/UsesProblematicDependency.scala | 8 ++++---- itest/src/has-problematic-dependency/build.sc | 2 +- .../src/test/ProblematicDependency.scala | 8 ++++---- itest/src/ignore-destination-package/build.sc | 2 +- .../src/test/ProblematicDependency.scala | 8 ++++---- itest/src/ignore-source-package/build.sc | 2 +- .../src/test/ProblematicDependency.scala | 8 ++++---- .../src/test/ProblematicDependency.scala | 8 ++++---- .../src/test/ProblematicDependency.scala | 8 ++++---- itest/src/target-destination-package/build.sc | 3 +-- .../src/test/ProblematicDependency.scala | 8 ++++---- itest/src/target-source-package/build.sc | 2 +- .../src/test/ProblematicDependency.scala | 8 ++++---- .../src/test/ProblematicDependency.scala | 8 ++++---- .../src/test/UsesProblematicDependency.scala | 8 ++++---- .../hoangmaihuy/missinglink/MissinglinkCheckModule.scala | 2 +- .../src/io/github/hoangmaihuy/missinglink/package.scala | 1 - 20 files changed, 52 insertions(+), 56 deletions(-) diff --git a/itest/src/do-not-fail-on-conflicts/build.sc b/itest/src/do-not-fail-on-conflicts/build.sc index 6eb1ee0..d4b0ce6 100644 --- a/itest/src/do-not-fail-on-conflicts/build.sc +++ b/itest/src/do-not-fail-on-conflicts/build.sc @@ -13,5 +13,4 @@ object `do-not-fail-on-conflicts` extends RootModule with ScalaModule with Missi override def missinglinkFailOnConflicts = false - -} \ No newline at end of file +} diff --git a/itest/src/do-not-fail-on-conflicts/src/test/ProblematicDependency.scala b/itest/src/do-not-fail-on-conflicts/src/test/ProblematicDependency.scala index 164c0fa..ca5be53 100644 --- a/itest/src/do-not-fail-on-conflicts/src/test/ProblematicDependency.scala +++ b/itest/src/do-not-fail-on-conflicts/src/test/ProblematicDependency.scala @@ -2,13 +2,13 @@ package test import com.google.common.base.Enums -/** - * Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this - * method while overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. - */ +/** Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this method while + * overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. + */ object ProblematicDependency { def reliesOnRemovedMethod(): AnyRef = { Enums.valueOfFunction(classOf[Foo]) } + } diff --git a/itest/src/exclude-problematic-dependency/build.sc b/itest/src/exclude-problematic-dependency/build.sc index 8682391..868509c 100644 --- a/itest/src/exclude-problematic-dependency/build.sc +++ b/itest/src/exclude-problematic-dependency/build.sc @@ -13,5 +13,4 @@ object `exclude-problematic-dependency` extends RootModule with ScalaModule with override def missinglinkExcludedDependencies = Seq(DependencyFilter(organization = "com.google.guava")) - -} \ No newline at end of file +} diff --git a/itest/src/exclude-problematic-dependency/src/test/UsesProblematicDependency.scala b/itest/src/exclude-problematic-dependency/src/test/UsesProblematicDependency.scala index 164c0fa..ca5be53 100644 --- a/itest/src/exclude-problematic-dependency/src/test/UsesProblematicDependency.scala +++ b/itest/src/exclude-problematic-dependency/src/test/UsesProblematicDependency.scala @@ -2,13 +2,13 @@ package test import com.google.common.base.Enums -/** - * Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this - * method while overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. - */ +/** Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this method while + * overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. + */ object ProblematicDependency { def reliesOnRemovedMethod(): AnyRef = { Enums.valueOfFunction(classOf[Foo]) } + } diff --git a/itest/src/has-problematic-dependency/build.sc b/itest/src/has-problematic-dependency/build.sc index 7941164..98dbea1 100644 --- a/itest/src/has-problematic-dependency/build.sc +++ b/itest/src/has-problematic-dependency/build.sc @@ -11,4 +11,4 @@ object `has-problematic-dependency` extends RootModule with ScalaModule with Mis override def ivyDeps = super.ivyDeps() ++ Seq(ivy"com.google.guava:guava:14.0") -} \ No newline at end of file +} diff --git a/itest/src/has-problematic-dependency/src/test/ProblematicDependency.scala b/itest/src/has-problematic-dependency/src/test/ProblematicDependency.scala index 164c0fa..ca5be53 100644 --- a/itest/src/has-problematic-dependency/src/test/ProblematicDependency.scala +++ b/itest/src/has-problematic-dependency/src/test/ProblematicDependency.scala @@ -2,13 +2,13 @@ package test import com.google.common.base.Enums -/** - * Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this - * method while overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. - */ +/** Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this method while + * overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. + */ object ProblematicDependency { def reliesOnRemovedMethod(): AnyRef = { Enums.valueOfFunction(classOf[Foo]) } + } diff --git a/itest/src/ignore-destination-package/build.sc b/itest/src/ignore-destination-package/build.sc index 9d2f04d..30628b5 100644 --- a/itest/src/ignore-destination-package/build.sc +++ b/itest/src/ignore-destination-package/build.sc @@ -16,4 +16,4 @@ object `ignore-destination-package` extends RootModule with ScalaModule with Mis IgnoredPackage("whatever") ) -} \ No newline at end of file +} diff --git a/itest/src/ignore-destination-package/src/test/ProblematicDependency.scala b/itest/src/ignore-destination-package/src/test/ProblematicDependency.scala index 164c0fa..ca5be53 100644 --- a/itest/src/ignore-destination-package/src/test/ProblematicDependency.scala +++ b/itest/src/ignore-destination-package/src/test/ProblematicDependency.scala @@ -2,13 +2,13 @@ package test import com.google.common.base.Enums -/** - * Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this - * method while overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. - */ +/** Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this method while + * overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. + */ object ProblematicDependency { def reliesOnRemovedMethod(): AnyRef = { Enums.valueOfFunction(classOf[Foo]) } + } diff --git a/itest/src/ignore-source-package/build.sc b/itest/src/ignore-source-package/build.sc index 7171d4d..f30f7a7 100644 --- a/itest/src/ignore-source-package/build.sc +++ b/itest/src/ignore-source-package/build.sc @@ -16,4 +16,4 @@ object `ignore-source-package` extends RootModule with ScalaModule with Missingl IgnoredPackage("whatever") ) -} \ No newline at end of file +} diff --git a/itest/src/ignore-source-package/src/test/ProblematicDependency.scala b/itest/src/ignore-source-package/src/test/ProblematicDependency.scala index 164c0fa..ca5be53 100644 --- a/itest/src/ignore-source-package/src/test/ProblematicDependency.scala +++ b/itest/src/ignore-source-package/src/test/ProblematicDependency.scala @@ -2,13 +2,13 @@ package test import com.google.common.base.Enums -/** - * Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this - * method while overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. - */ +/** Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this method while + * overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. + */ object ProblematicDependency { def reliesOnRemovedMethod(): AnyRef = { Enums.valueOfFunction(classOf[Foo]) } + } diff --git a/itest/src/ignores-unused-dependency/has-problematic-dependency/src/test/ProblematicDependency.scala b/itest/src/ignores-unused-dependency/has-problematic-dependency/src/test/ProblematicDependency.scala index 164c0fa..ca5be53 100644 --- a/itest/src/ignores-unused-dependency/has-problematic-dependency/src/test/ProblematicDependency.scala +++ b/itest/src/ignores-unused-dependency/has-problematic-dependency/src/test/ProblematicDependency.scala @@ -2,13 +2,13 @@ package test import com.google.common.base.Enums -/** - * Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this - * method while overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. - */ +/** Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this method while + * overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. + */ object ProblematicDependency { def reliesOnRemovedMethod(): AnyRef = { Enums.valueOfFunction(classOf[Foo]) } + } diff --git a/itest/src/scans-dependencies/has-problematic-dependency/src/test/ProblematicDependency.scala b/itest/src/scans-dependencies/has-problematic-dependency/src/test/ProblematicDependency.scala index 164c0fa..ca5be53 100644 --- a/itest/src/scans-dependencies/has-problematic-dependency/src/test/ProblematicDependency.scala +++ b/itest/src/scans-dependencies/has-problematic-dependency/src/test/ProblematicDependency.scala @@ -2,13 +2,13 @@ package test import com.google.common.base.Enums -/** - * Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this - * method while overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. - */ +/** Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this method while + * overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. + */ object ProblematicDependency { def reliesOnRemovedMethod(): AnyRef = { Enums.valueOfFunction(classOf[Foo]) } + } diff --git a/itest/src/target-destination-package/build.sc b/itest/src/target-destination-package/build.sc index f20704c..1656155 100644 --- a/itest/src/target-destination-package/build.sc +++ b/itest/src/target-destination-package/build.sc @@ -14,5 +14,4 @@ object `target-destination-package` extends RootModule with ScalaModule with Mis // Will ignore Guava conflict override def missinglinkTargetDestinationPackages = Seq(TargetedPackage("test")) - -} \ No newline at end of file +} diff --git a/itest/src/target-destination-package/src/test/ProblematicDependency.scala b/itest/src/target-destination-package/src/test/ProblematicDependency.scala index 164c0fa..ca5be53 100644 --- a/itest/src/target-destination-package/src/test/ProblematicDependency.scala +++ b/itest/src/target-destination-package/src/test/ProblematicDependency.scala @@ -2,13 +2,13 @@ package test import com.google.common.base.Enums -/** - * Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this - * method while overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. - */ +/** Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this method while + * overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. + */ object ProblematicDependency { def reliesOnRemovedMethod(): AnyRef = { Enums.valueOfFunction(classOf[Foo]) } + } diff --git a/itest/src/target-source-package/build.sc b/itest/src/target-source-package/build.sc index 910b23a..d079be6 100644 --- a/itest/src/target-source-package/build.sc +++ b/itest/src/target-source-package/build.sc @@ -13,4 +13,4 @@ object `target-source-package` extends RootModule with ScalaModule with Missingl override def missinglinkTargetSourcePackages = Seq(TargetedPackage("test")) -} \ No newline at end of file +} diff --git a/itest/src/target-source-package/src/test/ProblematicDependency.scala b/itest/src/target-source-package/src/test/ProblematicDependency.scala index 164c0fa..ca5be53 100644 --- a/itest/src/target-source-package/src/test/ProblematicDependency.scala +++ b/itest/src/target-source-package/src/test/ProblematicDependency.scala @@ -2,13 +2,13 @@ package test import com.google.common.base.Enums -/** - * Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this - * method while overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. - */ +/** Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this method while + * overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. + */ object ProblematicDependency { def reliesOnRemovedMethod(): AnyRef = { Enums.valueOfFunction(classOf[Foo]) } + } diff --git a/itest/src/uses-problematic-dependency/has-problematic-dependency/src/test/ProblematicDependency.scala b/itest/src/uses-problematic-dependency/has-problematic-dependency/src/test/ProblematicDependency.scala index 164c0fa..ca5be53 100644 --- a/itest/src/uses-problematic-dependency/has-problematic-dependency/src/test/ProblematicDependency.scala +++ b/itest/src/uses-problematic-dependency/has-problematic-dependency/src/test/ProblematicDependency.scala @@ -2,13 +2,13 @@ package test import com.google.common.base.Enums -/** - * Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this - * method while overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. - */ +/** Calls a method in the Guava Enums class which was removed in guava 18. If a project calls this method while + * overriding Guava to >= 18, it will cause a NoSuchMethodError at runtime. + */ object ProblematicDependency { def reliesOnRemovedMethod(): AnyRef = { Enums.valueOfFunction(classOf[Foo]) } + } diff --git a/itest/src/uses-problematic-dependency/src/test/UsesProblematicDependency.scala b/itest/src/uses-problematic-dependency/src/test/UsesProblematicDependency.scala index 2b4b607..dc2f7fc 100644 --- a/itest/src/uses-problematic-dependency/src/test/UsesProblematicDependency.scala +++ b/itest/src/uses-problematic-dependency/src/test/UsesProblematicDependency.scala @@ -1,11 +1,11 @@ package test -/** - * Invokes a method from [[test.ProblematicDependency]] which will blow up if - * Guava >= 18 is used. - */ +/** Invokes a method from [[test.ProblematicDependency]] which will blow up if Guava >= 18 is used. + */ object UsesProblematicDependency { + def callsClassThatReliesOnDeletedGuavaMethod(): AnyRef = { ProblematicDependency.reliesOnRemovedMethod() } + } diff --git a/mill-missinglink/src/io/github/hoangmaihuy/missinglink/MissinglinkCheckModule.scala b/mill-missinglink/src/io/github/hoangmaihuy/missinglink/MissinglinkCheckModule.scala index cf2c77a..04a055f 100644 --- a/mill-missinglink/src/io/github/hoangmaihuy/missinglink/MissinglinkCheckModule.scala +++ b/mill-missinglink/src/io/github/hoangmaihuy/missinglink/MissinglinkCheckModule.scala @@ -31,7 +31,7 @@ trait MissinglinkCheckModule extends JavaModule { /** Optional list of packages to ignore conflicts where the destination/called-side of the conflict is in one of the * specified packages. */ - def missinglinkIgnoreDestinationPackages: T[Seq[IgnoredPackage]] = T { Seq.empty[IgnoredPackage] } + def missinglinkIgnoreDestinationPackages: T[Seq[IgnoredPackage]] = T { Seq.empty[IgnoredPackage] } /** Optional list of source packages to specifically target conflicts in. Cannot be used with * missinglinkIgnoreDestinationPackages. diff --git a/mill-missinglink/src/io/github/hoangmaihuy/missinglink/package.scala b/mill-missinglink/src/io/github/hoangmaihuy/missinglink/package.scala index e4f6b19..42763c1 100644 --- a/mill-missinglink/src/io/github/hoangmaihuy/missinglink/package.scala +++ b/mill-missinglink/src/io/github/hoangmaihuy/missinglink/package.scala @@ -15,7 +15,6 @@ package object missinglink { private[missinglink] implicit object IgnoredPackages extends PackageFilters[IgnoredPackage] { - def apply(name: String)(filters: Seq[IgnoredPackage]): Boolean = filters.forall(_.apply(name)) } From 062934ced6947d01a72f9ee4c36462d3dcdbd537 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 14 Jan 2024 17:53:19 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.7.17' 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..3804d0e --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.7.17 +100f74096258a21b1fb4559b990ff5dfb23eaef0