From 19dcb7a687374f1ff960d5b7467b29bd6e6122c6 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Sat, 19 Oct 2024 12:49:11 +0200 Subject: [PATCH 1/4] Set base version to 3.6.2. Target 3.6.2-RC1 as next release --- project/Build.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 5b04d623f122..1b5394103769 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -93,9 +93,10 @@ object Build { val referenceVersion = "3.5.2-RC1" - val baseVersion = "3.6.1" + val baseVersion = "3.6.2" // Will be required by some automation later - val prereleaseVersion = s"$baseVersion-RC1" + // TODO: Introduce automation and handling for RC versions before 3.6.2-RC1 + // val prereleaseVersion = s"$baseVersion-RC1" // LTS or Next val versionLine = "Next" From 4be18d5b54cc499953b63257b1331bb312d97884 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Sat, 19 Oct 2024 12:52:09 +0200 Subject: [PATCH 2/4] Set referenceVersion to 3.6.1 --- project/Build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index 1b5394103769..39afb6e8658b 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -91,7 +91,7 @@ object DottyJSPlugin extends AutoPlugin { object Build { import ScaladocConfigs._ - val referenceVersion = "3.5.2-RC1" + val referenceVersion = "3.6.1" val baseVersion = "3.6.2" // Will be required by some automation later From 2a83e4cc3fbec4ac10aabeddaec9892157076027 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Sat, 19 Oct 2024 12:53:04 +0200 Subject: [PATCH 3/4] Set `mimaPreviousDottyVersion` to 3.6.1 --- project/Build.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index 39afb6e8658b..3433053629f7 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -114,8 +114,9 @@ object Build { * For a baseVersion `3.M.P` the mimaPreviousDottyVersion should be set to: * - `3.M.0` if `P > 0` * - `3.(M-1).0` if `P = 0` + * 3.6.1 is an exception from this rule - 3.6.0 was a broken release */ - val mimaPreviousDottyVersion = "3.5.0" + val mimaPreviousDottyVersion = "3.6.1" /** LTS version against which we check binary compatibility. * From d8adb6dd99491cb52b0b20288a87c37a2ad42261 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Sat, 19 Oct 2024 13:00:04 +0200 Subject: [PATCH 4/4] Move `scala/NamedTuple.scala` from boostrapped to standard sources --- library/{src-bootstrapped => src}/scala/NamedTuple.scala | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename library/{src-bootstrapped => src}/scala/NamedTuple.scala (100%) diff --git a/library/src-bootstrapped/scala/NamedTuple.scala b/library/src/scala/NamedTuple.scala similarity index 100% rename from library/src-bootstrapped/scala/NamedTuple.scala rename to library/src/scala/NamedTuple.scala