Skip to content

Set up versions for development after 3.1.0-RC1 #13439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 2, 2021
Merged

Set up versions for development after 3.1.0-RC1 #13439

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af30cf9
Set up versions for development after 3.1.0-RC1
Kordyjan Sep 1, 2021
e8aed57
Move sources from library/rc-boostrapped to library/src
nicolasstucki Sep 2, 2021
3924ae7
Revert previousDottyVersion to 3.0.2
Kordyjan Sep 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ object DottyJSPlugin extends AutoPlugin {
}

object Build {
val referenceVersion = "3.1.0-RC1-bin-20210823-dd7a07a-NIGHTLY"
val referenceVersion = "3.1.0-RC1"

val baseVersion = "3.1.0-RC1"
val baseVersion = "3.1.1-RC1"

// Versions used by the vscode extension to create a new project
// This should be the latest published releases.
Expand All @@ -81,7 +81,7 @@ object Build {
* set to 3.1.3. If it is going to be 3.1.0, it must be set to the latest
* 3.0.x release.
*/
val previousDottyVersion = "3.0.2"
val previousDottyVersion = "3.1.0-RC1"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to wait until we have 3.1.0 to update this one.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will probably have to keep the MiMaFilters for now.

Copy link
Contributor Author

@Kordyjan Kordyjan Sep 1, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But then we would need to add lots of exceptions to MiMa, as it wants to check for both forward and backward compatibility between 3.0.2 and what is currently on master. It works like that because 3.1.1 is considered as a patch release and that's why it needs release from the same versioning line to be compared to.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't remember exactly why, but last time I was told that we should do it like this. As it is written in the documentation above. @smarter I believe you where the one that told me that. Is that true?

Copy link
Member

@dwijnand dwijnand Sep 2, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, ok. So I think the change do to is keep this to 3.0.2 but change baseVersion to 3.1.0-RC2 (or something 3.1.0*). That way the logic in compatMode won't start enforcing bidirectional checking.


object CompatMode {
final val BinaryCompatible = 0
Expand Down
24 changes: 0 additions & 24 deletions project/MiMaFilters.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,5 @@ import com.typesafe.tools.mima.core.ProblemFilters._

object MiMaFilters {
val Library: Seq[ProblemFilter] = Seq(
// Experimental API for saferExceptions
exclude[MissingClassProblem]("scala.CanThrow"),
exclude[MissingClassProblem]("scala.CanThrow$package"),
exclude[MissingClassProblem]("scala.CanThrow$package$"),
exclude[MissingClassProblem]("scala.unsafeExceptions"),
exclude[MissingClassProblem]("scala.unsafeExceptions$"),
exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language#experimental.saferExceptions"),
exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$experimental$saferExceptions$"),

// New APIs that will be introduced in 3.1.0
exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule.Wildcard"),
exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule.WildcardTypeTest"),
exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#SourceFileMethods.getJPath"),
exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#SourceFileMethods.name"),
exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#SourceFileMethods.path"),
exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#SourceFileMethods.getJPath"),
exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#SourceFileMethods.name"),
exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#SourceFileMethods.path"),
exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#UnapplyModule.apply"),
exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#UnapplyModule.apply"),
exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule.TypedOrTestTypeTest"),
exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule.TypedOrTest"),
exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule.TypedOrTestMethods"),
exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.isTupleN"),
)
}