diff --git a/akka-actor-tests/src/test/scala/akka/AkkaVersionSpec.scala b/akka-actor-tests/src/test/scala/akka/AkkaVersionSpec.scala index 5a5ab40efe..f207f30bff 100644 --- a/akka-actor-tests/src/test/scala/akka/AkkaVersionSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/AkkaVersionSpec.scala @@ -60,25 +60,27 @@ class AkkaVersionSpec extends AnyWordSpec with Matchers { } } - "succeed if Akka version is SNAPSHOT" in { + "succeed if current Akka version is SNAPSHOT" in { AkkaVersion.require("AkkaVersionSpec", "2.5.6", "2.5-SNAPSHOT") } - "succeed if Akka version is timestamped SNAPSHOT" in { + "succeed if current Akka version is timestamped SNAPSHOT" in { AkkaVersion.require("AkkaVersionSpec", "2.5.6", "2.5-20180109-133700") } + "succeed if required Akka version is SNAPSHOT" in { + AkkaVersion.require("AkkaVersionSpec", "2.5-SNAPSHOT", "2.5-SNAPSHOT") + } + + "succeed if required Akka version is timestamped SNAPSHOT" in { + AkkaVersion.require("AkkaVersionSpec", "2.5-20180109-133700", "2.5-20180109-133700") + } + "silently comply if current version is incomprehensible" in { // because we may want to release with weird numbers for some reason AkkaVersion.require("nonsense", "2.5.6", "nonsense") } - "fail if fed incomprehensible requirement" in { - intercept[IllegalArgumentException] { - AkkaVersion.require("AkkaVersionSpec", "nonsense", "2.5.6") - } - } - } } diff --git a/akka-actor/src/main/scala/akka/AkkaVersion.scala b/akka-actor/src/main/scala/akka/AkkaVersion.scala index bbd404b446..ede1b8cbaa 100644 --- a/akka-actor/src/main/scala/akka/AkkaVersion.scala +++ b/akka-actor/src/main/scala/akka/AkkaVersion.scala @@ -44,7 +44,7 @@ object AkkaVersion { (requiredMinorStr == currentMinorStr && requiredPatchStr.toInt > currentPatch)) throw new UnsupportedAkkaVersion( s"Current version of Akka is [$currentVersion], but $libraryName requires version [$requiredVersion]") - case _ => throw new IllegalArgumentException(s"Required version string is invalid: [$requiredVersion]") + case _ => // SNAPSHOT or unknown - you're on your own } case _ => // SNAPSHOT or unknown - you're on your own