Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 0 additions & 8 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,3 @@ object JavaScriptContext {
}
}
}

Loading