Skip to content

unfork Akka for 2.13 #851

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

unfork Akka for 2.13 #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01bec4a
wip
SethTisue Feb 1, 2019
b3eb7c5
Merge remote-tracking branch 'origin/2.13.x' into unfork-akka
SethTisue Feb 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions configs/community.dbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,8 +490,15 @@ build += {
]
}

// 2.13: we're forked, and the fork is behind what we use in 2.12,
// but we should probably just leave it alone until the Akka team publishes for 2.13.0-M5
// frozen (January 2019) at v2.5.20. this repo is volatile (very
// frequent commits) and when it needs to be rebuilt, the testing
// takes a long time (especially akka-more) and the downstream
// rebuilding takes a long time too. so in general we want to
// freeze at a tag (preferably) or SHA (if we must)
// also forked (January 2019), based off v2.5.20, for JDK 11 friendliness,
// see https://github.com/scala/community-builds/pull/832 ; and also
// because of January 2019 changes to ScalaTest on 3.0.x branch that are
// source-incompatible when seen from Java (Akka uses ScalaTest from Java)
${vars.base} {
name: "akka"
uri: ${vars.uris.akka-uri}
Expand Down
2 changes: 1 addition & 1 deletion configs/project-refs.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ vars.uris: {
akka-http-uri: "https://github.com/scalacommunitybuild/akka-http.git#community-build-2.12" # was akka, master
akka-persistence-cassandra-uri: "https://github.com/scalacommunitybuild/akka-persistence-cassandra.git#community-build-2.12" # was akka, 2a53c6a0a1f64
akka-persistence-jdbc-uri: "https://github.com/dnvriend/akka-persistence-jdbc.git"
akka-uri: "https://github.com/SethTisue/akka.git#community-build-2.13" # was MasseGuillaume, 2.13.0-M4
akka-uri: "https://github.com/scalacommunitybuild/akka.git#community-build-2.12"
algebra-uri: "https://github.com/typelevel/algebra.git"
argonaut-shapeless-uri: "https://github.com/alexarchambault/argonaut-shapeless.git"
argonaut-uri: "https://github.com/argonaut-io/argonaut.git"
Expand Down
1 change: 0 additions & 1 deletion report/Report.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ object SuccessReport {

val expectedToFail = Set[String](
"airframe",
"akka",
"base64",
"blaze", // as of Feb 1, doesn't look a 2.13 upgrade has been attempted
"boopickle",
Expand Down