From f0e0e134444610f5deb113e6ab42c79794124b4e Mon Sep 17 00:00:00 2001 From: falkzoll Date: Tue, 6 Jul 2021 15:04:50 +0200 Subject: [PATCH] Resolve akka versions explicitly. (#89) - An akka upgrade in apache/openwhisk required changes here to successfully build and run the test cases. --- settings.gradle | 4 ++++ tests/build.gradle | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/settings.gradle b/settings.gradle index 4e56fd04..8eff1bf8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -31,6 +31,7 @@ gradle.ext.openwhisk = [ gradle.ext.scala = [ version: '2.12.7', + depVersion : '2.12', compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import'] ] @@ -38,3 +39,6 @@ gradle.ext.scalafmt = [ version: '1.5.0', config: new File(rootProject.projectDir, '.scalafmt.conf') ] + +gradle.ext.akka = [version : '2.6.12'] +gradle.ext.akka_http = [version : '10.2.4'] diff --git a/tests/build.gradle b/tests/build.gradle index 8596df21..e1cde3e0 100644 --- a/tests/build.gradle +++ b/tests/build.gradle @@ -43,6 +43,12 @@ dependencies { compile "org.scala-lang:scala-library:${gradle.scala.version}" compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:tests" compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:test-sources" + implementation group: 'com.typesafe.akka', name: "akka-http2-support_${gradle.scala.depVersion}", version: "${gradle.akka_http.version}" + implementation group: 'com.typesafe.akka', name: "akka-http-xml_${gradle.scala.depVersion}", version: "${gradle.akka_http.version}" + implementation group: 'com.typesafe.akka', name: "akka-discovery_${gradle.scala.depVersion}", version: "${gradle.akka.version}" + implementation group: 'com.typesafe.akka', name: "akka-protobuf_${gradle.scala.depVersion}", version: "${gradle.akka.version}" + implementation group: 'com.typesafe.akka', name: "akka-remote_${gradle.scala.depVersion}", version: "${gradle.akka.version}" + implementation group: 'com.typesafe.akka', name: "akka-cluster_${gradle.scala.depVersion}", version: "${gradle.akka.version}" } tasks.withType(ScalaCompile) {