Skip to content

Commit d777f92

Browse files
committed
Merge branch 'master' of github.com:scala/scala-lang
2 parents 5149bd6 + 82da88a commit d777f92

File tree

9 files changed

+71
-31
lines changed

9 files changed

+71
-31
lines changed

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
title: The Scala Programming Language
22

3-
scalaversion: "2.12.2"
3+
scalaversion: "2.12.3"
44

55
baseurl: ""
66
markdown: kramdown

_data/common.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,3 @@ texts:
1616
scalaSupportersTitle: Scala Center is supported by
1717
frontpageMarker: "Scala began life in 2003, created by Martin Odersky and his research group at EPFL, next to Lake Geneva and the Alps, in Lausanne, Switzerland. Scala has since grown into a mature open source programming language, used by hundreds of thousands of developers, and is developed and maintained by scores of people all over the world."
1818
booksBy: "by"
19-
20-
copyrightText: "Copyright © 2002-2016 École Polytechnique Fédérale <br>Lausanne (EPFL) Lausanne, Switzerland"

_downloads/2017-07-26-2.12.3.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
title: Scala 2.12.3
3+
start: 26 July 2017
4+
layout: downloadpage
5+
release_version: 2.12.3
6+
release_date: "July 26, 2017"
7+
show_resources: "true"
8+
permalink: /download/2.12.3.html
9+
requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires Java 8 or later, available <a href='http://www.java.com/'>here</a>."
10+
resources: [
11+
["-main-unixsys", "scala-2.12.3.tgz", "https://downloads.lightbend.com/scala/2.12.3/scala-2.12.3.tgz", "Mac OS X, Unix, Cygwin", ""],
12+
["-main-windows", "scala-2.12.3.msi", "https://downloads.lightbend.com/scala/2.12.3/scala-2.12.3.msi", "Windows (msi installer)", ""],
13+
["-non-main-sys", "scala-2.12.3.zip", "https://downloads.lightbend.com/scala/2.12.3/scala-2.12.3.zip", "Windows", ""],
14+
["-non-main-sys", "scala-2.12.3.deb", "https://downloads.lightbend.com/scala/2.12.3/scala-2.12.3.deb", "Debian", ""],
15+
["-non-main-sys", "scala-2.12.3.rpm", "https://downloads.lightbend.com/scala/2.12.3/scala-2.12.3.rpm", "RPM package", ""],
16+
["-non-main-sys", "scala-docs-2.12.3.txz", "https://downloads.lightbend.com/scala/2.12.3/scala-docs-2.12.3.txz", "API docs", ""],
17+
["-non-main-sys", "scala-docs-2.12.3.zip", "https://downloads.lightbend.com/scala/2.12.3/scala-docs-2.12.3.zip", "API docs", ""],
18+
["-non-main-sys", "scala-sources-2.12.3.tar.gz", "https://github.com/scala/scala/archive/v2.12.3.tar.gz", "Sources", ""]
19+
]
20+
---

