Skip to content

Commit 9b8aa53

Browse files
Patch updates (#478)
* scalafmt-core 3.9.7 (was 3.9.6) * Reformat with scalafmt 3.9.7 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.9.7' to .git-blame-ignore-revs * junit-jupiter 1.21.1 (was 1.21.0)
1 parent 211a0a5 commit 9b8aa53

File tree

8 files changed

+12
-9
lines changed

8 files changed

+12
-9
lines changed

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
# Scala Steward: Reformat with sbt-java-formatter 0.8.0
22
29e7806bcfe0a8e2572239ffc0012592666580df
3+
4+
# Scala Steward: Reformat with scalafmt 3.9.7
5+
140dadce384d0777087a05b9b779a0995eedbfaf

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi
1010
rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ]
1111
spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy }
1212
trailingCommas = preserve
13-
version = 3.9.6
13+
version = 3.9.7

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ lazy val mockServer = project
6666
)
6767
.settings(
6868
CXF / version := Versions.CXF,
69-
cxfWSDLs := Seq(
69+
cxfWSDLs := Seq(
7070
Wsdl(
7171
"primitives",
7272
(Compile / resourceDirectory).value / "wsdl" / "primitives.wsdl",
@@ -98,7 +98,7 @@ lazy val testJava = project
9898
testOptions += Tests.Argument(jupiterTestFramework, "-q", "-v")
9999
)
100100
.settings(
101-
CXF / version := Versions.CXF,
101+
CXF / version := Versions.CXF,
102102
CXF / managedClasspath := {
103103
(CXF / managedClasspath).value ++: (plugin / Compile / exportedProductJars).value
104104
},
@@ -128,7 +128,7 @@ lazy val testScala = project
128128
Dependencies.`test-scala`
129129
)
130130
.settings(
131-
CXF / version := Versions.CXF,
131+
CXF / version := Versions.CXF,
132132
CXF / managedClasspath := {
133133
(CXF / managedClasspath).value ++: (plugin / Compile / exportedProductJars).value
134134
},

client/src/main/scala/play/soap/PlayJaxWsClientProxy.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ private[soap] class PlayJaxWsClientProxy(c: Client, binding: Binding) extends Cl
202202
}
203203
} catch {
204204
case wex: WebServiceException => throw wex
205-
case ex: Exception =>
205+
case ex: Exception =>
206206
for (excls <- method.getExceptionTypes) {
207207
if (excls.isInstance(ex)) {
208208
throw ex

client/src/main/scala/play/soap/PlaySoapPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ abstract class PlaySoapClient @Inject() (apacheCxfBus: ApacheCxfBus, configurati
9292
@Singleton
9393
class ApacheCxfBus @Inject() (lifecycle: ApplicationLifecycle) extends Logging {
9494
private lazy val asyncTransport = new AsyncHttpTransportFactory
95-
private[soap] lazy val bus = {
95+
private[soap] lazy val bus = {
9696
val bus = BusFactory.newInstance.createBus
9797

9898
// Although Apache CXF will automatically select the async http transport conduit, we want to ensure that it will

plugin/src/sbt-test/play-soap/simple-client-scala-future/tests/play/soap/sbtplugin/tester/HelloWorldSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class HelloWorldSpec extends ServiceSpec {
5757
val client = app.injector
5858
.instanceOf[HelloWorldService]
5959
.helloWorld(new SOAPHandler[SOAPMessageContext] {
60-
def getHeaders = null
60+
def getHeaders = null
6161
def handleMessage(context: SOAPMessageContext) = {
6262
invoked.set(true)
6363
true

project/Common.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ object Common extends AutoPlugin {
4444
override def projectSettings =
4545
Seq(
4646
headerEmptyLine := false,
47-
headerLicense := Some(
47+
headerLicense := Some(
4848
HeaderLicense.Custom(
4949
"Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>"
5050
)

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ object Dependencies {
4040
"org.apache.cxf" % "cxf-rt-transports-http-hc5" % Versions.CXF % Test,
4141
"com.typesafe.play" %% "play" % Versions.Play % Test, // TODO: remove
4242
"net.aichler" % "jupiter-interface" % jupiterVersion.value % Test,
43-
"org.testcontainers" % "junit-jupiter" % "1.21.0" % Test,
43+
"org.testcontainers" % "junit-jupiter" % "1.21.1" % Test,
4444
"org.assertj" % "assertj-core" % "3.27.3" % Test
4545
)
4646

0 commit comments

Comments
 (0)