diff --git a/.gitignore b/.gitignore index 56b6fd02..cc31e074 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,11 @@ _build -target .target .DS_Store + +# IntelliJ IDEA +/.idea + +# sbt +/target +/project/target +/project/project \ No newline at end of file diff --git a/README.rst b/README.rst index 5276903b..17d253d9 100644 --- a/README.rst +++ b/README.rst @@ -12,17 +12,17 @@ To setup Sphinx locally, use ``easy_install``: $ sudo easy_install "sphinx==1.1.3" $ sudo easy_install pygments # required on some systems -To generate the files, use the ``make-site`` task in sbt: +To generate the files, use the ``makeSite`` task in sbt: :: - $ sbt make-site + $ sbt makeSite -To deploy the changes, use the ``ghpages-push-site`` task: +To deploy the changes, use the ``ghpagesPushSite`` task: :: - $ sbt make-site ghpages-push-site + $ sbt makeSite ghpagesPushSite .. _reStructuredText: http://docutils.sourceforge.net/rst.html .. _Sphinx: http://sphinx.pocoo.org/ diff --git a/build.sbt b/build.sbt index e1770c6d..d75146fa 100644 --- a/build.sbt +++ b/build.sbt @@ -1,3 +1,5 @@ +name := "scala-ide-docs" + site.settings ghpages.settings diff --git a/project/build.properties b/project/build.properties index 5e96e967..be6c454f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.12.4 +sbt.version=0.13.5 diff --git a/project/plugins.sbt b/project/plugins.sbt index d9298690..5000fe22 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,6 +4,6 @@ resolvers += "sonatype-releases" at "https://oss.sonatype.org/service/local/repo resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven" -addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.6.0") +addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.7.2") -addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.0") +addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.2")