diff --git a/.travis.yml b/.travis.yml index 0493fb4cc..9fce93b77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,11 @@ env: script: admin/build.sh +addons: + apt: + packages: + - openjdk-6-jdk + jdk: - openjdk6 - oraclejdk8 diff --git a/build.sbt b/build.sbt index 5757d2c10..572b09969 100644 --- a/build.sbt +++ b/build.sbt @@ -41,7 +41,7 @@ lazy val xml = crossProject.in(file(".")) libraryDependencies += "junit" % "junit" % "4.11" % "test", libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test", - libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.6" % "test", + libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.5" % "test", libraryDependencies += ("org.scala-lang" % "scala-compiler" % scalaVersion.value % "test").exclude("org.scala-lang.modules", s"scala-xml_${scalaVersion.value}") ) .jsSettings( diff --git a/jvm/src/test/scala/scala/xml/JavaByteSerialization.scala b/jvm/src/test/scala/scala/xml/JavaByteSerialization.scala index 2d9f286d0..af88381cc 100644 --- a/jvm/src/test/scala/scala/xml/JavaByteSerialization.scala +++ b/jvm/src/test/scala/scala/xml/JavaByteSerialization.scala @@ -1,7 +1,6 @@ package scala.xml import java.io.Serializable -import java.util.Base64 import org.apache.commons.lang3.SerializationUtils object JavaByteSerialization { @@ -16,12 +15,4 @@ object JavaByteSerialization { def deserialize[T <: Serializable](in: Array[Byte]): T = { SerializationUtils.deserialize(in) } - - def base64Encode[T <: Serializable](in: T): String = { - Base64.getEncoder.encodeToString(serialize[T](in)) - } - - def base64Decode[T <: Serializable](in: String): T = { - deserialize[T](Base64.getDecoder.decode(in)) - } } diff --git a/jvm/src/test/scala/scala/xml/SerializationTest.scala b/jvm/src/test/scala/scala/xml/SerializationTest.scala index eb8f716ea..d3f4eb754 100644 --- a/jvm/src/test/scala/scala/xml/SerializationTest.scala +++ b/jvm/src/test/scala/scala/xml/SerializationTest.scala @@ -27,11 +27,4 @@ class SerializationTest { val asNodeSeq: NodeSeq = children assertEquals(asNodeSeq, JavaByteSerialization.roundTrip(asNodeSeq)) } - - @Test - def base64Encode: Unit = { - val str = JavaByteSerialization.base64Encode(NodeSeq.Empty) - assertEquals("rO0ABXNy", str.take(8)) - assertEquals("AHhweA==", str.takeRight(8)) - } } diff --git a/project/plugins.sbt b/project/plugins.sbt index 76cc17c5c..5b07efadc 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.12") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.20") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")