From d2954f73ceb2fcdb1fefff92c59f8a2bc2076f17 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Fri, 28 May 2021 12:50:49 +1000 Subject: [PATCH 1/2] Release 2.12.14 --- _config.yml | 2 +- _overviews/jdk-compatibility/overview.md | 12 ++++++------ api/all.md | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/_config.yml b/_config.yml index 9cfd7aa6ea..ea13ad3eae 100644 --- a/_config.yml +++ b/_config.yml @@ -16,7 +16,7 @@ keywords: - Guide scala-version: 2.13.6 -scala-212-version: 2.12.13 +scala-212-version: 2.12.14 scala-3-version: 3.0.0 scala-3-plugin-version: 0.5.1 diff --git a/_overviews/jdk-compatibility/overview.md b/_overviews/jdk-compatibility/overview.md index 06d8040c7f..880c4a4614 100644 --- a/_overviews/jdk-compatibility/overview.md +++ b/_overviews/jdk-compatibility/overview.md @@ -12,12 +12,12 @@ Sometimes new JVM and JDK (Java Development Kit) versions require us to update S | JDK version | Minimum Scala versions | Recommended Scala versions | |:-----------:|:---------------------------------|:-----------------------------------------------------------| -| 17 | see below | see below -| 16 | 2.13.5, 2.12.14 (forthcoming) | 2.13.6, 2.12.14 (forthcoming) -| 13, 14, 15 | 2.13.2, 2.12.11 | 2.13.6, 2.12.13 | -| 12 | 2.13.1, 2.12.9 | 2.13.6, 2.12.13 | -| 11 | 2.13.0, 2.12.4, 2.11.12 | 2.13.6, 2.12.13, 2.11.12 | -| 8 | 2.13.0, 2.12.0, 2.11.0, 2.10.2 | 2.13.6, 2.12.13, 2.11.12, 2.10.7 | +| 17 | 2.13.6, 2.12.14 (see below) | 2.13.6, 2.12.14 (see below) +| 16 | 2.13.5, 2.12.14 | 2.13.6, 2.12.14 +| 13, 14, 15 | 2.13.2, 2.12.11 | 2.13.6, 2.12.14 | +| 12 | 2.13.1, 2.12.9 | 2.13.6, 2.12.14 | +| 11 | 2.13.0, 2.12.4, 2.11.12 | 2.13.6, 2.12.14, 2.11.12 | +| 8 | 2.13.0, 2.12.0, 2.11.0, 2.10.2 | 2.13.6, 2.12.14, 2.11.12, 2.10.7 | | 6, 7 | 2.11.0, 2.10.0 | 2.11.12, 2.10.7 | Even when a version combination isn't listed as supported, most features may still work. (But Scala 2.12+ definitely doesn't work at all on JDK 6 or 7.) diff --git a/api/all.md b/api/all.md index 6d47741a2a..29b3d9dd99 100644 --- a/api/all.md +++ b/api/all.md @@ -10,14 +10,14 @@ includeTOC: true * [Library API](https://www.scala-lang.org/api/2.13.6/) * [Compiler API](https://www.scala-lang.org/api/2.13.6/scala-compiler/scala/) * [Reflection API](https://www.scala-lang.org/api/2.13.6/scala-reflect/scala/reflect/) -* Scala 2.12.13 - * [Library API](https://www.scala-lang.org/api/2.12.13/) - * [Compiler API](https://www.scala-lang.org/api/2.12.13/scala-compiler/scala/) - * [Reflection API](https://www.scala-lang.org/api/2.12.13/scala-reflect/scala/reflect/) +* Scala 2.12.14 + * [Library API](https://www.scala-lang.org/api/2.12.14/) + * [Compiler API](https://www.scala-lang.org/api/2.12.14/scala-compiler/scala/) + * [Reflection API](https://www.scala-lang.org/api/2.12.14/scala-reflect/scala/reflect/) * Scala Modules - * [XML API](https://www.scala-lang.org/api/2.12.13/scala-xml/scala/xml/) - * [Parser Combinators API](https://www.scala-lang.org/api/2.12.13/scala-parser-combinators/scala/util/parsing/) - * [Swing API](https://www.scala-lang.org/api/2.12.13/scala-swing/scala/swing/) + * [XML API](https://www.scala-lang.org/api/2.12.14/scala-xml/scala/xml/) + * [Parser Combinators API](https://www.scala-lang.org/api/2.12.14/scala-parser-combinators/scala/util/parsing/) + * [Swing API](https://www.scala-lang.org/api/2.12.14/scala-swing/scala/swing/) * Scala 2.11.12 * [Library API](https://www.scala-lang.org/api/2.11.12/) * [Compiler API](https://www.scala-lang.org/api/2.11.12/scala-compiler/) From 0ecf54c69d817ae2f7137ed219e0f270e96cc793 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Fri, 28 May 2021 17:49:57 +1000 Subject: [PATCH 2/2] Restore 2.12.13 links in previous releases section --- api/all.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api/all.md b/api/all.md index 29b3d9dd99..a1f8ed297b 100644 --- a/api/all.md +++ b/api/all.md @@ -82,6 +82,10 @@ https://scala-ci.typesafe.com/artifactory/scala-integration/org/scala-lang/ * [Library API](https://www.scala-lang.org/api/2.13.0/) * [Compiler API](https://www.scala-lang.org/api/2.13.0/scala-compiler/scala/) * [Reflection API](https://www.scala-lang.org/api/2.13.0/scala-reflect/scala/reflect/) +* Scala 2.12.13 + * [Library API](https://www.scala-lang.org/api/2.12.13/) + * [Compiler API](https://www.scala-lang.org/api/2.12.13/scala-compiler/scala/) + * [Reflection API](https://www.scala-lang.org/api/2.12.13/scala-reflect/scala/reflect/) * Scala 2.12.12 * [Library API](https://www.scala-lang.org/api/2.12.12/) * [Compiler API](https://www.scala-lang.org/api/2.12.12/scala-compiler/scala/)