Merge pull request #134 from adriaanm/2.11.5

2.11.5 release notes

Author: adriaanm

build.sbt

@@ -1,10 +1,10 @@
 name := "scala-release-note-generator"
 
-scalaVersion := "2.10.3"
+scalaVersion := "2.11.5"
 
 libraryDependencies += "org.pegdown" % "pegdown" % "1.2.0"
-
 libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.1"
+libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "1.0.3"
 
 {
   require(sys.props("file.encoding") == "UTF-8", "Please rerun with -Dfile.encoding=UTF-8")

hand-written.md

@@ -1,32 +1,32 @@
-We are very pleased to announce the release of Scala 2.11.4!
+We are very pleased to announce the release of Scala 2.11.5!
 
 * Get started with the [Hello Scala 2.11 template](https://typesafe.com/activator/template/hello-scala-2_11) in [Typesafe Activator](https://typesafe.com/platform/getstarted)
-* Download a distribution from [scala-lang.org](http://scala-lang.org/download/2.11.4.html)
-* Obtain it via [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.scala-lang%22%20AND%20v%3A%222.11.4%22)
+* Download a distribution from [scala-lang.org](http://scala-lang.org/download/2.11.5.html)
+* Obtain it via [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.scala-lang%22%20AND%20v%3A%222.11.5%22)
 
-Scala 2.11.4 is a bugfix release that is binary compatible with previous releases in the Scala 2.11 series.
-The changes include:
+Scala 2.11.5 is a bugfix release that is binary compatible with previous releases in the Scala 2.11 series. We would like to highlight the following changes:
 
-* Scala shell (REPL) is more friendly to Crtl+D. It leaves your terminal in a clean state and suggests using `:quit` the next
-time (see [#3902](https://github.com/scala/scala/pull/3902). Kudos to [@gourlaysama](https://github.com/gourlaysama)!
-* REPL uses different colors when printing references to vals and types. Pass `-Dscala.color` to enable that behavior (see [#3993](https://github.com/scala/scala/pull/3993)). Thanks to [@puffnfresh](https://github.com/puffnfresh)!
-* [Scala specification](http://www.scala-lang.org/files/archive/spec/2.11/) received a fair amount of love and became much more beatiful.  It has got syntax highlighting ([#3984](https://github.com/scala/scala/pull/3984)), linkable headers, and a side bar with TOC ([#3996](https://github.com/scala/scala/pull/3996)). A few final touches has been merged that fix typos and mistakes stemming from automatic Latex to Markdown conversion we've done a while ago. Thanks attention for details [@gourlaysama](https://github.com/gourlaysama), [@som-snytt](https://github.com/som-snytt) and [roberthoedicke](https://github.com/roberthoedicke)!
-* Non-deterministic pattern matching warnings has been fixed ([SI-7746](https://issues.scala-lang.org/browse/SI-7746)). Many thanks to [@gbasler](https://github.com/gbasler) for diving deep ([#3954](https://github.com/scala/scala/pull/3954])) into logical formulas constructed by our pattern matcher implementation!
+ - @heathermiller's [SI-6502 Reenables loading jars into the running REPL](https://github.com/scala/scala/pull/4051)
+ - @mpociecha's [The alternative, flat representation of classpath elements](https://github.com/scala/scala/pull/4176)
+ - @gbasler's [Avoid the 'CNF budget exceeded' exception via smarter translation into CNF](https://github.com/scala/scala/pull/4078)
+ - @adriaanm's [SAMmy: eta-expansion, overloading, existentials](https://github.com/scala/scala/pull/4101)
+ - A great number of documentation improvements -- thank you (and, to those appearing for the first time in our release notes, welcome!): @kanielc, @lymia, @stevegury, @vigdorchik, @gourlaysama, @ichoran, @retronym, @xuwei-k, @dickwall, @phaller.
 
-Compared to 2.11.2, this release resolves [54 issues](https://issues.scala-lang.org/issues/?jql=project%20%3D%20SI%20AND%20resolution%20%3D%20Fixed%20AND%20fixVersion%20in%20(%22Scala%202.11.3%22%2C%20%22Scala%202.11.4%22)%20ORDER%20BY%20component%20ASC%2C%20priority%20DESC). Out of 120, we merged 95 pull requests: [90 for 2.11.3](https://github.com/scala/scala/pulls?q=is%3Apr+is%3Amerged+milestone%3A2.11.3), and [5 for 2.11.4](https://github.com/scala/scala/pulls?q=is%3Apr+is%3Amerged+milestone%3A2.11.4).
+Compared to 2.11.4, this release resolves [74 issues](https://issues.scala-lang.org/issues/?jql=project%20%3D%20SI%20AND%20resolution%20%3D%20Fixed%20AND%20fixVersion%20in%20%28%22Scala%202.11.5%22%29%20ORDER%20BY%20component%20ASC%2C%20priority%20DESC). Out of 132, we [merged 110 pull requests](https://github.com/scala/scala/pulls?q=is%3Apr+is%3Amerged+milestone%3A2.11.5). Before upgrading, please also check the [known issues](https://issues.scala-lang.org/issues/?jql=project%20%3D%20SI%20AND%20status%3Dopen%20AND%20affectedVersion%20%3D%20%22Scala%202.11.5%22%20and%20fixVersion%20%3E%3D%20%22Scala%202.11.5%22%20ORDER%20BY%20component%20ASC%2C%20priority%20DESC) for this release.
 
-The next minor Scala 2.11 release will be available before the end of the year, or sooner if prompted by a serious issue.
+In 2015, 2.11 minor releases will be released quarterly, or sooner if prompted by a serious issue.
 
-### Do Not Use Scala 2.11.3
-Due to a [binary incompatibility](https://issues.scala-lang.org/browse/SI-8899) in Scala 2.11.3, we recommend upgrading to Scala 2.11.4, which resolves the incompatibility, as well as another [blocker issue](https://issues.scala-lang.org/browse/SI-8900) that was discovered in the days after the 2.11.3 release.
-
-We have [analyzed](https://groups.google.com/d/msg/scala-internals/SSD9BNJaFbU/rACBkHrs2JEJ) the mistakes that lead to the breakage (human error), and are taking measures to prevent this from happening again. We apologize for the inconvenience, and thank everyone who was involved in reporting and diagnosing these critical issues.
+### Scala IDE
+The current release of Scala IDE includes Scala 2.11.5 is available on the [download site](http://scala-ide.org/download/sdk.html) (or as an update to version 4.0 of the plugin).
 
 ### Available Libraries and Frameworks
 
 A large number of Scala projects have been released against Scala 2.11. Please refer to the list of [libraries and frameworks available for Scala 2.11](https://github.com/scala/make-release-notes/blob/2.11.x/projects-2.11.md).
 
-A release of the Scala IDE that includes Scala 2.11.4 is available [on their download site](http://scala-ide.org/download/milestone.html).
+### Reminder: Do Not Use Scala 2.11.3
+Due to a [binary incompatibility](https://issues.scala-lang.org/browse/SI-8899) in Scala 2.11.3, we recommend upgrading to Scala 2.11.5, which resolves the incompatibility, as well as another [blocker issue](https://issues.scala-lang.org/browse/SI-8900) that was discovered in the days after the 2.11.3 release.
+
+We have [analyzed](https://groups.google.com/d/msg/scala-internals/SSD9BNJaFbU/rACBkHrs2JEJ) the mistakes that lead to the breakage (human error), and are taking measures to prevent this from happening again. We apologize for the inconvenience, and thank everyone who was involved in reporting and diagnosing these critical issues.
 
 ### Release Notes for the Scala 2.11 Series
 
@@ -39,5 +39,5 @@ The release notes for the Scala 2.11 series, which also apply to the current min
 
 A big thank you to everyone who's helped improve Scala by reporting bugs, improving our documentation, participating in mailing lists and other public fora, and submitting and reviewing pull requests! You are all awesome.
 
-According to `git shortlog -sn --no-merges v2.11.2..v2.11.4`, 35 people contributed to this minor release:
-Lukas Rytz, Adriaan Moors, Antoine Gourlay, A. P. Marki, Jason Zaugg, Robert Hoedicke, Eugene Burmako, Rex Kerr, Max Bileschi, Brian McKenna, Grzegorz Kossakowski, Maks Atygaev, Evgeny Vereshchagin, Simon Ochsenreither, Dominik Gruntz, Masato Sogame, Gerard Basler, Dan Garrette, Artem Stasuk, David Turner, Iulian Dragos, Jeroen ter Voorde, Kato Kazuyoshi, Konstantin Fedorov, Krystian Nowak, Lukas Elmer, Malte Isberner, Paolo Giarrusso, Paweł Wiejacha, Robert Hoedicke, dgruntz, Roman Janusz, harryhuk, Michał Pociecha.
+According to `git shortlog -sn --no-merges v2.11.4..v2.11.5`, 30 people contributed to this minor release:
+Jason Zaugg, Lukas Rytz, Michał Pociecha, A. P. Marki, Antoine Gourlay, Heather Miller, Adriaan Moors, Rex Kerr, Simon Ochsenreither, Gerard Basler, Denton Cockburn, Kenji Yoshida, Ye Xianjin, Guy Dickinson, Jean-Remi Desjardins, Alissa Rao, Lukasz Piepiora, Maxim Valyanskiy, Paolo Giarrusso, Philipp Haller, Rafał Krzewski, Eugene Vigdorchik, Rui Gonçalves, Erik Erlandson, Steve Gury, Teemu Lehtinen, Tim Harper, Dick Wall, Guillaume Martres, Grzegorz Kossakowski.

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.1
+sbt.version=0.13.7

src/main/scala/MakeDownloadPage.scala

@@ -16,7 +16,7 @@ class MakeDownloadPage(version: String, releaseDate: Date = new Date()) {
   // get size of `url` without actually downloading it
   def humanSize(url: String): Future[String] = future {
     import scala.sys.process._
-    println(url)
+    println("## fetching size of "+ url)
     scala.util.Try {
       val responseHeader = Process(s"curl -m 5 --silent -D - -X HEAD $url").lines
       val contentLength = responseHeader.find(_.startsWith("Content-Length"))
@@ -30,7 +30,7 @@ class MakeDownloadPage(version: String, releaseDate: Date = new Date()) {
       case Some((status, humanSize)) if status.contains("200 OK") || status.contains("302 Found") =>
         humanSize
       case _ =>
-        println(s"warning: could not fetch $url")
+        println(s"## warning: could not fetch $url")
         ""
     }
   }

src/main/scala/MakeReleaseNotes.scala

@@ -8,7 +8,7 @@ object MakeReleaseNotes {
   def genPR(prevVersion: String, version: String, release: String, gitDir: String = s"${sys.env("HOME")}/git/scala") = {
     val date = new java.util.Date(release)
     new MakeDownloadPage(version, date).write()
-    MakeReleaseNotes(new java.io.File(gitDir), s"v$prevVersion", s"v$version", MarkDown, date)
+    MakeReleaseNotes(new java.io.File(gitDir), version, s"v$prevVersion", s"v$version", MarkDown, date)
   }
 
   def write(page: String, version: String, releaseDate: Date, ext: String) = {
@@ -22,21 +22,21 @@ object MakeReleaseNotes {
 
     if (ext == "md") {
       println(s"cp $fileName ../scala-lang/news/_posts/")
-      println(s"don't forget to update ../scala-lang/download/index.md, ../scala-lang/documentation/api.md, ../scala-lang/documentation/_config.yml")
+      println(s"# don't forget to\n${scala.util.Properties.envOrElse("EDITOR", "mate")} ../scala-lang/download/index.md ../scala-lang/documentation/api.md ../scala-lang/_config.yml")
+      println("# and, to prepare and sanity check your scala-lang PR:")
       println(s"maruku --html $fileName")
-      println("# to prepare and sanity check your scala-lang PR")
     }
   }
 
-  def apply(scalaDir: String, previousTag: String, currentTag: String, releaseDate: Date) {
-    Seq(Html, MarkDown).foreach(fmt => apply(new java.io.File(scalaDir), previousTag, currentTag, fmt, releaseDate))
+  def apply(scalaDir: String, version: String, previousTag: String, currentTag: String, releaseDate: Date) {
+    Seq(Html, MarkDown).foreach(fmt => apply(new java.io.File(scalaDir), version, previousTag, currentTag, fmt, releaseDate))
   }
-  def apply(scalaDir: java.io.File, previousTag: String, currentTag: String, targetLanguage: TargetLanguage = MarkDown, releaseDate: Date = new Date()): Unit = {
+  def apply(scalaDir: java.io.File, version: String, previousTag: String, currentTag: String, targetLanguage: TargetLanguage = MarkDown, releaseDate: Date = new Date()): Unit = {
     val out = targetLanguage match {
       case Html => new java.io.File("release-notes.html")
       case MarkDown => new java.io.File(s"release-notes-${currentTag}.md")
     }
-    val notes = makeReleaseNotes(scalaDir, previousTag, currentTag)(targetLanguage)
+    val notes = makeReleaseNotes(scalaDir, version, previousTag, currentTag)(targetLanguage)
     write(notes, currentTag.dropWhile(_ == 'v'), releaseDate, targetLanguage.ext)
   }
 
@@ -62,7 +62,7 @@ object MakeReleaseNotes {
   private def stripTripleDashedHtmlComments(s: String): String =
     s.replaceAll("""(?ims)<!---.*?-->""", "")
 
-  private def makeReleaseNotes(scalaDir: java.io.File, previousTag: String, currentTag: String)(implicit targetLanguage: TargetLanguage): String = {
+  private def makeReleaseNotes(scalaDir: java.io.File, version: String, previousTag: String, currentTag: String)(implicit targetLanguage: TargetLanguage): String = {
     def rawHandWrittenNotes(file: java.io.File = new java.io.File(s"hand-written.md")): String = {
       val lines: List[String] = if (file.exists) {
         val src = Source.fromFile(file)
@@ -102,14 +102,10 @@ object MakeReleaseNotes {
       case MarkDown => s"""---
 layout: news
 post-type: announcement
+permalink: /news/$version
 title: "Scala ${currentTag drop 1} is now available!"
 ---
-${rawHandWrittenNotes()}
-
-${renderCommitterList}
-${renderFixedIssues}
-${renderCommitList}
-      """
+${rawHandWrittenNotes()}"""
     }
 
   }