Skip to content

Commit 93d05a5

Browse files
authored
2.13: new Scala SHA (#1483)
also: * Akka: exclude a flaky test * add scalatestplus-testng * advance cats-effect
1 parent 34ce224 commit 93d05a5

File tree

6 files changed

+23
-5
lines changed

6 files changed

+23
-5
lines changed

community.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,7 @@ include "proj/scalariform.conf"
340340
include "proj/scalastyle.conf"
341341
include "proj/scalatags.conf"
342342
include "proj/scalatest.conf"
343+
include "proj/scalatestplus-testng.conf"
343344
include "proj/scalikejdbc.conf"
344345
include "proj/scallop.conf"
345346
include "proj/scapegoat.conf"

nightly.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# August 27, 2021
2-
nightly=2.13.7-bin-072e68e
1+
# September 9, 2021
2+
nightly=2.13.7-bin-7247dfe

proj/akka.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ vars.proj.akka: ${vars.base} {
3535
// prone to intermittent failure
3636
// LocalPubSubSpec & MessageAdapterSpec: https://github.com/akka/akka/issues/28885
3737
"""set actorTypedTests / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "ActorContextPipeToSelfSpec.scala" || "ActorContextPipeToSelfTest.java" || "ActorContextSpec.scala" || "BubblingSampleTest.java" || "MailboxSelectorSpec.scala" || "LocalPubSubSpec.scala" || "MessageAdapterSpec.scala""""
38-
"""set cluster / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "ClusterSpec.scala" || "ClusterHeartbeatReceiverSpec.scala" || "ClusterMessageSerializerSpec.scala""""
38+
// ClusterDeathWatchNotificationSpec: https://github.com/akka/akka/issues/30135
39+
"""set cluster / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "ClusterSpec.scala" || "ClusterHeartbeatReceiverSpec.scala" || "ClusterMessageSerializerSpec.scala" || "ClusterDeathWatchNotificationSpec.scala""""
3940
"""set clusterTools / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "ClusterSingletonLeaseSpec.scala""""
4041
"""set clusterSharding / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "SupervisionSpec.scala" || "ConcurrentStartupShardingSpec.scala" || "StartEntitySpec.scala""""
4142
"""set clusterTyped / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "ClusterReceptionistSpec.scala""""

proj/cats-effect.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
vars.proj.cats-effect: ${vars.base} {
44
name: "cats-effect"
5-
uri: "https://github.com/typelevel/cats-effect.git#337ad3770c3dc974b900de1b52d3d3f12245108f"
5+
uri: "https://github.com/typelevel/cats-effect.git#7652ca1c765c395ff824786238ec6361cad1a52c"
66

7-
extra.exclude: ["*JS", "benchmarks", "docs", "webWorkerTests"]
7+
extra.exclude: ["*JS", "benchmarks", "docs"]
88
extra.commands: ${vars.default-commands} [
99
// otherwise sbt-gpg errors on `publish`
1010
"set every gpgWarnOnFailure := true"

proj/scalatestplus-testng.conf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// https://github.com/scalatest/scalatestplus-testng.git#testng-6.7/3.2.9.x
2+
3+
vars.proj.scalatestplus-testng: ${vars.base} {
4+
name: "scalatestplus-testng"
5+
uri: "https://github.com/scalatest/scalatestplus-testng.git#cc859d7c3ca89b8c961bb106183cdc33423fb271"
6+
7+
}

projs.conf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1629,6 +1629,15 @@ build += {
16291629
sbt-java-options: ${vars.sbt-java-options}
16301630
projects: [${vars.proj.scalatest}]
16311631
}
1632+
build += {
1633+
space: scala.scalatestplus-testng
1634+
check-missing: [false, false]
1635+
cross-version: [disabled, standard]
1636+
extraction-version: ${vars.scala-version}
1637+
sbt-version: ${vars.sbt-version}
1638+
sbt-java-options: ${vars.sbt-java-options}
1639+
projects: [${vars.proj.scalatestplus-testng}]
1640+
}
16321641
build += {
16331642
space: scala.scalikejdbc
16341643
check-missing: [false, false]

0 commit comments

Comments
 (0)