@@ -95,8 +95,8 @@ object Build {
95
95
* Reference version should track the latest version pushed to Maven:
96
96
* - In main branch it should be the last RC version
97
97
* - In release branch it should be the last stable release
98
- *
99
- * Warning: Change of this variable needs to be consulted with `expectedTastyVersion`
98
+ *
99
+ * Warning: Change of this variable needs to be consulted with `expectedTastyVersion`
100
100
*/
101
101
val referenceVersion = " 3.6.3-RC1"
102
102
@@ -106,8 +106,8 @@ object Build {
106
106
*
107
107
* Should only be referred from `dottyVersion` or settings/tasks requiring simplified version string,
108
108
* eg. `compatMode` or Windows native distribution version.
109
- *
110
- * Warning: Change of this variable might require updating `expectedTastyVersion`
109
+ *
110
+ * Warning: Change of this variable might require updating `expectedTastyVersion`
111
111
*/
112
112
val developedVersion = " 3.6.4"
113
113
@@ -119,13 +119,13 @@ object Build {
119
119
* During final, stable release is set exactly to `developedVersion`.
120
120
*/
121
121
val baseVersion = s " $developedVersion-RC1 "
122
-
123
- /** The version of TASTY that should be emitted, checked in runtime test
124
- * For defails on how TASTY version should be set see related discussions:
122
+
123
+ /** The version of TASTY that should be emitted, checked in runtime test
124
+ * For defails on how TASTY version should be set see related discussions:
125
125
* - https://github.com/scala/scala3/issues/13447#issuecomment-912447107
126
126
* - https://github.com/scala/scala3/issues/14306#issuecomment-1069333516
127
127
* - https://github.com/scala/scala3/pull/19321
128
- *
128
+ *
129
129
* Simplified rules, given 3.$minor.$patch = $developedVersion
130
130
* - Major version is always 28
131
131
* - TASTY minor version:
@@ -1058,7 +1058,6 @@ object Build {
1058
1058
// compiler is updated.
1059
1059
// Then, the next step is to enable flexible types by default and reduce the use of
1060
1060
// `unsafeNulls`.
1061
- scalacOptions ++= Seq (" -Yno-flexible-types" ),
1062
1061
packageAll := {
1063
1062
(`scala3-compiler` / packageAll).value ++ Seq (
1064
1063
" scala3-compiler" -> (Compile / packageBin).value.getAbsolutePath,
@@ -2505,7 +2504,7 @@ object Build {
2505
2504
case Bootstrapped => commonBootstrappedSettings
2506
2505
})
2507
2506
}
2508
-
2507
+
2509
2508
/* Tests TASTy version invariants during NIGHLY, RC or Stable releases */
2510
2509
def checkReleasedTastyVersion (): Unit = {
2511
2510
lazy val (scalaMinor, scalaPatch, scalaIsRC) = baseVersion.split(" \\ .|-" ).take(4 ) match {
@@ -2518,19 +2517,19 @@ object Build {
2518
2517
case Array (" 28" , minor, " experimental" , _) => (minor.toInt, true )
2519
2518
case other => sys.error(s " Invalid TASTy version string: $expectedTastyVersion" )
2520
2519
}
2521
-
2520
+
2522
2521
if (isNightly) {
2523
2522
assert(tastyIsExperimental, " TASTY needs to be experimental in nightly builds" )
2524
2523
val expectedTastyMinor = if (scalaPatch == 0 ) scalaMinor else scalaMinor + 1
2525
2524
assert(tastyMinor == expectedTastyMinor, " Invalid TASTy minor version" )
2526
2525
}
2527
-
2526
+
2528
2527
if (isRelease) {
2529
2528
assert(scalaMinor == tastyMinor, " Minor versions of TASTY vesion and Scala version should match in release builds" )
2530
2529
if (scalaIsRC && scalaPatch == 0 )
2531
2530
assert(tastyIsExperimental, " TASTy should be experimental when releasing a new minor version RC" )
2532
2531
else
2533
- assert(! tastyIsExperimental, " Stable version cannot use experimental TASTY" )
2532
+ assert(! tastyIsExperimental, " Stable version cannot use experimental TASTY" )
2534
2533
}
2535
2534
}
2536
2535
}
0 commit comments