From d189d6adc2b46ea8c57799d9cd6d37d40628081e Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Mon, 21 Feb 2022 15:33:00 +0100 Subject: [PATCH 1/4] 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 --- _includes/downloads-scala2.html | 81 +++++----------- _includes/downloads-scala3.html | 128 ++++--------------------- _layouts/download.html | 23 ++--- _layouts/frontpage.html | 5 +- _sass/layout/download.scss | 1 + _sass/layout/scala-main-resources.scss | 46 ++++----- _sass/utils/_variables.scss | 2 + download/index.md | 18 ++-- download/install.md | 2 +- index.md | 40 ++++---- 10 files changed, 105 insertions(+), 241 deletions(-) diff --git a/_includes/downloads-scala2.html b/_includes/downloads-scala2.html index ebb713a9e..c731e094b 100644 --- a/_includes/downloads-scala2.html +++ b/_includes/downloads-scala2.html @@ -1,70 +1,38 @@ -

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

+

Release Notes

+ For a summary of important changes, see the GitHub release notes. +
(Or consult our archive of older release + notes.) +
-
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.

-
-
-
-
2
+
-

Then, install Scala:

-

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

-
-
-
-
- or -
- -

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

+

Recommended Download

+
+ + + Get Started With Scala +
- - - Download intellij - -
    - {% include tutorial-list.html column=1 %} -
-
-
-
- -

Best if you are familiar with the command line

-
- - - Download Sbt - -
    - {% include tutorial-list.html column=0 %} -
- -

- 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! -

-

- - -
-

Other ways to install Scala

+

Other ways to download Scala

- -

Release Notes

- For a summary of important changes, see the GitHub release notes. -
(Or consult our archive of older release notes.) - {% include download-resource-list.html %} -

License

-

The Scala distribution is released under the {{page.license}}.

+

License

+

The Scala distribution is released under the {{page.license}}.

diff --git a/_includes/downloads-scala3.html b/_includes/downloads-scala3.html index 37afacdc3..9141e3a03 100644 --- a/_includes/downloads-scala3.html +++ b/_includes/downloads-scala3.html @@ -1,121 +1,34 @@ Scala binaries for {{page.release_version}} are available at github. -

Getting Started with Scala 3

-
-

- Depending on your experience and your requirements, there exist two ways to - install Scala 3 on your computer, - either through sbt, or - through Coursier. -

- -
-
- or - - - Download Coursier - -
-

Best if you want to get started quickly.

-

Coursier will install all the necessary dependencies for you, so after - installing Coursier you are ready to go.

-
-
-
- - - Download Sbt - -
-

Best if you want to work on larger projects.

-

If you already have sbt installed, it is very easy to switch to Scala version {{page.release_version}}.

-
-
-
-
- -

Installing Scala 3 with Coursier

-
-
- -
1
-
-

Install the Coursier Scala artifact fetcher.

-

Visit the Coursier website for detailed installation instructions on how to install Coursier.

-

(Coursier is the simplest way to get started with Scala, since it will automatically download and install all necessary dependencies for you).

-
-
- -
- -
2
-
-

Then, install Scala 3

-

Open a terminal and run the following commands:

-

cs install scala3-compilerto install the Scala 3 compiler.

-

cs install scala3to install the Scala 3 code runner

-
-
-
-
3
-
-

Use Scala 3

-

The command scala3 will start the Scala console, it is an interactive read-eval-print-loop that you can use to directly enter and run Scala expressions.

-

To use the Scala 3 compiler to compile a file test.scala, runscala3-compiler test.scala in your terminal.

-

The command scala3 hello Scala will run the main method of a class called hello, passing the argument "Scala".

-
-
-
- +

Release Notes

+For a summary of important changes, see the GitHub release notes. +
(Or consult our archive of older release + notes.) -

Installing Scala 3 with sbt

-
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.)

-

The environment variable JAVA_HOME should point to your Java installation.

-

