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.

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.7.17 #10

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.7.17
100f74096258a21b1fb4559b990ff5dfb23eaef0
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.14"
version = "3.7.17"
runner.dialect = scala213

project.git = true
Expand Down
3 changes: 1 addition & 2 deletions itest/src/do-not-fail-on-conflicts/build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ object `do-not-fail-on-conflicts` extends RootModule with ScalaModule with Missi

override def missinglinkFailOnConflicts = false


}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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])
}

}
3 changes: 1 addition & 2 deletions itest/src/exclude-problematic-dependency/build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ object `exclude-problematic-dependency` extends RootModule with ScalaModule with

override def missinglinkExcludedDependencies = Seq(DependencyFilter(organization = "com.google.guava"))


}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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])
}

}
2 changes: 1 addition & 1 deletion itest/src/has-problematic-dependency/build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -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")

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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])
}

}
2 changes: 1 addition & 1 deletion itest/src/ignore-destination-package/build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ object `ignore-destination-package` extends RootModule with ScalaModule with Mis
IgnoredPackage("whatever")
)

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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])
}

}
2 changes: 1 addition & 1 deletion itest/src/ignore-source-package/build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ object `ignore-source-package` extends RootModule with ScalaModule with Missingl
IgnoredPackage("whatever")
)

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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])
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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])
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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])
}

}
3 changes: 1 addition & 2 deletions itest/src/target-destination-package/build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@ object `target-destination-package` extends RootModule with ScalaModule with Mis
// Will ignore Guava conflict
override def missinglinkTargetDestinationPackages = Seq(TargetedPackage("test"))


}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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])
}

}
2 changes: 1 addition & 1 deletion itest/src/target-source-package/build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ object `target-source-package` extends RootModule with ScalaModule with Missingl

override def missinglinkTargetSourcePackages = Seq(TargetedPackage("test"))

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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])
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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])
}

}
Original file line number Diff line number Diff line change
@@ -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()
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}

Expand Down