2.13: new Scala SHA (#1483)

also: * Akka: exclude a flaky test * add scalatestplus-testng * advance cats-effect
scala · Sep 11, 2021 · 93d05a5 · 93d05a5
1 parent 34ce224
commit 93d05a5
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/community.conf b/community.conf
@@ -340,6 +340,7 @@ include "proj/scalariform.conf"
 include "proj/scalastyle.conf"
 include "proj/scalatags.conf"
 include "proj/scalatest.conf"
+include "proj/scalatestplus-testng.conf"
 include "proj/scalikejdbc.conf"
 include "proj/scallop.conf"
 include "proj/scapegoat.conf"

diff --git a/nightly.properties b/nightly.properties
@@ -1,2 +1,2 @@
-# August 27, 2021
-nightly=2.13.7-bin-072e68e
+# September 9, 2021
+nightly=2.13.7-bin-7247dfe
diff --git a/proj/akka.conf b/proj/akka.conf
@@ -35,7 +35,8 @@ vars.proj.akka: ${vars.base} {
     // prone to intermittent failure
     // LocalPubSubSpec & MessageAdapterSpec: https://github.com/akka/akka/issues/28885
     """set actorTypedTests / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "ActorContextPipeToSelfSpec.scala" || "ActorContextPipeToSelfTest.java" || "ActorContextSpec.scala" || "BubblingSampleTest.java" || "MailboxSelectorSpec.scala" || "LocalPubSubSpec.scala" || "MessageAdapterSpec.scala""""
-    """set cluster / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "ClusterSpec.scala" || "ClusterHeartbeatReceiverSpec.scala" || "ClusterMessageSerializerSpec.scala""""
+    // ClusterDeathWatchNotificationSpec: https://github.com/akka/akka/issues/30135
+    """set cluster / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "ClusterSpec.scala" || "ClusterHeartbeatReceiverSpec.scala" || "ClusterMessageSerializerSpec.scala" || "ClusterDeathWatchNotificationSpec.scala""""
     """set clusterTools / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "ClusterSingletonLeaseSpec.scala""""
     """set clusterSharding / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "SupervisionSpec.scala" || "ConcurrentStartupShardingSpec.scala" || "StartEntitySpec.scala""""
     """set clusterTyped / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "ClusterReceptionistSpec.scala""""

diff --git a/proj/cats-effect.conf b/proj/cats-effect.conf
@@ -2,9 +2,9 @@
 
 vars.proj.cats-effect: ${vars.base} {
   name: "cats-effect"
-  uri: "https://github.com/typelevel/cats-effect.git#337ad3770c3dc974b900de1b52d3d3f12245108f"
+  uri: "https://github.com/typelevel/cats-effect.git#7652ca1c765c395ff824786238ec6361cad1a52c"
 
-  extra.exclude: ["*JS", "benchmarks", "docs", "webWorkerTests"]
+  extra.exclude: ["*JS", "benchmarks", "docs"]
   extra.commands: ${vars.default-commands} [
     // otherwise sbt-gpg errors on `publish`
     "set every gpgWarnOnFailure := true"

diff --git a/proj/scalatestplus-testng.conf b/proj/scalatestplus-testng.conf
@@ -0,0 +1,7 @@
+// https://github.com/scalatest/scalatestplus-testng.git#testng-6.7/3.2.9.x
+
+vars.proj.scalatestplus-testng: ${vars.base} {
+  name: "scalatestplus-testng"
+  uri: "https://github.com/scalatest/scalatestplus-testng.git#cc859d7c3ca89b8c961bb106183cdc33423fb271"
+
+}
diff --git a/projs.conf b/projs.conf
@@ -1629,6 +1629,15 @@ build += {
   sbt-java-options: ${vars.sbt-java-options}
   projects: [${vars.proj.scalatest}]
 }
+build += {
+  space: scala.scalatestplus-testng
+  check-missing: [false, false]
+  cross-version: [disabled, standard]
+  extraction-version: ${vars.scala-version}
+  sbt-version: ${vars.sbt-version}
+  sbt-java-options: ${vars.sbt-java-options}
+  projects: [${vars.proj.scalatestplus-testng}]
+}
 build += {
   space: scala.scalikejdbc
   check-missing: [false, false]