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

update to sbt 1.3.x, uses coursier by default #3079

Merged
merged 3 commits into from
Sep 24, 2019
Merged

update to sbt 1.3.x, uses coursier by default #3079

merged 3 commits into from
Sep 24, 2019

Conversation

larsrh
Copy link
Contributor

@larsrh larsrh commented Sep 22, 2019

Includes & supersedes #2954, #3075, #3077.

Open problems:

  • for some reason, the BC tests won't work when Coursier is used (we can choose to ignore this)
  • see Update sbt-mima-plugin to 0.4.0 #2934 for some details on the generic signature problem, but since then a bunch of additional errors surfaced (see below, blocker)
[error]  * static method catsParallelForEitherTNestedValidated(cats.Monad,cats.kernel.Semigroup)cats.Parallel in class cats.implicits does not have a correspondent in current version
[error]    filter with: ProblemFilters.exclude[DirectMissingMethodProblem]("cats.implicits.catsParallelForEitherTNestedValidated")
[error]  * static method catsParallelForEitherTNestedParallelValidated(cats.kernel.Semigroup,cats.Parallel)cats.Parallel in class cats.implicits does not have a correspondent in current version
[error]    filter with: ProblemFilters.exclude[DirectMissingMethodProblem]("cats.implicits.catsParallelForEitherTNestedParallelValidated")
[error]  * static method catsParallelForOptionTNestedOption(cats.Parallel)cats.Parallel in class cats.implicits does not have a correspondent in current version
[error]    filter with: ProblemFilters.exclude[DirectMissingMethodProblem]("cats.implicits.catsParallelForOptionTNestedOption")
[error]  * static method catsStdEqForSortedMap(cats.kernel.Order,cats.kernel.Eq)cats.kernel.Eq in class cats.implicits does not have a correspondent in current version
[error]    filter with: ProblemFilters.exclude[DirectMissingMethodProblem]("cats.implicits.catsStdEqForSortedMap")
[error]  * static method catsStdMonoidForSortedMap(cats.kernel.Order,cats.kernel.Semigroup)cats.kernel.Monoid in class cats.implicits does not have a correspondent in current version
[error]    filter with: ProblemFilters.exclude[DirectMissingMethodProblem]("cats.implicits.catsStdMonoidForSortedMap")
[error]  * static method catsStdCommutativeMonoidForSortedMap(cats.kernel.Order,cats.kernel.CommutativeSemigroup)cats.kernel.CommutativeMonoid in class cats.implicits does not have a correspondent in current version
[error]    filter with: ProblemFilters.exclude[DirectMissingMethodProblem]("cats.implicits.catsStdCommutativeMonoidForSortedMap")
[error]  * static method catsStdHashForSortedMap(cats.kernel.Hash,cats.kernel.Order,cats.kernel.Hash)cats.kernel.Hash in class cats.implicits does not have a correspondent in current version
[error]    filter with: ProblemFilters.exclude[DirectMissingMethodProblem]("cats.implicits.catsStdHashForSortedMap")
[error]  * static method catsKernelStdSemilatticeForSortedSet(cats.kernel.Order)cats.kernel.BoundedSemilattice in class cats.implicits does not have a correspondent in current version
[error]    filter with: ProblemFilters.exclude[DirectMissingMethodProblem]("cats.implicits.catsKernelStdSemilatticeForSortedSet")

@larsrh larsrh mentioned this pull request Sep 22, 2019
@kailuowang
Copy link
Contributor

I am on my phone. I wonder what happened to those methods. Will take a look them Monday

build.sbt Show resolved Hide resolved
@larsrh larsrh mentioned this pull request Sep 22, 2019
@kailuowang
Copy link
Contributor

kailuowang commented Sep 23, 2019

Okay, these are indeed BC breakages that were missed by previous Mima versions.
Discussion can be found here
TLDR; making a public method package private in an object (in our case cats.implicts) breaks BC for Java usage. So these were not caught in the wide because only java usage exposes them.

Looks like we need to remove the package private on these methods. Shall we do them in this PR? Then we probably want to cherry pick to 2.0.x branch and release a patch.

@larsrh
Copy link
Contributor Author

larsrh commented Sep 23, 2019

Are those supposed to be deprecated? I can do that in this PR.

@kailuowang
Copy link
Contributor

Yes. Those methods were moved to somewhere else. They are kept at the original place deprecated to maintain BC. Making them package private was an extra measure (now proven invalid) for the deprecation.

build.sbt Show resolved Hide resolved
@larsrh
Copy link
Contributor Author

larsrh commented Sep 23, 2019

If the build is green, I'll rebase & reorder for easier cherry-picking.

@codecov-io
Copy link

codecov-io commented Sep 23, 2019

Codecov Report

Merging #3079 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3079   +/-   ##
=======================================
  Coverage   93.46%   93.46%           
=======================================
  Files         368      368           
  Lines        6979     6979           
  Branches      184      184           
=======================================
  Hits         6523     6523           
  Misses        456      456
Impacted Files Coverage Δ
core/src/main/scala/cats/instances/sortedSet.scala 88.23% <ø> (ø) ⬆️
core/src/main/scala/cats/data/Op.scala 77.77% <ø> (ø) ⬆️
core/src/main/scala/cats/instances/parallel.scala 0% <ø> (ø) ⬆️
core/src/main/scala/cats/instances/sortedMap.scala 84.74% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e8e6676...c3484a5. Read the comment docs.

@larsrh
Copy link
Contributor Author

larsrh commented Sep 23, 2019

Ready for review.

@fthomas
Copy link
Member

fthomas commented Sep 23, 2019

Could you also bump the sbt version in scalafix/project/build.properties?

Copy link
Contributor

@kailuowang kailuowang left a comment

Choose a reason for hiding this comment

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

Thanks very much @larsrh for taking this on.

@larsrh larsrh merged commit 5a03320 into typelevel:master Sep 24, 2019
@larsrh larsrh deleted the update/sbt-1.3.x branch September 24, 2019 07:08
@travisbrown travisbrown added this to the 2.1.0-RC1 milestone Nov 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants