diff --git a/core/util/src/main/scala/net/liftweb/util/PCDataMarkupParser.scala b/core/util/src/main/scala/net/liftweb/util/PCDataMarkupParser.scala index 315e6a88a1..d4eb7c90eb 100644 --- a/core/util/src/main/scala/net/liftweb/util/PCDataMarkupParser.scala +++ b/core/util/src/main/scala/net/liftweb/util/PCDataMarkupParser.scala @@ -157,8 +157,8 @@ class PCDataXmlParser(val input: Source) extends ConstructingHandler with PCData import scala.io._ - val line = Position.line(pos) - val col = Position.column(pos) + val line = ScalaPosition.line(pos) + val col = ScalaPosition.column(pos) val report = curInput.descr + ":" + line + ":" + col + ": " + msg System.err.println(report) try { diff --git a/core/util/src/main/scala/net/liftweb/util/Position.scala b/core/util/src/main/scala/net/liftweb/util/ScalaPosition.scala similarity index 92% rename from core/util/src/main/scala/net/liftweb/util/Position.scala rename to core/util/src/main/scala/net/liftweb/util/ScalaPosition.scala index f3ac82021f..fcade4c012 100644 --- a/core/util/src/main/scala/net/liftweb/util/Position.scala +++ b/core/util/src/main/scala/net/liftweb/util/ScalaPosition.scala @@ -36,10 +36,11 @@ package io /** * This was made private in scala 2.11.0 but there is no alternative for us to use, so here, copy/paste for now. + * We renamed it because having a private vs public class with the same name causes errors with the assembly plugin + * and may/(will?) cause errors at runtime. */ -@deprecated("This class will be removed.", "2.10.0") -abstract class Position { +abstract class ScalaPosition { /** Definable behavior for overflow conditions. */ def checkInput(line: Int, column: Int): Unit @@ -73,7 +74,7 @@ abstract class Position { def toString(pos: Int): String = line(pos) + ":" + column(pos) } -object Position extends Position { +object ScalaPosition extends ScalaPosition { def checkInput(line: Int, column: Int) { if (line < 0) throw new IllegalArgumentException(line + " < 0") diff --git a/project/Build.scala b/project/Build.scala index fb25b70a2d..bcb6cf2551 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -103,14 +103,8 @@ object BuildDef extends Build { .settings(description := "Utilities Library", parallelExecution in Test := false, libraryDependencies <++= scalaVersion {sv => Seq(scala_compiler(sv), joda_time, - joda_convert, commons_codec, javamail, log4j, htmlparser)}, - excludeFilter <<= scalaVersion { scalaVersion => - if (scalaVersion.startsWith("2.11")) { - HiddenFileFilter - } else { - HiddenFileFilter || "Position.scala" - } - }) + joda_convert, commons_codec, javamail, log4j, htmlparser)} + ) // Web Projects // ------------