Skip to content

Commit

Permalink
Merge pull request skinny-framework#254 from skinny-framework/scalajs…
Browse files Browse the repository at this point in the history
…-0.6.2

Scala.js 0.6.2
  • Loading branch information
seratch committed Apr 18, 2015
2 parents 99635ba + 92462e6 commit b5a06f1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion yeoman-generator-skinny/app/templates/skinny
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function setup_scalajs() {
setting_file="${current_dir}/project/_skinny_scalajs.sbt"
if [ ! -f "${setting_file}" ]; then
echo "resolvers += \"scala-js-release\" at \"http://dl.bintray.com/scala-js/scala-js-releases\"
addSbtPlugin(\"org.scala-js\" % \"sbt-scalajs\" % \"0.6.0\")" > ${setting_file}
addSbtPlugin(\"org.scala-js\" % \"sbt-scalajs\" % \"0.6.2\")" > ${setting_file}

echo "lazy val scalajs = (project in file(\"src/main/webapp/WEB-INF/assets\")).settings(
name := \"application\", // JavaScript file name
Expand Down
2 changes: 1 addition & 1 deletion yeoman-generator-skinny/app/templates/skinny.bat
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ GOTO script_eof
:scalajs_task
IF NOT EXIST "project\_skinny_scalajs.sbt" (
ECHO resolvers += "scala-js-release" at "http://dl.bintray.com/scala-js/scala-js-releases" > "project\_skinny_scalajs.sbt"
ECHO addSbtPlugin^("org.scala-js" %% "sbt-scalajs" %% "0.6.0"^) >> "project\_skinny_scalajs.sbt"
ECHO addSbtPlugin^("org.scala-js" %% "sbt-scalajs" %% "0.6.2"^) >> "project\_skinny_scalajs.sbt"

ECHO lazy val scalajs = ^(project in file^("src/main/webapp/WEB-INF/assets"^)^).settings^( > "_skinny_scalajs_settings.sbt"
ECHO name := "application", // JavaScript file name >> "_skinny_scalajs_settings.sbt"
Expand Down

0 comments on commit b5a06f1

Please sign in to comment.