_includes/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{% endfor %}
1212
</div>
1313
<div class="site-footer-bottom">
14-
<p>{{site.data.common.copyrightText}}</p>
14+
<p>Copyright © 2002-{{ site.time | date:"%Y" }} École Polytechnique Fédérale <br>Lausanne (EPFL) Lausanne, Switzerland</p>
1515
<img src="/resources/img/frontpage/scala-logo-white.png" alt="">
1616
</div>
1717
</div>
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
post-type: announcement
3+
permalink: /news/2.12.3
4+
title: "Scala 2.12.3 is now available!"
5+
---
6+
[Scala 2.12.3](https://github.com/scala/scala/releases/tag/v2.12.3) is now available.
7+
8+
Compiler performance has [improved significantly](http://developer.lightbend.com/blog/2017-06-12-faster-scala-compiler/) and is now [automatically benchmarked](https://scala-ci.typesafe.com/grafana/) after each change.
9+
10+
A new [optimizer setting](https://github.com/scala/scala/pull/5964) `-opt-inline-from` limits the classes from which the inliner will copy code. `scalac -opt-inline-from:help` provides [detailed help](https://gist.github.com/retronym/29932ea76712ff374d1363c9eda6eabe).
11+
12+
The presentation compiler has [improved support for implicit macros](https://github.com/scala/scala/pull/5929), which should improve the experience with libraries based on Shapeless. It also has [better support](https://github.com/scala/scala/pull/5927) for code completion for dependently typed methods.
13+
14+
For all the details, refer to the [release notes](https://github.com/scala/scala/releases/tag/v2.12.3) on GitHub.

documentation/getting-started.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ includeTOC: true
1010
These tutorials will get you writing Scala code as quickly as possible. Choose one set of tutorials depending on whether you prefer to work in the command line or in an IDE.
1111

1212
## You prefer working in the command line
13-
* [Getting Started with Scala and sbt in the Command Line](documentation/getting-started-sbt-track/getting-started-with-scala-and-sbt-in-the-command-line.html)
14-
* [Testing Scala with sbt and ScalaTest in the Command Line](documentation/getting-started-sbt-track/testing-scala-with-sbt-in-the-command-line.html)
13+
* [Getting Started with Scala and sbt in the Command Line](/documentation/getting-started-sbt-track/getting-started-with-scala-and-sbt-in-the-command-line.html)
14+
* [Testing Scala with sbt and ScalaTest in the Command Line](/documentation/getting-started-sbt-track/testing-scala-with-sbt-in-the-command-line.html)
1515

1616
## You prefer working in an IDE
17-
* [Getting Started with Scala in IntelliJ](documentation/getting-started-intellij-track/getting-started-with-scala-in-intellij.html)
18-
* [Building a Scala Project with IntelliJ and sbt](documentation/getting-started-intellij-track/building-a-scala-project-with-intellij-and-sbt.html)
19-
* [Testing Scala in IntelliJ with ScalaTest](documentation/getting-started-intellij-track/testing-scala-in-intellij-with-scalatest.html)
17+
* [Getting Started with Scala in IntelliJ](/documentation/getting-started-intellij-track/getting-started-with-scala-in-intellij.html)
18+
* [Building a Scala Project with IntelliJ and sbt](/documentation/getting-started-intellij-track/building-a-scala-project-with-intellij-and-sbt.html)
19+
* [Testing Scala in IntelliJ with ScalaTest](/documentation/getting-started-intellij-track/testing-scala-in-intellij-with-scalatest.html)
2020

2121
## Next Steps
2222
Once you've finished these tutorials, check out
2323
* [The Tour of Scala](http://docs.scala-lang.org/tutorials/tour/tour-of-scala.html)
24-
* [Guides](documentation/guides.html)
25-
* [Learning Resources](documentation/learn) including books and online courses
24+
* [Guides](http://docs.scala-lang.org/overviews)
25+
* [Learning Resources](/documentation/learn.html) including books and online courses
2626

2727
## Getting Help
28-
Visit out our [community](community/) page for more answers to your questions and to reach out for help.
28+
Visit out our [community](/community) page for more answers to your questions and to reach out for help.

documentation/reference.md

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ includeTOC: true
77
---
88

99
## Latest releases
10-
* Scala 2.12.2
11-
* [Library API](http://www.scala-lang.org/api/2.12.2/)
12-
* [Compiler API](http://www.scala-lang.org/api/2.12.2/scala-compiler/)
13-
* [Reflection API](http://www.scala-lang.org/api/2.12.2/scala-reflect/#scala.reflect.package)
10+
* Scala 2.12.3
11+
* [Library API](http://www.scala-lang.org/api/2.12.3/)
12+
* [Compiler API](http://www.scala-lang.org/api/2.12.3/scala-compiler/)
13+
* [Reflection API](http://www.scala-lang.org/api/2.12.3/scala-reflect/#scala.reflect.package)
1414
* Scala Modules
15-
* [XML API](http://www.scala-lang.org/api/2.12.2/scala-xml/#scala.xml.package)
16-
* [Parser Combinators API](http://www.scala-lang.org/api/2.12.2/scala-parser-combinators/)
17-
* [Swing API](http://www.scala-lang.org/api/2.12.2/scala-swing/#scala.swing.package)
15+
* [XML API](http://www.scala-lang.org/api/2.12.3/scala-xml/#scala.xml.package)
16+
* [Parser Combinators API](http://www.scala-lang.org/api/2.12.3/scala-parser-combinators/)
17+
* [Swing API](http://www.scala-lang.org/api/2.12.3/scala-swing/#scala.swing.package)
1818
* Scala 2.11.11
1919
* [Library API](http://www.scala-lang.org/api/2.11.11/)
2020
* [Compiler API](http://www.scala-lang.org/api/2.11.11/scala-compiler/)
@@ -40,6 +40,14 @@ includeTOC: true
4040
* [Compiler API](http://www.scala-lang.org/files/archive/nightly/2.13.x/api/2.13.x/scala-compiler/)
4141

4242
## Previous releases
43+
* Scala 2.12.2
44+
* [Library API](http://www.scala-lang.org/api/2.12.2/)
45+
* [Compiler API](http://www.scala-lang.org/api/2.12.2/scala-compiler/)
46+
* [Reflection API](http://www.scala-lang.org/api/2.12.2/scala-reflect/#scala.reflect.package)
47+
* Scala Modules
48+
* [XML API](http://www.scala-lang.org/api/2.12.2/scala-xml/#scala.xml.package)
49+
* [Parser Combinators API](http://www.scala-lang.org/api/2.12.2/scala-parser-combinators/)
50+
* [Swing API](http://www.scala-lang.org/api/2.12.2/scala-swing/#scala.swing.package)
4351
* Scala 2.12.1
4452
* [Library API](http://www.scala-lang.org/api/2.12.1/)
4553
* [Compiler API](http://www.scala-lang.org/api/2.12.1/scala-compiler/)

download/index.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
layout: downloadpage
33
title: Download
4-
release_version: 2.12.2
5-
release_date: "April 18, 2017"
4+
release_version: 2.12.3
5+
release_date: "July 26, 2017"
66
show_resources: "true"
77
other_releases: [
88
["development_version", "Current 2.13.x milestone", 2.13.0-M1, "April 18, 2017"],
@@ -11,14 +11,14 @@ other_releases: [
1111
]
1212
requirements: "Scala 2.12 requires version 8 of the <a href='http://www.java.com/'>Java platform</a>. Older Scala versions are compatible with Java 6 and up. Java 9 is not yet supported."
1313
resources: [
14-
["-main-unixsys", "scala-2.12.2.tgz", "https://downloads.lightbend.com/scala/2.12.2/scala-2.12.2.tgz", "Mac OS X, Unix, Cygwin", "18.69M"],
15-
["-main-windows", "scala-2.12.2.msi", "https://downloads.lightbend.com/scala/2.12.2/scala-2.12.2.msi", "Windows (msi installer)", "126.44M"],
16-
["-non-main-sys", "scala-2.12.2.zip", "https://downloads.lightbend.com/scala/2.12.2/scala-2.12.2.zip", "Windows", "18.73M"],
17-
["-non-main-sys", "scala-2.12.2.deb", "https://downloads.lightbend.com/scala/2.12.2/scala-2.12.2.deb", "Debian", "145.14M"],
18-
["-non-main-sys", "scala-2.12.2.rpm", "https://downloads.lightbend.com/scala/2.12.2/scala-2.12.2.rpm", "RPM package", "125.88M"],
19-
["-non-main-sys", "scala-docs-2.12.2.txz", "https://downloads.lightbend.com/scala/2.12.2/scala-docs-2.12.2.txz", "API docs", "56.51M"],
20-
["-non-main-sys", "scala-docs-2.12.2.zip", "https://downloads.lightbend.com/scala/2.12.2/scala-docs-2.12.2.zip", "API docs", "109.80M"],
21-
["-non-main-sys", "scala-sources-2.12.2.tar.gz", "https://github.com/scala/scala/archive/v2.12.2.tar.gz", "Sources", ""]
14+
["-main-unixsys", "scala-2.12.3.tgz", "https://downloads.lightbend.com/scala/2.12.3/scala-2.12.3.tgz", "Mac OS X, Unix, Cygwin", ""],
15+
["-main-windows", "scala-2.12.3.msi", "https://downloads.lightbend.com/scala/2.12.3/scala-2.12.3.msi", "Windows (msi installer)", ""],
16+
["-non-main-sys", "scala-2.12.3.zip", "https://downloads.lightbend.com/scala/2.12.3/scala-2.12.3.zip", "Windows", ""],
17+
["-non-main-sys", "scala-2.12.3.deb", "https://downloads.lightbend.com/scala/2.12.3/scala-2.12.3.deb", "Debian", ""],
18+
["-non-main-sys", "scala-2.12.3.rpm", "https://downloads.lightbend.com/scala/2.12.3/scala-2.12.3.rpm", "RPM package", ""],
19+
["-non-main-sys", "scala-docs-2.12.3.txz", "https://downloads.lightbend.com/scala/2.12.3/scala-docs-2.12.3.txz", "API docs", ""],
20+
["-non-main-sys", "scala-docs-2.12.3.zip", "https://downloads.lightbend.com/scala/2.12.3/scala-docs-2.12.3.zip", "API docs", ""],
21+
["-non-main-sys", "scala-sources-2.12.3.tar.gz", "https://github.com/scala/scala/archive/v2.12.3.tar.gz", "Sources", ""]
2222
]
2323
---
2424

index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gettingStarted:
1212
mainTitle: "Download"
1313
mainUrl: "/download"
1414
subtitle: "Getting Started"
15-
subtitleLink: "/documentation/getting-started/"
15+
subtitleLink: "/documentation/getting-started.html"
1616
links:
1717
- title: "Milestones, nightlies, etc."
1818
url: "/download/index.html#other-releases"
@@ -31,7 +31,7 @@ apiDocs:
3131
- title: "Language Specification"
3232
url: "http://scala-lang.org/files/archive/spec/2.12/"
3333

34-
currentScalaVersion: "2.12.2"
34+
currentScalaVersion: "2.12.3"
3535

3636
# Scala backends
3737
scalaBackends:

0 commit comments

Comments
 (0)