Skip to content

Commit

Permalink
Don't automatically bring in scalajs with sbt-twirl
Browse files Browse the repository at this point in the history
  • Loading branch information
gmethvin committed Aug 4, 2017
1 parent 76a1f64 commit f3003ef
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
2 changes: 0 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ lazy val plugin = project
name := "sbt-twirl",
organization := "com.typesafe.sbt",
libraryDependencies += "org.scalatest" %%% "scalatest" % scalatest % "test",
// Plugin for %%%
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion),
resourceGenerators in Compile += generateVersionFile.taskValue,
scriptedDependencies := {
scriptedDependencies.value
Expand Down
4 changes: 0 additions & 4 deletions sbt-twirl/src/main/scala/play/twirl/sbt/SbtTwirl.scala
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ object SbtTwirl extends AutoPlugin {

val autoImport = Import

import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._

override def requires = sbt.plugins.JvmPlugin

override def trigger = noTrigger
Expand Down Expand Up @@ -74,8 +72,6 @@ object SbtTwirl extends AutoPlugin {
)

def dependencySettings = Def.settings(
// Task is undefined if not a ScalaJSPlugin
isScalaJSProject := (isScalaJSProject ?? false).value,
twirlVersion := readResourceProperty("twirl.version.properties", "twirl.api.version"),
// %%% will be the same as %% for normal projects
libraryDependencies += "com.typesafe.play" %%% "twirl-api" % twirlVersion.value
Expand Down

0 comments on commit f3003ef

Please sign in to comment.