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.

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

Conversation

Kordyjan
Copy link
Contributor

@Kordyjan Kordyjan commented Sep 1, 2021

This PR sets the referenceVersion and previousDottyVersion to 3.1.0-RC1 as the first release from the 3.1 versioning line.
It also sets baseVersion to 3.1.1-RC1 as it should be the version to which all new PRs should be merged to by default. I suggest that changes that we want to release in 3.1.0-RC2 should be merged/backported to release-3.1.0 branch (see #13438).

@@ -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

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

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.

@nicolasstucki
Copy link
Contributor

We can also move library/src-bootstrapped/scala/CanThrow.scala to library/src/scala/CanThrow.scala.

@nicolasstucki
Copy link
Contributor

And library/src-bootstrapped/scala/runtime/$throws.scala to library/src/scala/runtime/$throws.scala

@nicolasstucki
Copy link
Contributor

@Kordyjan this branch should not have been created in the lampepfl/dotty repo. We should only have the release branches in this repo. Do not forget to delete it once it is merged.

Copy link
Member

@dwijnand dwijnand left a comment

Choose a reason for hiding this comment

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

^

@Kordyjan Kordyjan enabled auto-merge September 2, 2021 08:36
@Kordyjan Kordyjan merged commit c574f4f into master Sep 2, 2021
@Kordyjan Kordyjan deleted the version-3.1.1-RC1 branch September 2, 2021 10:51
@Kordyjan Kordyjan added this to the 3.1.1 milestone Aug 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants