Skip to content

2.13: advance Scala SHA and fix akka-stream #1025

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

Merged
SethTisue merged 2 commits into from
Dec 21, 2019
Merged

2.13: advance Scala SHA and fix akka-stream #1025

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
65c7710
advance Scala SHA and fix akka-stream
SethTisue Dec 20, 2019
142cd9a
wip
SethTisue Dec 20, 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
5 changes: 2 additions & 3 deletions nightly.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# November 11, 2019
# do not advance until we know akka-stream is green
nightly=2.13.2-bin-4f17d9e
# December 13, 2019
nightly=2.13.2-bin-1286ef4
6 changes: 3 additions & 3 deletions proj/akka.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

vars.proj.akka: ${vars.base} {
name: "akka"
uri: "https://github.com/akka/akka.git#3c1c06fb88645801638b7b9ee69b9bcc5f51bb56"
uri: "https://github.com/akka/akka.git#4908493a28f98c8db9309141b5076f27d6b020ba"

extra.sbt-version: "1.3.3" // TODO wip COMMENT ME
extra.options: [
Expand Down Expand Up @@ -33,7 +33,7 @@ vars.proj.akka: ${vars.base} {

vars.proj.akka-stream: ${vars.base} {
name: "akka-stream"
uri: "https://github.com/akka/akka.git#3c1c06fb88645801638b7b9ee69b9bcc5f51bb56"
uri: "https://github.com/akka/akka.git#4908493a28f98c8db9309141b5076f27d6b020ba"

extra.sbt-version: "1.3.3" // TODO wip COMMENT ME
extra.options: ["-Dakka.genjavadoc.enabled=false", "-Dakka.scaladoc.diagrams=false", "-Dakka.build.aggregateSamples=false", "-Dakka.test.tags.exclude=performance,timing,long-running", "-Dakka.test.multi-in-test=false"
Expand Down Expand Up @@ -73,7 +73,7 @@ vars.proj.akka-stream: ${vars.base} {
// tests, and so failures in obscure subprojects don't take out too much of the build
vars.proj.akka-more: ${vars.base} {
name: "akka-more"
uri: "https://github.com/akka/akka.git#3c1c06fb88645801638b7b9ee69b9bcc5f51bb56"
uri: "https://github.com/akka/akka.git#4908493a28f98c8db9309141b5076f27d6b020ba"

extra.sbt-version: "1.3.3" // TODO wip COMMENT ME
extra.options: ["-Dakka.genjavadoc.enabled=false", "-Dakka.scaladoc.diagrams=false", "-Dakka.build.aggregateSamples=false", "-Dakka.test.tags.exclude=performance,timing,long-running", "-Dakka.test.multi-in-test=false"
Expand Down