support scala 3 build for util-test #306
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## develop #306 +/- ##
===========================================
+ Coverage 49.29% 49.30% +0.01%
===========================================
Files 322 322
Lines 18523 18522 -1
Branches 1055 1063 +8
===========================================
+ Hits 9131 9133 +2
+ Misses 9392 9389 -3
Continue to review full report at Codecov.
|
Closed
pjfanning
reviewed
Jul 20, 2022
build.sbt
Outdated
|
|
||
| val defaultScalaSettings = Seq( | ||
| scalaVersion := _scalaVersion, | ||
| crossScalaVersions := _crossScalaVersions | ||
| ) | ||
| val defaultScala3EnabledSettings = Seq( | ||
| scalaVersion := _scalaVersion, | ||
| crossScalaVersions := _crossScalaVersions ++ Seq("3.0.2-RC1") | ||
| crossScalaVersions := _crossScalaVersions ++ Seq("3.1.3") |
felixbr
force-pushed
the
util-test/scala-3
branch
from
fa80c54
to
67eea34
Compare
|
CI failed because sbt-scoverage was updated to 2.0.0 here. Once |
|
@pjfanning, the scoverage thing should be fixed now. |
felixbr
force-pushed
the
util-test/scala-3
branch
from
67eea34
to
49de52c
Compare
|
I've rebased this onto |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR builds on #304 so that should be merged before this one imo.
There is no Scala 3 compatible version for
"org.scalatestplus" %% "mockito-1-10", so I had to use"org.scalatestplus" %% "mockito-3-4" % "3.2.9.0". This means I upgraded Scalatest to3.2.9and Mockito to3.4.x. This doesn't really break any code inutil-testbut consumers ofutil-test(e.g.finagleortwitter-server) might also have to upgrade those test dependencies.Since Scala 3 requires Scalatest
3.2.xand Mockito1.10.xis ancient at this point, I find this acceptable.The second point is that I couldn't find a direct replacement for
org.mockito.exceptions.Reporterfrom Mockito1.10.x. Since it was only used to throw a predefined exception, I inlined the error message. I hope this is acceptable.