diff --git a/_data/downloads.yml b/_data/downloads.yml deleted file mode 100644 index dbe382eeb..000000000 --- a/_data/downloads.yml +++ /dev/null @@ -1,29 +0,0 @@ -stepOne: - - os: linux - text: "

java -version(Make sure you have version 1.8.)

" - - os: unix - text: "

java -version(Make sure you have version 1.8.)

" - - os: macos - text: "

java -version(Make sure you have version 1.8.)

" - - os: windows - text: "

" - -intellijUrls: - - os: linux - url: https://www.jetbrains.com/idea - - os: unix - url: https://www.jetbrains.com/idea - - os: macos - url: https://www.jetbrains.com/idea - - os: windows - url: https://www.jetbrains.com/idea - -sbtUrls: - - os: linux - url: http://www.scala-sbt.org/download.html - - os: unix - url: http://www.scala-sbt.org/download.html - - os: macos - url: http://www.scala-sbt.org/download.html - - os: windows - url: http://www.scala-sbt.org/download.html diff --git a/_data/tutorials.yml b/_data/tutorials.yml deleted file mode 100644 index 210495844..000000000 --- a/_data/tutorials.yml +++ /dev/null @@ -1,10 +0,0 @@ -- title: "Getting Started with Scala in IntelliJ" - url: "/documentation/getting-started-intellij-track/getting-started-with-scala-in-intellij.html" -- title: "Getting Started with Scala and sbt on the Command Line" - url: "/documentation/getting-started-sbt-track/getting-started-with-scala-and-sbt-on-the-command-line.html" -- title: "Building a Scala Project with IntelliJ and sbt" - url: "/documentation/getting-started-intellij-track/building-a-scala-project-with-intellij-and-sbt.html" -- title: "Testing Scala with sbt and ScalaTest on the Command Line" - url: "/documentation/getting-started-sbt-track/testing-scala-with-sbt-on-the-command-line.html" -- title: "Testing Scala in IntelliJ with ScalaTest" - url: "/documentation/getting-started-intellij-track/testing-scala-in-intellij-with-scalatest.html" diff --git a/_includes/tutorial-list.html b/_includes/tutorial-list.html deleted file mode 100644 index da4ca5892..000000000 --- a/_includes/tutorial-list.html +++ /dev/null @@ -1,7 +0,0 @@ -{% comment %}Use include variable 'column' to describe which column list to draw (0 or 1){% endcomment %} -{% for tutorial in site.data.tutorials limit: 6 %} - {% assign loopindex = forloop.index | modulo: 2 %} - {% if loopindex == include.column %} -
  • {{tutorial.title | truncate: 60}}
    • - {% endif %} -{% endfor %} \ No newline at end of file diff --git a/_layouts/downloadpage.html b/_layouts/downloadpage.html index d20e679cb..4bfb39b44 100644 --- a/_layouts/downloadpage.html +++ b/_layouts/downloadpage.html @@ -16,23 +16,24 @@
    -

    The most popular way to get Scala is either using Scala through sbt, the Scala build tool, or to use Scala through an IDE.

    +

    The easiest way to install Scala is through coursier.

    1
    -

    First, make sure you have the Java 8 JDK (or Java 11 JDK) installed.

    -

    To check, open the terminal and type:

    -

    java -version(Make sure you have version 1.8 or 11.)

    -

    (If you don't have it installed, download Java from Oracle Java 8, Oracle Java 11, or AdoptOpenJDK 8/11. Refer JDK Compatibility for Scala/Java compatiblity detail.

    +

    First, install Java, Scala, and all related command-line tools.

    +
    +

    Download the native launcher of coursier then install everything with:

    +

    $ ./cs setup (Adapt to your operating system)

    +
    +

    (See the instructions for other operating systems.)

    2
    -

    Then, install Scala:

    -

    ...either by installing an IDE such as IntelliJ, or sbt, Scala's build tool.

    +

    Then, install an IDE, or get started with sbt

    @@ -42,12 +43,14 @@

    Then, install Scala:

    Best if you prefer a full-featured IDE (recommended for beginners)

    - + - Download intellij + Download IntelliJ
    @@ -55,21 +58,21 @@

    Then, install Scala:

    Best if you are familiar with the command line

    - + - Download Sbt + Get started with sbt

    - Compared to other programming languages, installing Scala is a bit unusual. Scala is unusual because it is usually installed for each of your Scala projects rather than being installed system-wide. Both of the above options manage (via sbt) a specific Scala version per Scala project you create. -

    - But it's also possible to "install" Scala in numerous other ways; e.g., grab Scala binaries and use Scala from the command line or use Scala in your browser! -

    + Compared to other programming languages, installing Scala is a bit unusual. + In addition to the system-wide installation mentioned above, build tools such as sbt will automatically manage a specific Scala version per Scala project you create. + This makes sure that there are no version conflicts between different Scala projects on your computer.

    @@ -108,11 +111,22 @@

    License

    - {% for step in site.data.downloads.stepOne %} - - {% endfor %} {% for intellijUrl in site.data.downloads.intellijUrls %} - - {% endfor %} {% for sbtUrl in site.data.downloads.sbtUrls %} - - {% endfor %} + + + + + + diff --git a/resources/js/functions.js b/resources/js/functions.js index ecaf3f786..98be34ce4 100644 --- a/resources/js/functions.js +++ b/resources/js/functions.js @@ -260,11 +260,7 @@ function getOS() { $(document).ready(function() { if ($(".main-download").length) { var os = getOS(); - var intelliJlink = $("#intellij-" + os).text(); - var sbtLink = $("#sbt-" + os).text(); var stepOneContent = $("#stepOne-" + os).html() - $("#download-intellij-link").attr("href", intelliJlink); - $("#download-sbt-link").attr("href", sbtLink); $("#download-step-one").html(stepOneContent); } });