Skip to content

Commit 9126948

Browse files
committed
Comment out java.nio.charset.StandardCharsets to avoid Java 6 compiler error
1 parent 10fd7ae commit 9126948

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Diff for: src/test/scala/scala/xml/XmlStringGen.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ trait XmlStringGen extends DocumentGen {
1313

1414
val xmlStringGen: Gen[String] = for {
1515
document <- Arbitrary.arbitrary[Document]
16-
encoding <- Gen.const(java.nio.charset.StandardCharsets.UTF_8.name)
16+
encoding <- Gen.const("UTF-8") // java.nio.charset.StandardCharsets.UTF_8.name
1717
xmlDecl <- xmlDeclGen("1.0", encoding)
1818
} yield {
1919
val str = xmlDecl + Group(document.children ++ Seq(document.docElem)).toString

Diff for: src/test/scala/scala/xml/factory/XMLLoaderSpec.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ object XMLLoaderSpec extends PropertiesFor("factory.XMLLoader")
4747
out,
4848
new java.io.OutputStreamWriter(
4949
out,
50-
java.nio.charset.StandardCharsets.UTF_8.name
50+
"UTF-8" // java.nio.charset.StandardCharsets.UTF_8.name
5151
)
5252
)
5353
}
@@ -59,7 +59,7 @@ object XMLLoaderSpec extends PropertiesFor("factory.XMLLoader")
5959
val inputStreamGen: Gen[java.io.InputStream] = for {
6060
inOut <- Arbitrary.arbitrary[StreamAndWriter]
6161
document <- Arbitrary.arbitrary[Document]
62-
encoding <- Gen.const(java.nio.charset.StandardCharsets.UTF_8.name)
62+
encoding <- Gen.const("UTF-8") // java.nio.charset.StandardCharsets.UTF_8.name
6363
xmlDecl <- Gen.const(true) // Gen.oneOf(true, false)
6464
doctype <- Arbitrary.arbitrary[dtd.DocType]
6565
minimizeTags <- Gen.oneOf(

0 commit comments

Comments
 (0)