Skip to content

Commit d189d6a

Browse files
committed
link to get-started steps from download pages.
- remove forked "get-started" steps from download pages. - frontpage links either side of logo are "Get Started" and "Learn Scala" - sub links are rearranged. We do this now as we have one set of steps to get started, based on coursier. modify links on download page add coursier step to other DL steps make logo links bigger
1 parent f8d1259 commit d189d6a

File tree

10 files changed

+105
-241
lines changed

10 files changed

+105
-241
lines changed

_includes/downloads-scala2.html

+22-59
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,38 @@
1-
<h2>The most popular way to get Scala is either using Scala through sbt, the Scala build tool, or to use Scala through an IDE.</h2>
21
<div class="install-steps">
2+
<h3>Release Notes</h3>
3+
For a summary of important changes, see the <a href="https://github.com/scala/scala/releases">GitHub release notes</a>.
4+
<br /><small>(Or consult our archive of <a href="{{ site.baseurl }}/blog/announcements/">older release
5+
notes</a>.)</small>
6+
37
<div class="step arrow">
48
<img src="/resources/img/download/arrow-asset.png" alt="">
5-
<div class="number-step">1</div>
6-
<div class="text-step">
7-
<h3>First, make sure you have the Java 8 JDK (or Java 11 JDK) installed.</h3>
8-
<p>To check, open the terminal and type:</p>
9-
<p><code>java -version</code><span>(Make sure you have version 1.8 or 11.)</span></p>
10-
<p><i>(If you don't have it installed, download Java from <a href="https://www.oracle.com/java/technologies/javase-jdk8-downloads.html">Oracle Java 8</a>, <a href="https://www.oracle.com/java/technologies/javase-jdk11-downloads.html">Oracle Java 11</a>, or <a href="https://adoptopenjdk.net/">AdoptOpenJDK 8/11</a>. Refer <a href="https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html">JDK Compatibility</a> for Scala/Java compatiblity detail.</i></p>
11-
</div>
12-
</div>
13-
<div class="step">
14-
<div class="number-step">2</div>
9+
<div class="number-step"><i class="fa fa-check" aria-hidden="true"></i></div>
1510
<div class="text-step">
16-
<h3>Then, install Scala:</h3>
17-
<p>...either by installing an IDE such as IntelliJ, or sbt, Scala's build tool.</p>
18-
</div>
19-
</div>
20-
<div class="download-options">
21-
<div class="download-left">
22-
<span class="or">or</span>
23-
<div class="description">
24-
<img src="/resources/img/download/arrow-left.png" alt="">
25-
<p>Best if you prefer a full-featured IDE (recommended for beginners)</p>
11+
<h2>Recommended Download</h2>
12+
<div class="download-options">
13+
<a href="https://docs.scala-lang.org/getting-started/index.html" class="btn-download" id="get-started-link">
14+
<i class="fa fa-download"></i>
15+
<span>Get Started With Scala</span>
16+
</a>
2617
</div>
27-
<a href="https://www.jetbrains.com/idea" class="btn-download" id="download-intellij-link">
28-
<i class="fa fa-download"></i>
29-
<span>Download intellij</span>
30-
</a>
31-
<ul>
32-
{% include tutorial-list.html column=1 %}
33-
</ul>
34-
</div>
35-
<div class="download-right">
36-
<div class="description">
37-
<img src="/resources/img/download/arrow-right.png" alt="">
38-
<p>Best if you are familiar with the command line</p>
39-
</div>
40-
<a href="https://www.scala-sbt.org/download.html" class="btn-download" id="download-sbt-link">
41-
<i class="fa fa-download"></i>
42-
<span>Download Sbt</span>
43-
</a>
44-
<ul>
45-
{% include tutorial-list.html column=0 %}
46-
</ul>
4718
</div>
4819
</div>
49-
50-
<p class="bottom-lead">
51-
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.
52-
<br><br>
53-
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!
54-
<br><br>
55-
</p>
56-
57-
<!-- <p class="bottom-lead"><h2>Other</h2></p> -->
58-
5920
<div class="step other-ways-lead">
6021
<div class="number-step"><i class="fa fa-ellipsis-h" aria-hidden="true"></i></div>
6122
<div class="text-step">
62-
<h2>Other ways to install Scala</h2>
23+
<h2>Other ways to download Scala</h2>
6324
<ul>
25+
<li>
26+
Using <a
27+
href="https://docs.scala-lang.org/getting-started/index.html#using-the-scala-installer-recommended-way">Coursier
28+
CLI</a>, run:<br>
29+
<code>cs install scala:{{ page.release_version }} && cs install scalac:{{ page.release_version }}</code>.
30+
</li>
6431
<li>
6532
<a id="download-binaries">Download the Scala binaries for <span id="users-os"></span></a>
6633
<br/><span class="install"><a href="{{ site.baseurl }}/download/install.html">Need help running the binaries?</a></span>
6734
</li>
35+
<li><a href="/documentation/getting-started-intellij-track/getting-started-with-scala-in-intellij.html">Download and use Scala</a><span> with </span><a href="https://www.jetbrains.com/idea">IntelliJ</a><span> and then </span><a href="/documentation/getting-started-intellij-track/building-a-scala-project-with-intellij-and-sbt.html">build a project</a><span>, then </span><a href="/documentation/getting-started-intellij-track/testing-scala-in-intellij-with-scalatest.html">test it.</a></li>
6836
<li>Using <a href="https://sdkman.io/">SDKMAN!</a>, you can easily <a href="https://sdkman.io/sdks#scala">install specific versions of Scala</a> on any platform with <code>sdk install scala {{ site.scalaversion }}</code></li>
6937
<li>On macOS you can also use <a href="https://brew.sh/">Homebrew</a> and existing <a href="https://formulae.brew.sh/formula/scala">Scala Formulae</a><br/><code>brew update</code><br/><code>brew install scala</code></li>
7038
<li>With <a href="https://www.macports.org/">MacPorts</a>, you can get Scala using <code>sudo port install scala2.x</code>command.<br/> For example to install Scala 2.12 simply use<code>sudo port install scala2.12</code></li>
@@ -76,12 +44,7 @@ <h2>Other ways to install Scala</h2>
7644
</div>
7745
</div>
7846

79-
80-
<h3>Release Notes</h3>
81-
For a summary of important changes, see the <a href="https://github.com/scala/scala/releases">GitHub release notes</a>.
82-
<br/><small>(Or consult our archive of <a href="{{ site.baseurl }}/blog/announcements/">older release notes</a>.)</small>
83-
8447
{% include download-resource-list.html %}
85-
<h3>License</h3>
86-
<p>The Scala distribution is released under the {{page.license}}.</p>
8748
</div>
49+
<h3>License</h3>
50+
<p>The Scala distribution is released under the {{page.license}}.</p>

_includes/downloads-scala3.html

+18-110
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,34 @@
11
Scala binaries for <strong>{{page.release_version}}</strong> are available at <a href="https://github.com/lampepfl/dotty/releases/tag/{{page.release_version}}">github</a>.
22

3-
<h2>Getting Started with Scala 3</h2>
4-
<div class="install-steps">
5-
<p>
6-
Depending on your experience and your requirements, there exist two ways to
7-
install Scala 3 on your computer,
8-
either through <a href="https://www.scala-sbt.org/download.html">sbt</a>, or
9-
through <a href="https://get-coursier.io/docs/cli-installation">Coursier</a>.
10-
</p>
11-
12-
<div class="download-options">
13-
<div class="download-left">
14-
<span class="or">or</span>
15-
<a href="https://get-coursier.io/docs/cli-installation" class="btn-download">
16-
<i class="fa fa-download"></i>
17-
<span>Download Coursier</span>
18-
</a>
19-
<div class="text-variant">
20-
<p>Best if you want to get <strong>started quickly</strong>.</p>
21-
<p><i>Coursier will install all the necessary dependencies for you, so after
22-
installing Coursier you are ready to go.</i></p>
23-
</div>
24-
</div>
25-
<div class="download-right">
26-
<a href="https://www.scala-sbt.org/download.html" class="btn-download">
27-
<i class="fa fa-download"></i>
28-
<span>Download Sbt</span>
29-
</a>
30-
<div class="text-variant">
31-
<p>Best if you want to work on <strong>larger projects</strong>.</p>
32-
<p><i>If you already have sbt installed, it is very easy to switch to Scala version {{page.release_version}}.</i></p>
33-
</div>
34-
</div>
35-
</div>
36-
</div>
37-
38-
<h2>Installing Scala 3 with <strong>Coursier</strong></h2>
39-
<div class="install-steps">
40-
<div class="step arrow">
41-
<img src="/resources/img/download/arrow-asset.png" alt="">
42-
<div class="number-step">1</div>
43-
<div class="text-step">
44-
<h3>Install the <i>Coursier</i> Scala artifact fetcher.</h3>
45-
<p>Visit the <a href="https://get-coursier.io/">Coursier website</a> for detailed installation instructions on how to install Coursier.</p>
46-
<p><i>(Coursier is the simplest way to get started with Scala, since it will automatically download and install all necessary dependencies for you).</i></p>
47-
</div>
48-
</div>
49-
<!-- <div class="step">
50-
<div class="number-step">2</div>
51-
<div class="text-step">
52-
<h3>Then, prepare your environment</h3>
53-
<p>Open a terminal and run the following command: <code>cs setup</code></p>
54-
<p><i>(Running this <a href="https://get-coursier.io/docs/cli-setup">command</a> installs the correct Java version along with some other helpful command line tools).</i></p>
55-
</div>
56-
</div> -->
57-
<div class="step arrow">
58-
<img src="/resources/img/download/arrow-asset.png" alt="">
59-
<div class="number-step">2</div>
60-
<div class="text-step">
61-
<h3>Then, install Scala 3</h3>
62-
<p>Open a terminal and run the following commands:</p>
63-
<p><code>cs install scala3-compiler</code><span>to install the Scala 3 compiler.</span></p>
64-
<p><code>cs install scala3</code><span>to install the Scala 3 code runner</span></p>
65-
</div>
66-
</div>
67-
<div class="step">
68-
<div class="number-step">3</div>
69-
<div class="text-step">
70-
<h3>Use Scala 3</h3>
71-
<p>The command <code>scala3</code> will start the Scala console, it is an interactive read-eval-print-loop that you can use to directly enter and run Scala expressions.</p>
72-
<p>To use the Scala 3 compiler to compile a file <code>test.scala</code>, run<code>scala3-compiler test.scala</code> in your terminal.</p>
73-
<p>The command <code>scala3 hello Scala</code> will run the main method of a class called <code>hello</code>, passing the argument <code>"Scala"</code>.</p>
74-
</div>
75-
</div>
76-
</div>
77-
3+
<h3>Release Notes</h3>
4+
For a summary of important changes, see the <a
5+
href="https://github.com/lampepfl/dotty/releases/tag/{{page.release_version}}">GitHub release notes</a>.
6+
<br /><small>(Or consult our archive of <a href="{{ site.baseurl }}/blog/announcements/">older release
7+
notes</a>.)</small>
788

79-
<h2>Installing Scala 3 with <strong>sbt</strong></h2>
809
<div class="install-steps">
8110
<div class="step arrow">
8211
<img src="/resources/img/download/arrow-asset.png" alt="">
83-
<div class="number-step">1</div>
84-
<div class="text-step">
85-
<h3>First, make sure you have the Java 8 JDK (or Java 11 JDK) installed.</h3>
86-
<p>To check, open the terminal and type:</p>
87-
<p><code>java -version</code><span>(Make sure you have version 1.8 or 11.)</span></p>
88-
<p>The environment variable <code>JAVA_HOME</code> should point to your Java installation.</p>
89-
<p><i>(If you don't have it installed, download Java from <a href="https://www.oracle.com/java/technologies/javase-jdk8-downloads.html">Oracle Java 8</a>, <a href="https://www.oracle.com/java/technologies/javase-jdk11-downloads.html">Oracle Java 11</a>, or <a href="https://adoptopenjdk.net/">AdoptOpenJDK 8/11</a>. Refer <a href="https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html">JDK Compatibility</a> for Scala/Java compatiblity detail.</i></p>
90-
</div>
91-
</div>
92-
<div class="step arrow">
93-
<img src="/resources/img/download/arrow-asset.png" alt="">
94-
<div class="number-step">2</div>
12+
<div class="number-step"><i class="fa fa-check" aria-hidden="true"></i></div>
9513
<div class="text-step">
96-
<h3>Install the <i>sbt</i> build tool.</h3>
97-
<p>Visit the <a href="https://www.scala-sbt.org/download.html">sbt website</a> for detailed installation instructions on how to install <i>sbt</i>.</p>
98-
<p><i>(sbt is a build tool that allows you to compile, run, test, and deploy your Scala projects).</i></p>
14+
<h2>Recommended Download</h2>
15+
<div class="download-options">
16+
<a href="https://docs.scala-lang.org/getting-started/index.html" class="btn-download" id="get-started-link">
17+
<i class="fa fa-download"></i>
18+
<span>Get Started With Scala</span>
19+
</a>
20+
</div>
9921
</div>
10022
</div>
101-
<div class="step">
102-
<div class="number-step">3</div>
103-
<div class="text-step">
104-
<h3>Create a project and use Scala 3</h3>
105-
<p>To create a new Scala 3 project, go to your terminal and run <code>sbt new scala/scala3.g8</code>.</p>
106-
<p>After entering the name of your project (let's say <code>MyProject</code>), in your terminal go to the generated folder (for example <code>myproject</code>) and run the command <code>sbt run</code>.</p>
107-
<p>You should be greeted with a friendly message.</p>
108-
<p><i>(Following conventions for the <a href="https://www.scala-sbt.org/1.x/docs/Directories.html">directory structure</a>, the Scala source files are located under <code>src/main/scala</code>).</i></p>
109-
</div>
110-
</div>
111-
</div>
112-
113-
<div class="install-steps">
11423
<div class="step other-ways-lead">
11524
<div class="number-step"><i class="fa fa-ellipsis-h" aria-hidden="true"></i></div>
11625
<div class="text-step">
117-
<h2>Other ways to install Scala</h2>
26+
<h2>Other ways to download Scala</h2>
11827
<ul>
28+
<li>
29+
Using <a href="https://docs.scala-lang.org/getting-started/index.html#using-the-scala-installer-recommended-way">Coursier CLI</a>, run:<br>
30+
<code>cs install scala:{{page.release_version}} && cs install scalac:{{page.release_version}}</code>.
31+
</li>
11932
<li>
12033
Download the Scala binaries for <strong>{{page.release_version}}</strong> at <a href="https://github.com/lampepfl/dotty/releases/tag/{{page.release_version}}">github</a>.
12134
<br/><span class="install"><a href="{{ site.baseurl }}/download/install.html">Need help running the binaries?</a></span>
@@ -131,10 +44,5 @@ <h2>Other ways to install Scala</h2>
13144
</div>
13245
</div>
13346
</div>
134-
135-
<h3>Release Notes</h3>
136-
For a summary of important changes, see the <a href="https://github.com/lampepfl/dotty/releases/tag/{{page.release_version}}">GitHub release notes</a>.
137-
<br/><small>(Or consult our archive of <a href="{{ site.baseurl }}/blog/announcements/">older release notes</a>.)</small>
138-
13947
<h3>License</h3>
14048
<p>The Scala distribution is released under the {{page.license}}.</p>

_layouts/download.html

+9-14
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,36 @@ <h1>{{page.title}}</h1>
2020
<div class="wrap">
2121
<div class="inner-box download">
2222
<div class="main-download">
23-
<h2>Which Scala version do you want to use?</h2>
23+
<h2>Download or Upgrade Scala</h2>
2424
<div class="install-steps">
25-
<div class="step">
26-
<div class="text-step">
27-
<p>You can choose between the battle tested <strong>Scala 2</strong> or the newest <strong>Scala 3</strong>.</p>
28-
</div>
29-
</div>
3025
<div class="download-options">
3126
<div class="download-left">
3227
<span class="or">or</span>
3328
<div class="description">
3429
<img src="/resources/img/download/arrow-left.png" alt="">
35-
<p>Best if you are starting a new code base and want to use the latest version.</p>
30+
<p>Recommended method for all Scala users.</p>
3631
</div>
37-
<a href="{{ site.baseurl }}/download/scala3.html" class="btn-download scala3">
32+
<a href="https://docs.scala-lang.org/getting-started.html" class="btn-download scala3">
3833
<i class="fa fa-download"></i>
39-
<span>Download Scala 3</span>
34+
<span>Get Started with Scala</span>
4035
</a>
4136
<ul>
42-
{% for tutorial in page.scala3tutorials %}
37+
{% for tutorial in page.newcomertutorials %}
4338
<li><a href="{{tutorial.url}}"><i class="fa fa-file-text-o"></i>{{tutorial.title}}</a></li>
4439
{% endfor %}
4540
</ul>
4641
</div>
4742
<div class="download-right">
4843
<div class="description">
4944
<img src="/resources/img/download/arrow-right.png" alt="">
50-
<p>Best if you are still working with an old code base that is not migrated, yet.</p>
45+
<p>Best if you have an advanced use case.</p>
5146
</div>
52-
<a href="{{ site.baseurl }}/download/scala2.html" class="btn-plain-download">
47+
<a href="{{ site.baseurl }}/download/all.html" class="btn-plain-download">
5348
<i class="fa fa-download"></i>
54-
<span>Download Scala 2</span>
49+
<span>Pick a Specific Release</span>
5550
</a>
5651
<ul>
57-
{% for tutorial in page.scala2tutorials %}
52+
{% for tutorial in page.advancedtutorials %}
5853
<li><a href="{{tutorial.url}}"><i class="fa fa-file-text-o"></i>{{tutorial.title}}</a></li>
5954
{% endfor %}
6055
</ul>

_layouts/frontpage.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ <h1>{{page.headerTitle}}</h1>
5252
<div class="scala-main-resources">
5353
<div class="wrap">
5454
<div class="resources">
55-
<div class="download">
55+
<div class="get-started">
5656
<a href="{{page.gettingStarted.mainUrl}}" class="button">{{page.gettingStarted.mainTitle | upcase}}</a>
5757
<ul>
5858
<li><a href="{{page.gettingStarted.subtitleLink}}">{{page.gettingStarted.subtitle}}</a></li>
@@ -61,7 +61,7 @@ <h1>{{page.headerTitle}}</h1>
6161
{% endfor %}
6262
</ul>
6363
</div>
64-
<div class="api-docs">
64+
<div class="learn-scala">
6565
<a href="{{page.apiDocs.mainUrl}}" class="button">{{page.apiDocs.mainTitle | upcase}}</a>
6666
<ul>
6767
<li><a href="{{page.apiDocs.subtitleLink}}">{{page.apiDocs.subtitle}}</a></li>
@@ -74,7 +74,6 @@ <h1>{{page.headerTitle}}</h1>
7474
<div class="circle-solid">
7575
<img src="/resources/img/frontpage/scala-spiral.png" alt="">
7676
<div class="scala-version">
77-
<span>Scala</span>
7877
</div>
7978
</div>
8079
</div>

_sass/layout/download.scss

+1
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@
164164
}
165165

166166
.btn-plain-download {
167+
background: $gray-lighter;
167168
display: block;
168169
text-align: center;
169170
text-transform: uppercase;

0 commit comments

Comments
 (0)