stick with older monix and akka-http for now

scala · Sep 26, 2019 · df012da · df012da
1 parent 64f3158
commit df012da
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/configs/community.dbuild b/configs/community.dbuild
@@ -1241,7 +1241,8 @@ build += {
     extra.projects: ["implicitboxJVM"]
   }
 
-  // forked awaiting merge of https://github.com/monix/monix/pull/875
+  // frozen, using a contributor's fork.
+  // until the big ScalaTest move, it's difficult to find a SHA that isn't too new or too old
   ${vars.base} {
     name: "monix"
     uri:  ${vars.uris.monix-uri}

diff --git a/configs/project-refs.conf b/configs/project-refs.conf
@@ -3,7 +3,7 @@ vars.uris: {
   airframe-uri:                   "https://github.com/wvlet/airframe.git#f73a11d2ce0d3047f94ad04c26e2d890a85cac22"
   akka-http-cors-uri:             "https://github.com/lomigmegard/akka-http-cors.git#9949df54c96b800462cfb7ab530c12906ab90a1f"
   akka-http-session-uri:          "https://github.com/softwaremill/akka-http-session.git#7a95a504d33ec36137d53911da20594fd0b88c8f"
-  akka-http-uri:                  "https://github.com/scalacommunitybuild/akka-http.git#215e6744d490354ea64638123c72cc0ef4a41c50"
+  akka-http-uri:                  "https://github.com/akka/akka-http.git#8e474a2e94f54f933245396368631ceede5ae5d0"
   akka-management-uri:            "https://github.com/akka/akka-management.git#b1c54d57b081a040b6bc4e1ba377155349a95c82"
   akka-more-uri:                  "https://github.com/akka/akka.git#cb185883c86d01a36279a1d581d29234c0a15ac1"
   akka-persistence-cassandra-uri: "https://github.com/scalacommunitybuild/akka-persistence-cassandra.git#cecc6cda8b1ffa720a18e5f360f187eabddf4c1e"
@@ -85,7 +85,7 @@ vars.uris: {
   metrics-scala-uri:              "https://github.com/erikvanoosten/metrics-scala.git#bd044bd5cb7b3e54fc38464a774a98c959919c08"
   minitest-uri:                   "https://github.com/monix/minitest.git#d50927187e0a4c0e3c110cfa461c6d2d633ce6e6"
   mockito-scala-uri:              "https://github.com/mockito/mockito-scala.git#bb73ecc246accec7b091e4c44d28b551b1b3843c"
-  monix-uri:                      "https://github.com/Avasil/monix.git#cca63dbde3d8b644be81a67b64a7e4bdf6b59924"
+  monix-uri:                      "https://github.com/Avasil/monix.git#22cb6e615bb57f030dbfdf30ec5270ab96327c65"
   monocle-uri:                    "https://github.com/julien-truffaut/Monocle.git#d3104c4347727e46a5bad4dafb085a61bc8af1bb"
   mouse-uri:                      "https://github.com/typelevel/mouse.git#d20bb8825670dd91c0408ff0b94575df02c57eb2"
   multibot-uri:                   "https://github.com/OlegYch/multibot.git#99d5c76c9e6afd45b8b322166c9e0903deabc1d5"

diff --git a/configs/unfrozen-refs.conf b/configs/unfrozen-refs.conf
@@ -9,7 +9,7 @@ vars.uris: {
   akka-http-cors-uri:           "https://github.com/lomigmegard/akka-http-cors.git"
   akka-http-json-uri:           "https://github.com/hseeberger/akka-http-json.git"
   akka-http-session-uri:        "https://github.com/softwaremill/akka-http-session.git"
-  akka-http-uri:                "https://github.com/scalacommunitybuild/akka-http.git#community-build-2.13" # was akka, akka-http
+  akka-http-uri:                "https://github.com/akka/akka-http.git#8e474a2e94f54f933245"  # was master
   akka-management-uri:          "https://github.com/akka/akka-management.git"
   akka-persistence-cassandra-uri: "https://github.com/scalacommunitybuild/akka-persistence-cassandra.git#community-build-2.13"  # was akka, 2a53c6a0a1f64
   akka-persistence-jdbc-uri:    "https://github.com/dnvriend/akka-persistence-jdbc.git"
@@ -89,7 +89,7 @@ vars.uris: {
   metrics-scala-uri:            "https://github.com/erikvanoosten/metrics-scala.git#bd044bd5"  # was master
   minitest-uri:                 "https://github.com/monix/minitest.git"
   mockito-scala-uri:            "https://github.com/mockito/mockito-scala.git#release/1.x"
-  monix-uri:                    "https://github.com/Avasil/monix.git#cats-effect-2.0.0-M1-scala2.13"  # was monix, master
+  monix-uri:                    "https://github.com/Avasil/monix.git#22cb6e615bb57f030dbfdf30ec5270ab96327c65"  # was monix, master
   monocle-uri:                  "https://github.com/julien-truffaut/Monocle.git#d3104c4347727e"  # branch was cats
   mouse-uri:                    "https://github.com/typelevel/mouse.git"
   multibot-uri:                 "https://github.com/OlegYch/multibot.git"