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

Updates - Scala 2.13 & Akka 2.6.0-M3 (bp #354) #356

Merged
merged 1 commit into from
Jun 17, 2019

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 17, 2019

This is an automated backport of pull request #354 done by Mergify.io

Cherry-pick of 8a0eb3c has failed:

On branch mergify/bp/master/pr-354
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 8a0eb3c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   .travis.yml
	both modified:   build.sbt
	both modified:   play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/AhcCurlRequestLogger.scala
	both modified:   project/Dependencies.scala

no changes added to commit (use "git add" and/or "git commit -a")

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

@octonato octonato force-pushed the mergify/bp/master/pr-354 branch from c13b565 to 1cc3f7f Compare June 17, 2019 11:33
@octonato octonato changed the title Scala 2.13.0 support for 2.0.x (bp #354) Updates - Scala 2.13 & Akka 2.6.0-M3 (bp #354) Jun 17, 2019
val cachecontrol = Seq("com.typesafe.play" %% "cachecontrol" % cachecontrolVersion)

val asyncHttpClientVersion = "2.10.0"
val asyncHttpClient = Seq("org.asynchttpclient" % "async-http-client" % asyncHttpClientVersion)

val akkaVersion = "2.6.0-M2"
val akkaVersion = "2.6.0-M3"
Copy link
Contributor

@octonato octonato Jun 17, 2019

Choose a reason for hiding this comment

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

in order to have Scala 2.13 support, we must bump the Akka version as well.
Akka 2.6.0-M2 has no binaries for Scala 2.13

Seq("org.scala-lang.modules" %% "scala-xml" % scalaXmlVersion213)
} else {
Seq("org.scala-lang.modules" %% "scala-xml" % scalaXmlVersion)
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I will review this part. Seems like unnecessary

ignasi35
ignasi35 previously approved these changes Jun 17, 2019
Co-authored-by: Marcos Pereira <[email protected]>
Co-authored-by: Doug Roper <[email protected]>

(cherry picked from commit 8a0eb3c)
(cherry picked from commit 1761b49)
(cherry picked from commit 9c27797)
@octonato octonato force-pushed the mergify/bp/master/pr-354 branch from 954bb9b to 522f63f Compare June 17, 2019 14:17
@mergify mergify bot merged commit e304788 into master Jun 17, 2019
@mergify mergify bot deleted the mergify/bp/master/pr-354 branch June 17, 2019 14:24
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