Skip to content
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

Merge 2.12.x to 2.13.x [ci: last-only] #10233

Merged
merged 29 commits into from Dec 2, 2022

Conversation

SethTisue
Copy link
Member

@SethTisue SethTisue commented Dec 2, 2022

no user-visible changes here. it's all testing and build stuff

motivation to do the merge now:

  • make sure the new signature polymorphic method tests pass on 2.13 too, while they're fresh in my mind
  • get on sbt 1.8.0, on general principle
PICK * 0bd21e6da0 - Merge pull request 10232 from SethTisue/signature-polymorphic-fixups
PICK * 86fb452d0c - Merge pull request 10195 from SethTisue/more-signature-polymorphic-tests

PICK * a3f745a743 - Merge pull request 10223 from scala-steward/update/2.12.x/sbt-header-5.9.0
PICK * 95e8e3f9f2 - Merge pull request 10224 from scala-steward/update/2.12.x/sbt-1.8.0
PICK * f432db6925 - Merge pull request 10215 from scala-steward/update/scalacheck-1.17.0

SKIP * 9c573bbd46 - Merge pull request 10216 from lrytz/t12673-backport (3 weeks ago)

PICK * 2a1a73759f - Merge pull request 10210 from scala-steward/update/2.12.x/sbt-header-5.8.0
PICK * b428d2d32f - Merge pull request 10206 from SethTisue/allow-manual-github-actions-runs

SKIP * 0749999f69 - Merge pull request 10185 from Philippus/update/asm9.4-scala212

Philippus and others added 29 commits November 1, 2022 11:47
Given

```
public class A {
  protected static class AI { }
}
public class B extends A {
  public static class BI extends AI { }
}
```

The owner of `AI` is the module class `A$`, the owner of `BI` is the
module class `B$`. When checking if the protected `AI` can be accessed
in `B$`, we need to navigate from `B$` to `B`. The inheritance chain
is not reflected in the module classes.
the old test code was wrong (in one place it said `Int`, whereas
`String` is correct)

but apparently the wrapper that ran the test was wrong too, so the
test wasn't testing anything

happily, the wrapping is no longer needed (as we don't need to
check the JDK version -- and if someday we do, we now have better
support for that in partest, with `javaVersion`)
…hic-tests

fix and expand testing of signature polymorphic methods
…ixups

spec and test tweaks for signature polymorphic methods
@scala-jenkins scala-jenkins added this to the 2.13.11 milestone Dec 2, 2022
@SethTisue SethTisue added the internal not resulting in user-visible changes (build changes, tests, internal cleanups) label Dec 2, 2022
@lrytz lrytz merged commit bb28d9b into scala:2.13.x Dec 2, 2022
@som-snytt
Copy link
Contributor

I'm a user and it's visible to me.

@SethTisue SethTisue deleted the merge-2.12-to-2.13-20221201 branch December 2, 2022 13:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
internal not resulting in user-visible changes (build changes, tests, internal cleanups)
Projects
None yet
7 participants