From 65c77101e252e7b8b0467c8d731c1646b4007a04 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Thu, 19 Dec 2019 16:19:19 -0800
Subject: [PATCH 1/2] advance Scala SHA and fix akka-stream

---
 nightly.properties | 5 ++---
 proj/akka.conf     | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/nightly.properties b/nightly.properties
index 440a3f637..ab92bb0e4 100644
--- a/nightly.properties
+++ b/nightly.properties
@@ -1,3 +1,2 @@
-# November 11, 2019
-# do not advance until we know akka-stream is green
-nightly=2.13.2-bin-4f17d9e
+# December 17, 2019
+nightly=2.13.2-bin-079713c
diff --git a/proj/akka.conf b/proj/akka.conf
index dbd5f73ed..1a45890f0 100644
--- a/proj/akka.conf
+++ b/proj/akka.conf
@@ -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: [
@@ -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"
@@ -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"

From 142cd9aaa44ed1d714aea0a5bf4225e6c8a25965 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Fri, 20 Dec 2019 15:21:49 -0800
Subject: [PATCH 2/2] wip

---
 nightly.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nightly.properties b/nightly.properties
index ab92bb0e4..5bd865f40 100644
--- a/nightly.properties
+++ b/nightly.properties
@@ -1,2 +1,2 @@
-# December 17, 2019
-nightly=2.13.2-bin-079713c
+# December 13, 2019
+nightly=2.13.2-bin-1286ef4