Add Scala 2.13 support #275
Conversation
…atype OSS releases) Use https instead of http for JGit resolver, otherwise sbt gives security warnings. See also: https://www.scala-sbt.org/1.x/docs/Resolvers.html#Predefined+resolvers
rtyley
force-pushed
the
add-scala-2.13-support
branch
from
c22bd81
to
d40b1da
Compare
| @@ -67,7 +67,7 @@ private[twitter4s] class OAuth1Provider(consumerToken: ConsumerToken, accessToke | |||
| val method = request.method.name.urlEncoded | |||
| val baseUrl = request.uri.endpoint.urlEncoded | |||
| val oauthParams = oauth2Params.map { | |||
| case (k, v) => | |||
| case (k: String, v: String) => | |||
| if (k == "oauth_callback") k -> v.urlEncoded | |||
| else k -> v | |||
| } | |||
There was a problem hiding this comment.
Scala 2.13 Maps actually have a new updatedWith() method for performing this operation!
So when support for 2.11 & 2.12 is dropped, this code can become a bit smaller: ✨
val oauthParams = oauth2Params.updatedWith("oauth_callback")(_.map(_.urlEncoded))
There was a problem hiding this comment.
Thanks, I'll keep it in mind when 2.11 & 2.12 will no longer be in the picture :)
| @@ -18,7 +18,7 @@ trait Client extends OAuthClient { | |||
| protected def sendAndReceive[T](request: HttpRequest, f: HttpResponse => Future[T])( | |||
| implicit system: ActorSystem, | |||
| materializer: Materializer): Future[T] = { | |||
| implicit val _ = request | |||
| implicit val r: HttpRequest = request | |||
There was a problem hiding this comment.
Underscore (_) is no longer a valid identifier for vals, so we have to give it a valid name (even if it's just r) - see also scala/bug#10384, scala/bug#7691 & scala/scala#6218.
There was a problem hiding this comment.
oh nice! I didb't know :)
| @@ -30,7 +30,7 @@ private[twitter4s] class OAuth1Provider(consumerToken: ConsumerToken, accessToke | |||
| val params = basicOAuth2Params(callback) | |||
| for { | |||
| signature <- oauth1Signature(params) | |||
| } yield (params + signature).mapValues(_.urlEncoded) | |||
| } yield (params + signature).mapValues(_.urlEncoded).toMap | |||
There was a problem hiding this comment.
Map.mapValues() now returns a MapView rather than a Map - we usually want a Map though, so we can just add in a .toMap to the end of the expression - it's harmless in Scala 2.12, and allows the code to compile in Scala 2.13.
Map.mapValues() itself is deprecated in Scala 2.13, but using the new recommended alternative doesn't work natively in Scala 2.12.
See also scala/bug#10919& scala/scala#7014.
| @@ -42,6 +42,6 @@ trait BodyEncoder { | |||
|
|
|||
| // TODO - improve performance with Macros? | |||
| private def asMap(cc: Product): Map[String, Any] = | |||
| cc.getClass.getDeclaredFields.map(_.getName).zip(cc.productIterator.to).toMap | |||
| cc.getClass.getDeclaredFields.map(_.getName).zip(cc.productIterator.toSeq).toMap | |||
There was a problem hiding this comment.
.to can no longer infer what resulting collection type to produce - this is part of CanBuildFrom going away in Scala 2.13:
https://www.scala-lang.org/blog/2018/06/13/scala-213-collections.html#life-without-canbuildfrom
rtyley
force-pushed
the
add-scala-2.13-support
branch
from
d40b1da
to
2a7e8b3
Compare
This project now compiles with Scala 2.13 by default, while still cross-compiling to Scala 2.12 & 2.11. Although Scala 2.13.1 has been released, this change sticks with 2.13.0, as `scoverage` has not yet released an update compatible with 2.13.1: scoverage/sbt-scoverage#295 scoverage/scalac-scoverage-plugin#283 scoverage/sbt-scoverage#299 Migration issues addressed with the update to Scala 2.13: ### Underscore (`_`) is no longer a valid identifer for `val`s Using underscore like this is no longer allowed... ``` implicit val _ = ... ``` ...we have to give the `val` a valid name (even if it's just `v`): ``` implicit val v = ... ``` See also: * scala/bug#10384 * scala/bug#7691 * scala/scala#6218 ### `Map.mapValues()` now returns a `MapView` rather than a `Map` We usually want a `Map`, so we can just add in a `.toMap` to the end of the expression - it's harmless in Scala 2.12, and allows the code to compile in Scala 2.13. `Map.mapValues()` itself is deprecated in Scala 2.13, but using the new recommended alternative doesn't work in Scala 2.12. https://docs.scala-lang.org/overviews/core/collections-migration-213.html#what-are-the-breaking-changes See also: * scala/bug#10919 * scala/scala#7014 ### `.to` can no longer infer what resulting collection type you want This is all part of `CanBuildFrom` going away in Scala 2.13: https://www.scala-lang.org/blog/2018/06/13/scala-213-collections.html#life-without-canbuildfrom
rtyley
force-pushed
the
add-scala-2.13-support
branch
from
2a7e8b3
to
34571e8
Compare
Codecov Report
@@ Coverage Diff @@
## master #275 +/- ##
==========================================
- Coverage 92.68% 92.55% -0.14%
==========================================
Files 77 76 -1
Lines 1176 1142 -34
Branches 10 9 -1
==========================================
- Hits 1090 1057 -33
+ Misses 86 85 -1
Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Hi @rtyley,
thank you very much for your super useful contribution!!!! :D
LGTM
I'll try to release a new version as soon as possible
|
Thanks so much, we really appreciate it! |
|
twitter4s 6.2 is on its way to maven central! |
This PR updates
twitter4sto compile with Scala 2.13 by default, while still cross-compiling to Scala 2.12 & 2.11.Although Scala 2.13.1 has been released, this change sticks with 2.13.0, as
scoveragehas not yet released an update compatible with that latest version (see scoverage/sbt-scoverage#295, scoverage/sbt-scoverage#299) - the current latest release ofscoverage, 1.6.0, only works with Scala 2.13.0.Migration issues addressed with this update:
_) is no longer a valid identifer forvalsMap.mapValues()now returns aMapViewrather than aMap.tocan no longer infer what resulting collection type you want