Skip to content

Commit fd35e0b

Browse files
WojciechMazurWojciechMazur
authored
[chore] Build settings for Scala 3.7.1 development (#22786)
* Set reference version to `3.7.0-RC1 ` * Set developed version to `3.7.1` * Set mimaPreviousDottyVersion to 3.7.0-RC1 * Update MiMa filters
2 parents 3fe9304 + 24fc36b commit fd35e0b

File tree

3 files changed

+22
-15
lines changed

3 files changed

+22
-15
lines changed

‎project/Build.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ object Build {
103103
*
104104
* Warning: Change of this variable needs to be consulted with `expectedTastyVersion`
105105
*/
106-
val referenceVersion = "3.6.4"
106+
val referenceVersion = "3.7.0-RC1"
107107

108108
/** Version of the Scala compiler targeted in the current release cycle
109109
* Contains a version without RC/SNAPSHOT/NIGHTLY specific suffixes
@@ -114,7 +114,7 @@ object Build {
114114
*
115115
* Warning: Change of this variable might require updating `expectedTastyVersion`
116116
*/
117-
val developedVersion = "3.7.0"
117+
val developedVersion = "3.7.1"
118118

119119
/** The version of the compiler including the RC prefix.
120120
* Defined as common base before calculating environment specific suffixes in `dottyVersion`
@@ -134,7 +134,7 @@ object Build {
134134
* Simplified rules, given 3.$minor.$patch = $developedVersion
135135
* - Major version is always 28
136136
* - TASTY minor version:
137-
* - in main (NIGHTLY): {if $patch == 0 then $minor else ${minor + 1}}
137+
* - in main (NIGHTLY): {if $patch == 0 || ${referenceVersion.matches(raw"3.$minor.0-RC\d")} then $minor else ${minor + 1}}
138138
* - in release branch is always equal to $minor
139139
* - TASTY experimental version:
140140
* - in main (NIGHTLY) is always experimental
@@ -178,7 +178,7 @@ object Build {
178178
* - `3.(M-1).0` if `P = 0`
179179
* 3.6.2 is an exception from this rule - 3.6.0 was a broken release, 3.6.1 was hotfix (unstable) release
180180
*/
181-
val mimaPreviousDottyVersion = "3.6.2"
181+
val mimaPreviousDottyVersion = "3.7.0-RC1"
182182

183183
/** LTS version against which we check binary compatibility.
184184
*
@@ -452,7 +452,7 @@ object Build {
452452
"Automatic-Module-Name" -> s"${dottyOrganization.replaceAll("-",".")}.${moduleName.value.replaceAll("-",".")}"
453453
),
454454

455-
// add extraDevelocityCacheInputFiles in cache key components
455+
// add extraDevelocityCacheInputFiles in cache key components
456456
Compile / compile / buildcache.develocityTaskCacheKeyComponents +=
457457
(Compile / extraDevelocityCacheInputFiles / outputFileStamps).taskValue,
458458
Test / test / buildcache.develocityTaskCacheKeyComponents +=

‎project/MiMaFilters.scala‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@ object MiMaFilters {
88
val ForwardsBreakingChanges: Map[String, Seq[ProblemFilter]] = Map(
99
// Additions that require a new minor version of the library
1010
Build.mimaPreviousDottyVersion -> Seq(
11-
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language#experimental.betterFors"),
12-
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$experimental$betterFors$"),
13-
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language#experimental.quotedPatternsWithPolymorphicFunctions"),
14-
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$experimental$quotedPatternsWithPolymorphicFunctions$"),
15-
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.runtime.Patterns.higherOrderHoleWithTypes"),
16-
ProblemFilters.exclude[MissingClassProblem]("scala.annotation.internal.preview"),
17-
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language#experimental.packageObjectValues"),
18-
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$experimental$packageObjectValues$"),
1911
),
2012

2113
// Additions since last LTS
@@ -33,9 +25,11 @@ object MiMaFilters {
3325
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeLambdaMethods.paramVariances"),
3426
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.dealiasKeepOpaques"),
3527
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.reverse"),
28+
ProblemFilters.exclude[MissingClassProblem]("scala.annotation.publicInBinary"),
3629
ProblemFilters.exclude[MissingClassProblem]("scala.annotation.internal.AssignedNonLocally"),
3730
ProblemFilters.exclude[MissingClassProblem]("scala.annotation.internal.CaptureChecked"),
3831
ProblemFilters.exclude[MissingClassProblem]("scala.annotation.internal.reachCapability"),
32+
ProblemFilters.exclude[MissingClassProblem]("scala.annotation.internal.preview"),
3933
ProblemFilters.exclude[MissingClassProblem]("scala.annotation.unchecked.uncheckedCaptures"),
4034
ProblemFilters.exclude[MissingClassProblem]("scala.quoted.Quotes$reflectModule$ValOrDefDefMethods"),
4135
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E4$"),
@@ -69,16 +63,29 @@ object MiMaFilters {
6963
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#MethodTypeMethods.methodTypeKind"),
7064
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#MethodTypeModule.apply"),
7165
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#SymbolMethods.isSuperAccessor"),
66+
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#ImplicitsModule.searchIgnoring"),
67+
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Expr.summonIgnoring"),
68+
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.runtime.Patterns.higherOrderHoleWithTypes"),
7269
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language#experimental.namedTuples"),
7370
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language#experimental.modularity"),
7471
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language#experimental.betterMatchTypeExtractors"),
7572
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$experimental$betterMatchTypeExtractors$"),
7673
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$experimental$modularity$"),
7774
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$experimental$namedTuples$"),
75+
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language#experimental.betterFors"),
76+
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$experimental$betterFors$"),
77+
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language#experimental.quotedPatternsWithPolymorphicFunctions"),
78+
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$experimental$quotedPatternsWithPolymorphicFunctions$"),
79+
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language#experimental.packageObjectValues"),
80+
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$experimental$packageObjectValues$"),
7881
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.7-migration"),
7982
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.7"),
8083
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E7$"),
8184
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E7$minusmigration$"),
85+
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.8-migration"),
86+
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.8"),
87+
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E8$"),
88+
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E8$minusmigration$"),
8289
),
8390
)
8491

‎tasty/test/dotty/tools/tasty/BuildTastyVersionTest.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import TastyBuffer._
77

88
// Tests ensuring TASTY version emitted by compiler is matching expected TASTY version
99
class BuildTastyVersionTest {
10-
10+
1111
val CurrentTastyVersion = TastyVersion(TastyFormat.MajorVersion, TastyFormat.MinorVersion, TastyFormat.ExperimentalVersion)
1212

1313
// Needs to be defined in build Test/envVars
@@ -21,6 +21,6 @@ class BuildTastyVersionTest {
2121
case s"$major.$minor" if minor.forall(_.isDigit) => TastyVersion(major.toInt, minor.toInt, 0)
2222
case other => fail(s"Invalid TASTY version string: $other")
2323
}
24-
assertEquals(CurrentTastyVersion, expectedVersion)
24+
assertEquals(expectedVersion, CurrentTastyVersion)
2525
}
2626
}

0 commit comments

Comments
 (0)