diff --git a/build.sbt b/build.sbt index 20013048b..8f7129406 100644 --- a/build.sbt +++ b/build.sbt @@ -101,7 +101,6 @@ lazy val util = description := "Utilities Library", Test / parallelExecution := false, libraryDependencies ++= Seq( - scala_compiler(scalaVersion.value), joda_time, joda_convert, commons_codec, diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5e9c272d7..63097100c 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -47,14 +47,6 @@ object Dependencies { lazy val scala_parser = "org.scala-lang.modules" %% "scala-parser-combinators" % "2.4.0" lazy val xerces = "xerces" % "xercesImpl" % "2.12.2" - lazy val scala_compiler: ModuleMap = (version: String) => { - if (version.startsWith("2")) { - "org.scala-lang" % "scala-compiler" % version - } else { - "org.scala-lang" % "scala3-compiler_3" % version - } - } - // Aliases lazy val mongo_driver = mongo_java_driver lazy val scalaz7 = scalaz7_core diff --git a/project/plugins.sbt b/project/plugins.sbt index 456061f4e..4de86dd48 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ DefaultOptions.addPluginResolvers resolvers += Resolver.typesafeRepo("releases") -addSbtPlugin("com.typesafe.sbt" % "sbt-web" % "1.4.4") +addSbtPlugin("com.github.sbt" % "sbt-web" % "1.5.8") //addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "2.1.3") lazy val buildPlugin = RootProject(uri("https://github.com/lift/sbt-lift-build.git#01af51e838d2162ebeae56505a635860392b09a6")) diff --git a/web/webkit/src/main/scala/net/liftweb/javascript/JavaScriptContext.scala b/web/webkit/src/main/scala/net/liftweb/javascript/JavaScriptContext.scala index ffec58327..d9398fa45 100644 --- a/web/webkit/src/main/scala/net/liftweb/javascript/JavaScriptContext.scala +++ b/web/webkit/src/main/scala/net/liftweb/javascript/JavaScriptContext.scala @@ -109,4 +109,3 @@ object JavaScriptContext { } } } -