@@ -8,7 +8,7 @@ object MakeReleaseNotes {
8
8
def genPR (prevVersion : String , version : String , release : String , gitDir : String = s " ${sys.env(" HOME" )}/git/scala " ) = {
9
9
val date = new java.util.Date (release)
10
10
new MakeDownloadPage (version, date).write()
11
- MakeReleaseNotes (new java.io.File (gitDir), s " v $prevVersion" , s " v $version" , MarkDown , date)
11
+ MakeReleaseNotes (new java.io.File (gitDir), version, s " v $prevVersion" , s " v $version" , MarkDown , date)
12
12
}
13
13
14
14
def write (page : String , version : String , releaseDate : Date , ext : String ) = {
@@ -28,15 +28,15 @@ object MakeReleaseNotes {
28
28
}
29
29
}
30
30
31
- def apply (scalaDir : String , previousTag : String , currentTag : String , releaseDate : Date ) {
32
- Seq (Html , MarkDown ).foreach(fmt => apply(new java.io.File (scalaDir), previousTag, currentTag, fmt, releaseDate))
31
+ def apply (scalaDir : String , version : String , previousTag : String , currentTag : String , releaseDate : Date ) {
32
+ Seq (Html , MarkDown ).foreach(fmt => apply(new java.io.File (scalaDir), version, previousTag, currentTag, fmt, releaseDate))
33
33
}
34
- def apply (scalaDir : java.io.File , previousTag : String , currentTag : String , targetLanguage : TargetLanguage = MarkDown , releaseDate : Date = new Date ()): Unit = {
34
+ def apply (scalaDir : java.io.File , version : String , previousTag : String , currentTag : String , targetLanguage : TargetLanguage = MarkDown , releaseDate : Date = new Date ()): Unit = {
35
35
val out = targetLanguage match {
36
36
case Html => new java.io.File (" release-notes.html" )
37
37
case MarkDown => new java.io.File (s " release-notes- ${currentTag}.md " )
38
38
}
39
- val notes = makeReleaseNotes(scalaDir, previousTag, currentTag)(targetLanguage)
39
+ val notes = makeReleaseNotes(scalaDir, version, previousTag, currentTag)(targetLanguage)
40
40
write(notes, currentTag.dropWhile(_ == 'v' ), releaseDate, targetLanguage.ext)
41
41
}
42
42
@@ -62,7 +62,7 @@ object MakeReleaseNotes {
62
62
private def stripTripleDashedHtmlComments (s : String ): String =
63
63
s.replaceAll(""" (?ims)<!---.*?-->""" , " " )
64
64
65
- private def makeReleaseNotes (scalaDir : java.io.File , previousTag : String , currentTag : String )(implicit targetLanguage : TargetLanguage ): String = {
65
+ private def makeReleaseNotes (scalaDir : java.io.File , version : String , previousTag : String , currentTag : String )(implicit targetLanguage : TargetLanguage ): String = {
66
66
def rawHandWrittenNotes (file : java.io.File = new java.io.File (s " hand-written.md " )): String = {
67
67
val lines : List [String ] = if (file.exists) {
68
68
val src = Source .fromFile(file)
@@ -102,6 +102,7 @@ object MakeReleaseNotes {
102
102
case MarkDown => s """ ---
103
103
layout: news
104
104
post-type: announcement
105
+ permalink: /news/ $version
105
106
title: "Scala ${currentTag drop 1 } is now available!"
106
107
---
107
108
${rawHandWrittenNotes()}"""
0 commit comments