(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.

-
-
-
- -
2
+
-

Install the sbt build tool.

-

Visit the sbt website for detailed installation instructions on how to install sbt.

-

(sbt is a build tool that allows you to compile, run, test, and deploy your Scala projects).

+

Recommended Download

+
+ + + Get Started With Scala + +
-
-
3
-
-

Create a project and use Scala 3

-

To create a new Scala 3 project, go to your terminal and run sbt new scala/scala3.g8.

-

After entering the name of your project (let's say MyProject), in your terminal go to the generated folder (for example myproject) and run the command sbt run.

-

You should be greeted with a friendly message.

-

(Following conventions for the directory structure, the Scala source files are located under src/main/scala).

-
-
-
- -
-

Other ways to install Scala

+

Other ways to download Scala

    +
  • + Using Coursier CLI, run:
    + cs install scala:{{page.release_version}} && cs install scalac:{{page.release_version}}. +
  • Download the Scala binaries for {{page.release_version}} at github.
    Need help running the binaries? @@ -131,10 +44,5 @@

    Other ways to install Scala

- -

Release Notes

-For a summary of important changes, see the GitHub release notes. -
(Or consult our archive of older release notes.) -

License

The Scala distribution is released under the {{page.license}}.

diff --git a/_layouts/download.html b/_layouts/download.html index 92bef5974..968861915 100644 --- a/_layouts/download.html +++ b/_layouts/download.html @@ -20,26 +20,21 @@

{{page.title}}

-

Which Scala version do you want to use?

+

Download or Upgrade Scala

-
-
-

You can choose between the battle tested Scala 2 or the newest Scala 3.

-
-
or
-

Best if you are starting a new code base and want to use the latest version.

+

Recommended method for all Scala users.

- + - Download Scala 3 + Get Started with Scala
    - {% for tutorial in page.scala3tutorials %} + {% for tutorial in page.newcomertutorials %}
  • {{tutorial.title}}
    • {% endfor %}
@@ -47,14 +42,14 @@

Which Scala version do you want to use?

-

Best if you are still working with an old code base that is not migrated, yet.

+

Best if you have an advanced use case.

- + - Download Scala 2 + Pick a Specific Release
    - {% for tutorial in page.scala2tutorials %} + {% for tutorial in page.advancedtutorials %}
  • {{tutorial.title}}
    • {% endfor %}
diff --git a/_layouts/frontpage.html b/_layouts/frontpage.html index 52581a2a0..ca2efc5de 100644 --- a/_layouts/frontpage.html +++ b/_layouts/frontpage.html @@ -52,7 +52,7 @@

{{page.headerTitle}}

-
+
{{page.gettingStarted.mainTitle | upcase}}
-
+
{{page.apiDocs.mainTitle | upcase}}
diff --git a/_sass/layout/download.scss b/_sass/layout/download.scss index dc8012250..cea058ccd 100755 --- a/_sass/layout/download.scss +++ b/_sass/layout/download.scss @@ -164,6 +164,7 @@ } .btn-plain-download { + background: $gray-lighter; display: block; text-align: center; text-transform: uppercase; diff --git a/_sass/layout/scala-main-resources.scss b/_sass/layout/scala-main-resources.scss index da01231a0..3038a8c11 100755 --- a/_sass/layout/scala-main-resources.scss +++ b/_sass/layout/scala-main-resources.scss @@ -3,28 +3,28 @@ //------------------------------------------------ .scala-main-resources { - height: 220px; + height: 200px; background: $gray-darker; position: relative; .resources { .button { - font-size: $font-size-large; + font-size: $font-size-logo-btn; display: block; @include border-top-radius(200px); @include border-right-radius(0); @include border-bottom-radius(0); @include border-left-radius(200px); - padding: $padding-small $padding-large; + padding: $padding-medium $padding-mlarge; } - .download { + .get-started { @include span-columns(4); @include shift(2); .button { - background: $brand-tertiary-dotty; + background: $brand-tertiary; &:active, &:focus, &:hover { @@ -33,7 +33,7 @@ } } - .api-docs { + .learn-scala { @include span-columns(4); .button { @@ -53,20 +53,20 @@ } } @include bp(large) { - .download { + .get-started { @include span-columns(6); @include shift(0); } - .api-docs { + .learn-scala { @include span-columns(6); margin-right: 0; } } - .api-docs, - .download { - margin-top: -40px; + .learn-scala, + .get-started { + margin-top: -48px; ul { margin-top: 12px; @@ -101,18 +101,18 @@ } } - .api-docs { + .learn-scala { ul { float: right; } } .scala-brand-circle { - width: 340px; - height: 340px; + width: 280px; + height: 280px; left: 50%; - top: -178px; - margin-left: -170px; + top: -142px; + margin-left: -140px; background: rgba($gray-darker, 0.4); border-radius: 100%; position: absolute; @@ -123,15 +123,15 @@ .circle-solid { background: $gray-darker; - width: 224px; - height: 224px; + width: 198px; + height: 198px; border-radius: 100%; text-align: center; > img { width: 152px; height: auto; - margin-top: -28px; + margin-top: -40px; } .scala-version { @@ -166,16 +166,16 @@ padding-bottom: $padding-xlarge; .resources { - .download { + .get-started { margin-top: 180px; } - .api-docs { + .learn-scala { margin-top: 40px; } - .api-docs, - .download { + .learn-scala, + .get-started { @include span-columns(12); .button { diff --git a/_sass/utils/_variables.scss b/_sass/utils/_variables.scss index 14c3406a8..2c07f9805 100755 --- a/_sass/utils/_variables.scss +++ b/_sass/utils/_variables.scss @@ -38,6 +38,7 @@ $heading-font-family: 'Roboto Slab', serif; $em-base: 16px !global; $base-font-size: $em-base; //------------------------------------------------ +$font-size-logo-btn: 1.4rem; // 17px $font-size-large: 1.063rem; // 17px $font-size-medium: 0.9375rem; // 15px $font-size-small: 0.875rem; // 14px @@ -71,6 +72,7 @@ $base-border-white: 1px solid $base-border-color-white; //------------------------------------------------ $padding-xlarge: 50px; $padding-large: 40px; +$padding-mlarge: 35px; $padding-medium: 30px; $padding-small: 20px; //------------------------------------------------ diff --git a/download/index.md b/download/index.md index 5c3bc6c29..94d584dbf 100644 --- a/download/index.md +++ b/download/index.md @@ -2,17 +2,17 @@ layout: download title: Download -scala2tutorials: -- title: "Getting Started with Scala 2" - url: "https://docs.scala-lang.org/getting-started/index.html" -- title: "Scala 2 documentation" - url: "https://docs.scala-lang.org/" - -scala3tutorials: -- title: "Getting Started with Scala 3" - url: "https://docs.scala-lang.org/scala3/getting-started.html" +advancedtutorials: - title: "Scala 3 documentation" url: "https://docs.scala-lang.org/scala3/" - title: "Migrating from Scala 2 to Scala 3" url: "https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html" + +newcomertutorials: +- title: "Scala Book" + url: "https://docs.scala-lang.org/scala3/book/introduction.html" +- title: "Tour of Scala" + url: "https://docs.scala-lang.org/tour/tour-of-scala.html" +- title: "Online Courses" + url: "https://docs.scala-lang.org/online-courses.html" --- diff --git a/download/install.md b/download/install.md index 606d529d4..3119ed7f8 100644 --- a/download/install.md +++ b/download/install.md @@ -5,7 +5,7 @@ layout: inner-page-no-masthead includeTOC: true --- -**To run Scala from the command-line, simply [download]({{ site.baseurl }}/download) +**To run Scala from the command-line, [download]({{ site.baseurl }}/download) the binaries and unpack the archive.** Start the Scala interpreter (aka the "REPL") by launching `scala` from where diff --git a/index.md b/index.md index eaa270c46..7c853ee19 100644 --- a/index.md +++ b/index.md @@ -9,33 +9,29 @@ headerButtonUrl: "/what-is-scala/" # Links of the Download / API Docs sections gettingStarted: - mainTitle: "Scala 3.1.1" - mainUrl: "/download/scala3.html" - subtitle: "Documentation" - subtitleLink: "https://docs.scala-lang.org/scala3" + mainTitle: "Get Started" + mainUrl: "https://docs.scala-lang.org/getting-started.html" + subtitle: "All Scala Releases" + subtitleLink: "/download/all.html" links: - - title: "New in Scala 3" - url: "https://docs.scala-lang.org/scala3/new-in-scala3.html" - - title: "Scala 3 Book" - url: "https://docs.scala-lang.org/scala3/book/introduction.html" - - title: "Language Reference" - url: "https://docs.scala-lang.org/scala3/reference/overview.html" - - title: "Migration Guide" - url: "https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html" -apiDocs: - mainTitle: "Scala 2.13.8" - mainUrl: "/download/scala2.html" - subtitle: "Documentation" - subtitleLink: "https://docs.scala-lang.org" - links: - - title: "Current API Docs" + - title: "API Documentation" url: "https://www.scala-lang.org/api/current/?_ga=1.241039811.1310790544.1468501313" - - title: "API Docs (other versions)" + - title: "API Docs (All Releases)" url: "https://scala-lang.org/files/archive/api/" - title: "Language Specification" url: "https://scala-lang.org/files/archive/spec/2.13/" - - title: "All Previous Releases" - url: "/download/all.html" +apiDocs: + mainTitle: "Learn Scala" + mainUrl: "https://docs.scala-lang.org" + subtitle: "Scala Book" + subtitleLink: "https://docs.scala-lang.org/scala3/book/introduction.html" + links: + - title: "Tour of Scala" + url: "https://docs.scala-lang.org/tour/tour-of-scala.html" + - title: "Online Courses" + url: "https://docs.scala-lang.org/online-courses.html" + - title: "Scala 3 Reference" + url: "https://docs.scala-lang.org/scala3/reference/overview.html" # Scala backends From c341c600d682c4cc6683be086019973e56f2b350 Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Mon, 28 Feb 2022 13:05:27 +0100 Subject: [PATCH 2/4] adress feedback, remove scala2/3 download pages --- _data/scala-releases.yml | 20 ++++++ _downloads/2019-08-05-2.12.9.md | 1 + _downloads/2019-09-10-2.12.10.md | 1 + _downloads/2020-03-16-2.12.11.md | 1 + _downloads/2020-07-13-2.12.12.md | 1 + _downloads/2021-01-12-2.12.13.md | 1 + _downloads/2021-02-22-2.13.5.md | 1 + _downloads/2021-05-28-2.12.14.md | 1 + _downloads/2021-09-14-2.12.15.md | 1 + _downloads/2021-11-01-2.13.7.md | 1 + _downloads/2022-01-12-2.13.8.md | 1 + _includes/download-resource-list.html | 75 +++++++++++----------- _includes/downloads-scala2.html | 89 +++++++++++++-------------- _includes/downloads-scala3.html | 67 +++++++++----------- download/scala2.md | 25 -------- download/scala3.md | 8 --- 16 files changed, 143 insertions(+), 151 deletions(-) create mode 100644 _data/scala-releases.yml delete mode 100644 download/scala2.md delete mode 100644 download/scala3.md diff --git a/_data/scala-releases.yml b/_data/scala-releases.yml new file mode 100644 index 000000000..f0315b241 --- /dev/null +++ b/_data/scala-releases.yml @@ -0,0 +1,20 @@ +- category: current_version + title: Current 3.1.x release + version: 3.1.1 + release_date: February 1, 2022 +- category: current_version + title: Current 2.13.x release + version: 2.13.8 + release_date: January 12, 2022 +- category: maintenance_version + title: Latest 2.12.x maintenance release + version: 2.12.15 + release_date: September 14, 2021 +- category: "maintenance_version" + title: "Last 2.11.x maintenance release" + version: 2.11.12 + release_date: "November 9, 2017" +- category: "maintenance_version" + title: "Last 2.10.x maintenance release" + version: 2.10.7 + release_date: "November 9, 2017" diff --git a/_downloads/2019-08-05-2.12.9.md b/_downloads/2019-08-05-2.12.9.md index 37c134fab..e7d8e4659 100644 --- a/_downloads/2019-08-05-2.12.9.md +++ b/_downloads/2019-08-05-2.12.9.md @@ -7,6 +7,7 @@ release_date: "August 05, 2019" show_resources: "true" permalink: /download/2.12.9.html requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires Java 8 or later, available here." +license: Apache License, Version 2.0 resources: [ ["-main-unixsys", "scala-2.12.9.tgz", "https://downloads.lightbend.com/scala/2.12.9/scala-2.12.9.tgz", "Mac OS X, Unix, Cygwin", "19.69M"], ["-main-windows", "scala-2.12.9.msi", "https://downloads.lightbend.com/scala/2.12.9/scala-2.12.9.msi", "Windows (msi installer)", "124.01M"], diff --git a/_downloads/2019-09-10-2.12.10.md b/_downloads/2019-09-10-2.12.10.md index 5814c8aef..2a121ad8c 100644 --- a/_downloads/2019-09-10-2.12.10.md +++ b/_downloads/2019-09-10-2.12.10.md @@ -7,6 +7,7 @@ release_date: "September 10, 2019" show_resources: "true" permalink: /download/2.12.10.html requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires Java 8 or later, available here." +license: Apache License, Version 2.0 resources: [ ["-main-unixsys", "scala-2.12.10.tgz", "https://downloads.lightbend.com/scala/2.12.10/scala-2.12.10.tgz", "Mac OS X, Unix, Cygwin", "19.71M"], ["-main-windows", "scala-2.12.10.msi", "https://downloads.lightbend.com/scala/2.12.10/scala-2.12.10.msi", "Windows (msi installer)", "124M"], diff --git a/_downloads/2020-03-16-2.12.11.md b/_downloads/2020-03-16-2.12.11.md index 185ac1b92..e5bbd018c 100644 --- a/_downloads/2020-03-16-2.12.11.md +++ b/_downloads/2020-03-16-2.12.11.md @@ -7,6 +7,7 @@ release_date: "March 16, 2020" show_resources: "true" permalink: /download/2.12.11.html requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires Java 8 or later, available here." +license: Apache License, Version 2.0 resources: [ ["-main-unixsys", "scala-2.12.11.tgz", "https://downloads.lightbend.com/scala/2.12.11/scala-2.12.11.tgz", "Mac OS X, Unix, Cygwin", "19.83M"], ["-main-windows", "scala-2.12.11.msi", "https://downloads.lightbend.com/scala/2.12.11/scala-2.12.11.msi", "Windows (msi installer)", "124.33M"], diff --git a/_downloads/2020-07-13-2.12.12.md b/_downloads/2020-07-13-2.12.12.md index 3a4a35ac2..be58c5f2f 100644 --- a/_downloads/2020-07-13-2.12.12.md +++ b/_downloads/2020-07-13-2.12.12.md @@ -7,6 +7,7 @@ release_date: "July 13, 2020" show_resources: "true" permalink: /download/2.12.12.html requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires Java 8 or later, available here." +license: Apache License, Version 2.0 resources: [ ["-main-unixsys", "scala-2.12.12.tgz", "https://downloads.lightbend.com/scala/2.12.12/scala-2.12.12.tgz", "Mac OS X, Unix, Cygwin", "19.87M"], ["-main-windows", "scala-2.12.12.msi", "https://downloads.lightbend.com/scala/2.12.12/scala-2.12.12.msi", "Windows (msi installer)", "124.70M"], diff --git a/_downloads/2021-01-12-2.12.13.md b/_downloads/2021-01-12-2.12.13.md index f17d56794..9d7358514 100644 --- a/_downloads/2021-01-12-2.12.13.md +++ b/_downloads/2021-01-12-2.12.13.md @@ -7,6 +7,7 @@ release_date: "January 12, 2021" show_resources: "true" permalink: /download/2.12.13.html requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires Java 8 or later, available here." +license: Apache License, Version 2.0 resources: [ ["-main-unixsys", "scala-2.12.13.tgz", "https://downloads.lightbend.com/scala/2.12.13/scala-2.12.13.tgz", "Mac OS X, Unix, Cygwin", "20.03M"], ["-main-windows", "scala-2.12.13.msi", "https://downloads.lightbend.com/scala/2.12.13/scala-2.12.13.msi", "Windows (msi installer)", "125.69M"], diff --git a/_downloads/2021-02-22-2.13.5.md b/_downloads/2021-02-22-2.13.5.md index 7b187cb7d..9891cdf09 100644 --- a/_downloads/2021-02-22-2.13.5.md +++ b/_downloads/2021-02-22-2.13.5.md @@ -7,6 +7,7 @@ release_date: "February 22, 2021" show_resources: "true" permalink: /download/2.13.5.html requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires Java 8 or later, available here." +license: Apache License, Version 2.0 resources: [ ["-main-unixsys", "scala-2.13.5.tgz", "https://downloads.lightbend.com/scala/2.13.5/scala-2.13.5.tgz", "Mac OS X, Unix, Cygwin", "21.98M"], ["-main-windows", "scala-2.13.5.msi", "https://downloads.lightbend.com/scala/2.13.5/scala-2.13.5.msi", "Windows (msi installer)", "130.48M"], diff --git a/_downloads/2021-05-28-2.12.14.md b/_downloads/2021-05-28-2.12.14.md index b0eaa3bc2..d2f5ce5f6 100644 --- a/_downloads/2021-05-28-2.12.14.md +++ b/_downloads/2021-05-28-2.12.14.md @@ -7,6 +7,7 @@ release_date: "May 28, 2021" show_resources: "true" permalink: /download/2.12.14.html requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires Java 8 or later, available here." +license: Apache License, Version 2.0 resources: [ ["-main-unixsys", "scala-2.12.14.tgz", "https://downloads.lightbend.com/scala/2.12.14/scala-2.12.14.tgz", "Mac OS X, Unix, Cygwin", "20.11M"], ["-main-windows", "scala-2.12.14.msi", "https://downloads.lightbend.com/scala/2.12.14/scala-2.12.14.msi", "Windows (msi installer)", "125.83M"], diff --git a/_downloads/2021-09-14-2.12.15.md b/_downloads/2021-09-14-2.12.15.md index 8f470d8a0..c105ff44c 100644 --- a/_downloads/2021-09-14-2.12.15.md +++ b/_downloads/2021-09-14-2.12.15.md @@ -7,6 +7,7 @@ release_date: "September 14, 2021" show_resources: "true" permalink: /download/2.12.15.html requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires Java 8 or later, available here." +license: Apache License, Version 2.0 resources: [ ["-main-unixsys", "scala-2.12.15.tgz", "https://downloads.lightbend.com/scala/2.12.15/scala-2.12.15.tgz", "Mac OS X, Unix, Cygwin", "20.11M"], ["-main-windows", "scala-2.12.15.msi", "https://downloads.lightbend.com/scala/2.12.15/scala-2.12.15.msi", "Windows (msi installer)", "125.48M"], diff --git a/_downloads/2021-11-01-2.13.7.md b/_downloads/2021-11-01-2.13.7.md index f9c48e188..804da18ed 100644 --- a/_downloads/2021-11-01-2.13.7.md +++ b/_downloads/2021-11-01-2.13.7.md @@ -7,6 +7,7 @@ release_date: "November 01, 2021" show_resources: "true" permalink: /download/2.13.7.html requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires Java 8 or later, available here." +license: Apache License, Version 2.0 resources: [ ["-main-unixsys", "scala-2.13.7.tgz", "https://downloads.lightbend.com/scala/2.13.7/scala-2.13.7.tgz", "Mac OS X, Unix, Cygwin", "22.64M"], ["-main-windows", "scala-2.13.7.msi", "https://downloads.lightbend.com/scala/2.13.7/scala-2.13.7.msi", "Windows (msi installer)", "134.43M"], diff --git a/_downloads/2022-01-12-2.13.8.md b/_downloads/2022-01-12-2.13.8.md index f8a5199e1..807cd548f 100644 --- a/_downloads/2022-01-12-2.13.8.md +++ b/_downloads/2022-01-12-2.13.8.md @@ -7,6 +7,7 @@ release_date: "January 12, 2022" show_resources: "true" permalink: /download/2.13.8.html requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires Java 8 or later, available here." +license: Apache License, Version 2.0 resources: [ ["-main-unixsys", "scala-2.13.8.tgz", "https://downloads.lightbend.com/scala/2.13.8/scala-2.13.8.tgz", "Mac OS X, Unix, Cygwin", "22.65M"], ["-main-windows", "scala-2.13.8.msi", "https://downloads.lightbend.com/scala/2.13.8/scala-2.13.8.msi", "Windows (msi installer)", "134.43M"], diff --git a/_includes/download-resource-list.html b/_includes/download-resource-list.html index aee048048..3c17ffcf4 100644 --- a/_includes/download-resource-list.html +++ b/_includes/download-resource-list.html @@ -1,6 +1,39 @@ -
+
-

Other Releases

+

Other resources

+ +

You can find the installer download links for other operating systems, as well as documentation and source code + archives for Scala {{page.release_version}} below.

+ + + + + + + {% unless page.dont_show_sizes %} + + {% endunless %} + + + + + {% for resource in page.resources %} + + + + {% unless page.dont_show_sizes %} + + {% endunless %} + + {% endfor %} + +
ArchiveSystemSize
+ + {{ resource[1] }} + + {{ resource[3] }}{{ resource[4] }}
+ +

Other Releases

You can find the links to prior versions or the latest development version below. To see a detailed list of changes for each version of Scala please refer to the changelog.

@@ -8,44 +41,14 @@

Other Releases

Note that different major releases of Scala (e.g. Scala 2.11.x and Scala 2.12.x) are not binary compatible with each other.

- -

Other resources

- -

You can find the installer download links for other operating systems, as well as documentation and source code archives for Scala {{page.release_version}} below.

- - - - - - {% unless page.dont_show_sizes %} - - {% endunless %} - - - -{% for resource in page.resources %} - - - - {% unless page.dont_show_sizes %} - - {% endunless %} - -{% endfor %} - -
ArchiveSystemSize
- - {{ resource[1] }} - - {{ resource[3] }}{{ resource[4] }}
diff --git a/_includes/downloads-scala2.html b/_includes/downloads-scala2.html index c731e094b..67c6c5d8e 100644 --- a/_includes/downloads-scala2.html +++ b/_includes/downloads-scala2.html @@ -1,50 +1,49 @@ -
-

Release Notes

- For a summary of important changes, see the GitHub release notes. -
(Or consult our archive of older release - notes.) +

Are you looking for another release of Scala?

+

Release Notes

+For a summary of important changes, see the GitHub release notes. +
(Or consult our archive of older release + notes.) -
- -
-
-

Recommended Download

-
- - - Get Started With Scala - -
-
-
-
-
-
-

Other ways to download Scala

- -

Or are you looking for previous releases of Scala?

-
+
+
+

Ways to Install This Release

+
- {% include download-resource-list.html %}

License

-

The Scala distribution is released under the {{page.license}}.

+

The Scala {{ page.release_version }} distribution is released under the {{page.license}}.

diff --git a/_includes/downloads-scala3.html b/_includes/downloads-scala3.html index 9141e3a03..ab78fd9a6 100644 --- a/_includes/downloads-scala3.html +++ b/_includes/downloads-scala3.html @@ -1,4 +1,6 @@ -Scala binaries for {{page.release_version}} are available at github. +

Are you looking for another release of Scala?

+
+

Scala binaries for {{page.release_version}} are available at github.

Release Notes

For a summary of important changes, see the Release Notes notes.)
-
- -
-
-

Recommended Download

-
- - - Get Started With Scala - -
-
-
-
-
-
-

Other ways to download Scala

-
    -
  • - Using Coursier CLI, run:
    - cs install scala:{{page.release_version}} && cs install scalac:{{page.release_version}}. -
    • -
  • - Download the Scala binaries for {{page.release_version}} at github. -
    Need help running the binaries? -
    • -
  • Using SDKMAN!, you can easily install the latest version of Scala on any platform by running the following command:
    - sdk install scala -
    • -
  • On macOS you can also use Homebrew and run the following commands:
    - brew update
    brew install lampepfl/brew/dotty
    • -
  • Use Scastie to run single-file Scala programs in your browser using multiple Scala compilers; the production Scala 2.x compilers, Scala.js, Scala 3, and Typelevel Scala. Save and share executable Scala code snippets.
    • -
-

Or are you looking for previous releases of Scala?

-
+
+

Ways to Install This Release

+
    +
  • + Using Coursier + CLI, run:
    + cs install scala:{{page.release_version}} && cs install scalac:{{page.release_version}}. +
    • +
  • + Download the Scala binaries for {{page.release_version}} at github. +
    Need help running the + binaries? +
    • +
  • Using SDKMAN!, you can easily install + the latest version of Scala on any platform by running the following command:
    + sdk install scala +
    • +
  • On macOS you can also use Homebrew and run the following commands:
    + brew update
    brew install lampepfl/brew/dotty +
    • +
  • Use Scastie to run single-file Scala programs in + your browser using multiple Scala compilers; the production Scala 2.x compilers, Scala.js, Scala 3, and Typelevel + Scala. Save and share executable Scala code snippets.
    • +

License

-

The Scala distribution is released under the {{page.license}}.

+

The Scala {{ page.release_version }} distribution is released under the {{page.license}}.

diff --git a/download/scala2.md b/download/scala2.md deleted file mode 100644 index 80b5871fb..000000000 --- a/download/scala2.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -layout: downloadpage -title: Download Scala 2 - -release_version: 2.13.8 -release_date: "January 12, 2022" -show_resources: "true" -other_releases: [ - ["maintenance_version", "Latest 2.12.x maintenance release", 2.12.15, "September 14, 2021"], - ["maintenance_version", "Last 2.11.x maintenance release", 2.11.12, "November 9, 2017"], - ["maintenance_version", "Last 2.10.x maintenance release", 2.10.7, "November 9, 2017"] -] -requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires Java 8 or later, available here." -license: Apache License, Version 2.0 -resources: [ - ["-main-unixsys", "scala-2.13.8.tgz", "https://downloads.lightbend.com/scala/2.13.8/scala-2.13.8.tgz", "Mac OS X, Unix, Cygwin", "22.65M"], - ["-main-windows", "scala-2.13.8.msi", "https://downloads.lightbend.com/scala/2.13.8/scala-2.13.8.msi", "Windows (msi installer)", "134.43M"], - ["-non-main-sys", "scala-2.13.8.zip", "https://downloads.lightbend.com/scala/2.13.8/scala-2.13.8.zip", "Windows", "22.69M"], - ["-non-main-sys", "scala-2.13.8.deb", "https://downloads.lightbend.com/scala/2.13.8/scala-2.13.8.deb", "Debian", "654.12M"], - ["-non-main-sys", "scala-2.13.8.rpm", "https://downloads.lightbend.com/scala/2.13.8/scala-2.13.8.rpm", "RPM package", "134.67M"], - ["-non-main-sys", "scala-docs-2.13.8.txz", "https://downloads.lightbend.com/scala/2.13.8/scala-docs-2.13.8.txz", "API docs", "60.19M"], - ["-non-main-sys", "scala-docs-2.13.8.zip", "https://downloads.lightbend.com/scala/2.13.8/scala-docs-2.13.8.zip", "API docs", "115.17M"], - ["-non-main-sys", "scala-sources-2.13.8.tar.gz", "https://github.com/scala/scala/archive/v2.13.8.tar.gz", "Sources", "7.5M"] -] ---- diff --git a/download/scala3.md b/download/scala3.md deleted file mode 100644 index c33d422f0..000000000 --- a/download/scala3.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -layout: downloadpage -title: Download Scala 3 - -release_version: 3.1.1 -release_date: "February 1, 2022" -license: Apache License, Version 2.0 ---- From 74c454de10fc34838a3cd11a314a55404dd4a3f4 Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Mon, 28 Feb 2022 13:56:53 +0100 Subject: [PATCH 3/4] add redirects from scala2/3 pages --- _data/scala-releases.yml | 12 ++++++------ download/index.md | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/_data/scala-releases.yml b/_data/scala-releases.yml index f0315b241..9a0dcc011 100644 --- a/_data/scala-releases.yml +++ b/_data/scala-releases.yml @@ -10,11 +10,11 @@ title: Latest 2.12.x maintenance release version: 2.12.15 release_date: September 14, 2021 -- category: "maintenance_version" - title: "Last 2.11.x maintenance release" +- category: maintenance_version + title: Last 2.11.x maintenance release version: 2.11.12 - release_date: "November 9, 2017" -- category: "maintenance_version" - title: "Last 2.10.x maintenance release" + release_date: November 9, 2017 +- category: maintenance_version + title: Last 2.10.x maintenance release version: 2.10.7 - release_date: "November 9, 2017" + release_date: November 9, 2017 diff --git a/download/index.md b/download/index.md index 94d584dbf..379d49b67 100644 --- a/download/index.md +++ b/download/index.md @@ -1,6 +1,9 @@ --- layout: download title: Download +redirect_from: + - /download/scala2.html + - /download/scala3.html advancedtutorials: - title: "Scala 3 documentation" From 9fe8fe6aea956cee9413a09500cfe392c0d8ab93 Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Mon, 28 Feb 2022 14:04:34 +0100 Subject: [PATCH 4/4] include other releases on scala 3 page --- _includes/download-resource-list.html | 2 ++ _includes/downloads-scala3.html | 1 + 2 files changed, 3 insertions(+) diff --git a/_includes/download-resource-list.html b/_includes/download-resource-list.html index 3c17ffcf4..c4ae4252d 100644 --- a/_includes/download-resource-list.html +++ b/_includes/download-resource-list.html @@ -1,5 +1,6 @@
+{% if page.resources.size > 0 %}

Other resources

You can find the installer download links for other operating systems, as well as documentation and source code @@ -32,6 +33,7 @@

Other resources

{% endfor %} +{% endif %}

Other Releases

diff --git a/_includes/downloads-scala3.html b/_includes/downloads-scala3.html index ab78fd9a6..214c413ee 100644 --- a/_includes/downloads-scala3.html +++ b/_includes/downloads-scala3.html @@ -36,6 +36,7 @@

Ways to Install This Release

Scala. Save and share executable Scala code snippets.
+ {% include download-resource-list.html %}

License

The Scala {{ page.release_version }} distribution is released under the {{page.license}}.