Skip to content

Commit ad6e194

Browse files
committed
Fix presentation compiler testcases
1 parent 0bfa1af commit ad6e194

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

project/Build.scala

+13-13
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ object Build {
9595
* Reference version should track the latest version pushed to Maven:
9696
* - In main branch it should be the last RC version
9797
* - 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`
100100
*/
101101
val referenceVersion = "3.6.3-RC1"
102102

@@ -106,8 +106,8 @@ object Build {
106106
*
107107
* Should only be referred from `dottyVersion` or settings/tasks requiring simplified version string,
108108
* 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`
111111
*/
112112
val developedVersion = "3.6.4"
113113

@@ -119,13 +119,13 @@ object Build {
119119
* During final, stable release is set exactly to `developedVersion`.
120120
*/
121121
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:
125125
* - https://github.com/scala/scala3/issues/13447#issuecomment-912447107
126126
* - https://github.com/scala/scala3/issues/14306#issuecomment-1069333516
127127
* - https://github.com/scala/scala3/pull/19321
128-
*
128+
*
129129
* Simplified rules, given 3.$minor.$patch = $developedVersion
130130
* - Major version is always 28
131131
* - TASTY minor version:
@@ -1447,7 +1447,7 @@ object Build {
14471447

14481448
lazy val `scala3-presentation-compiler` = project.in(file("presentation-compiler"))
14491449
.withCommonSettings(Bootstrapped)
1450-
.dependsOn(`scala3-compiler-bootstrapped`, `scala3-library-bootstrapped`, `scala3-presentation-compiler-testcases`)
1450+
.dependsOn(`scala3-compiler-bootstrapped`, `scala3-library-bootstrapped`, `scala3-presentation-compiler-testcases` % "test->test")
14511451
.settings(presentationCompilerSettings)
14521452
.settings(scala3PresentationCompilerBuildInfo)
14531453
.settings(
@@ -2505,7 +2505,7 @@ object Build {
25052505
case Bootstrapped => commonBootstrappedSettings
25062506
})
25072507
}
2508-
2508+
25092509
/* Tests TASTy version invariants during NIGHLY, RC or Stable releases */
25102510
def checkReleasedTastyVersion(): Unit = {
25112511
lazy val (scalaMinor, scalaPatch, scalaIsRC) = baseVersion.split("\\.|-").take(4) match {
@@ -2518,19 +2518,19 @@ object Build {
25182518
case Array("28", minor, "experimental", _) => (minor.toInt, true)
25192519
case other => sys.error(s"Invalid TASTy version string: $expectedTastyVersion")
25202520
}
2521-
2521+
25222522
if(isNightly) {
25232523
assert(tastyIsExperimental, "TASTY needs to be experimental in nightly builds")
25242524
val expectedTastyMinor = if(scalaPatch == 0) scalaMinor else scalaMinor + 1
25252525
assert(tastyMinor == expectedTastyMinor, "Invalid TASTy minor version")
25262526
}
2527-
2527+
25282528
if(isRelease) {
25292529
assert(scalaMinor == tastyMinor, "Minor versions of TASTY vesion and Scala version should match in release builds")
25302530
if (scalaIsRC && scalaPatch == 0)
25312531
assert(tastyIsExperimental, "TASTy should be experimental when releasing a new minor version RC")
25322532
else
2533-
assert(!tastyIsExperimental, "Stable version cannot use experimental TASTY")
2533+
assert(!tastyIsExperimental, "Stable version cannot use experimental TASTY")
25342534
}
25352535
}
25362536
}

0 commit comments

Comments
 (0)