Skip to content

Commit 3debae0

Browse files
i10416i10416
committed
Merge branch 'master' into fix/16459-xml-parse-regression
2 parents 1fc27df + a20027f commit 3debae0

File tree

4 files changed

+9
-16
lines changed

4 files changed

+9
-16
lines changed

‎.github/workflows/lts-backport.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
fetch-depth: 0
1717
- uses: coursier/cache-action@v6
18-
- uses: VirtusLab/scala-cli-setup@v1.1.1
18+
- uses: VirtusLab/scala-cli-setup@v1.1.2
1919
- run: scala-cli ./project/scripts/addToBackportingProject.scala -- ${{ github.sha }}
2020
env:
2121
GRAPHQL_API_TOKEN: ${{ secrets.GRAPHQL_API_TOKEN }}

‎compiler/src/dotty/tools/dotc/core/Definitions.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,7 @@ class Definitions {
993993

994994
// Annotation base classes
995995
@tu lazy val AnnotationClass: ClassSymbol = requiredClass("scala.annotation.Annotation")
996-
@tu lazy val StaticAnnotationClass: ClassSymbol = requiredClass("scala.annotation.StaticAnnotation")
996+
// @tu lazy val StaticAnnotationClass: ClassSymbol = requiredClass("scala.annotation.StaticAnnotation")
997997
@tu lazy val RefiningAnnotationClass: ClassSymbol = requiredClass("scala.annotation.RefiningAnnotation")
998998
@tu lazy val JavaAnnotationClass: ClassSymbol = requiredClass("java.lang.annotation.Annotation")
999999

@@ -1015,7 +1015,6 @@ class Definitions {
10151015
@tu lazy val ImplicitNotFoundAnnot: ClassSymbol = requiredClass("scala.annotation.implicitNotFound")
10161016
@tu lazy val InlineParamAnnot: ClassSymbol = requiredClass("scala.annotation.internal.InlineParam")
10171017
@tu lazy val ErasedParamAnnot: ClassSymbol = requiredClass("scala.annotation.internal.ErasedParam")
1018-
@tu lazy val InvariantBetweenAnnot: ClassSymbol = requiredClass("scala.annotation.internal.InvariantBetween")
10191018
@tu lazy val MainAnnot: ClassSymbol = requiredClass("scala.main")
10201019
@tu lazy val MappedAlternativeAnnot: ClassSymbol = requiredClass("scala.annotation.internal.MappedAlternative")
10211020
@tu lazy val MigrationAnnot: ClassSymbol = requiredClass("scala.annotation.migration")
@@ -1027,7 +1026,7 @@ class Definitions {
10271026
@tu lazy val SourceFileAnnot: ClassSymbol = requiredClass("scala.annotation.internal.SourceFile")
10281027
@tu lazy val ScalaSignatureAnnot: ClassSymbol = requiredClass("scala.reflect.ScalaSignature")
10291028
@tu lazy val ScalaLongSignatureAnnot: ClassSymbol = requiredClass("scala.reflect.ScalaLongSignature")
1030-
@tu lazy val ScalaStrictFPAnnot: ClassSymbol = requiredClass("scala.annotation.strictfp")
1029+
// @tu lazy val ScalaStrictFPAnnot: ClassSymbol = requiredClass("scala.annotation.strictfp")
10311030
@tu lazy val ScalaStaticAnnot: ClassSymbol = requiredClass("scala.annotation.static")
10321031
@tu lazy val SerialVersionUIDAnnot: ClassSymbol = requiredClass("scala.SerialVersionUID")
10331032
@tu lazy val TailrecAnnot: ClassSymbol = requiredClass("scala.annotation.tailrec")
@@ -1055,7 +1054,6 @@ class Definitions {
10551054
@tu lazy val FunctionalInterfaceAnnot: ClassSymbol = requiredClass("java.lang.FunctionalInterface")
10561055
@tu lazy val TargetNameAnnot: ClassSymbol = requiredClass("scala.annotation.targetName")
10571056
@tu lazy val VarargsAnnot: ClassSymbol = requiredClass("scala.annotation.varargs")
1058-
@tu lazy val SinceAnnot: ClassSymbol = requiredClass("scala.annotation.since")
10591057
@tu lazy val ReachCapabilityAnnot = requiredClass("scala.annotation.internal.reachCapability")
10601058
@tu lazy val RequiresCapabilityAnnot: ClassSymbol = requiredClass("scala.annotation.internal.requiresCapability")
10611059
@tu lazy val RetainsAnnot: ClassSymbol = requiredClass("scala.annotation.retains")

‎project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ object Build {
101101
* set to 3.1.3. If it is going to be 3.1.0, it must be set to the latest
102102
* 3.0.x release.
103103
*/
104-
val previousDottyVersion = "3.4.0-RC1"
104+
val previousDottyVersion = "3.4.0-RC3"
105105

106106
/** Version against which we check binary compatibility. */
107107
val ltsDottyVersion = "3.3.0"

‎project/MiMaFilters.scala

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ object MiMaFilters {
77
// Only exceptional cases should be added here.
88

99
// Breaking changes since last reference version
10-
Build.previousDottyVersion -> Seq(
11-
// This language feature was in 3.4.0-RC1 but will be removed in 3.4.0-RC2
12-
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language#deprecated.ascriptionVarargsUnpacking"),
13-
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$deprecated$ascriptionVarargsUnpacking$"),
14-
),
10+
Build.previousDottyVersion -> Seq.empty,
1511

1612
// Breaking changes since last LTS
1713
Build.ltsDottyVersion -> Seq(
@@ -32,11 +28,6 @@ object MiMaFilters {
3228
val LibraryForward: Map[String, Seq[ProblemFilter]] = Map(
3329
// Additions that require a new minor version of the library
3430
Build.previousDottyVersion -> Seq(
35-
// This language feature is not in 3.4.0-RC1 but will be added in 3.4.0-RC2
36-
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.5-migration"),
37-
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.5"),
38-
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E5$"),
39-
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E5$minusmigration$"),
4031
),
4132

4233
// Additions since last LTS
@@ -57,11 +48,15 @@ object MiMaFilters {
5748
ProblemFilters.exclude[MissingClassProblem]("scala.quoted.Quotes$reflectModule$ValOrDefDefMethods"),
5849
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E4$"),
5950
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E4$minusmigration$"),
51+
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E5$"),
52+
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E5$minusmigration$"),
6053
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$experimental$clauseInterleaving$"),
6154
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$experimental$relaxedExtensionImports$"),
6255
ProblemFilters.exclude[MissingClassProblem]("scala.scalajs.runtime.AnonFunctionXXL"),
6356
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.4-migration"),
6457
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.4"),
58+
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.5-migration"),
59+
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.5"),
6560
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language#experimental.clauseInterleaving"),
6661
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language#experimental.relaxedExtensionImports"),
6762
),

0 commit comments

Comments
 (0)