Move to akka 2.12.7.

falkzoll · falkzoll · commit 7090d577718b · 2021-06-11T09:55:52.000+02:00
- Required due to the similar update in apache/openwhisk.
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ notifications:
 
 before_install:
   - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -K "$encrypted_DF18CF3F552A_key" -iv "$encrypted_DF18CF3F552A_iv" -in tests/credentials.json.enc -out tests/credentials.json -d; fi'
-  - "OW_SCALA_VERSION=2.13 ./tools/travis/setup.sh"
+  - "./tools/travis/setup.sh"
 install: true
 script:
   - "./tools/travis/build.sh && ./tools/travis/deploy.sh && ./tools/travis/test.sh"
diff --git a/settings.gradle b/settings.gradle
@@ -10,11 +10,15 @@ gradle.ext.openwhisk = [
 ]
 
 gradle.ext.scala = [
-    version: '2.13.6',
+    version: '2.12.7',
+    depVersion  : '2.12',
     compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import']
 ]
 
 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
@@ -69,6 +69,15 @@ 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-metrics_${gradle.scala.depVersion}", version: "${gradle.akka.version}"
+    implementation group: 'com.typesafe.akka', name: "akka-cluster_${gradle.scala.depVersion}", version: "${gradle.akka.version}"
+    implementation group: 'com.typesafe.akka', name: "akka-cluster-tools_${gradle.scala.depVersion}", version: "${gradle.akka.version}"
+    implementation group: 'com.typesafe.akka', name: "akka-distributed-data_${gradle.scala.depVersion}", version: "${gradle.akka.version}"
 }
 
 tasks.withType(ScalaCompile) {

Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,15 @@ gradle.ext.openwhisk = [`
`10`	`10`	`]`
`11`	`11`
`12`	`12`	`gradle.ext.scala = [`
`13`		`- version: '2.13.6',`
	`13`	`+ version: '2.12.7',`
	`14`	`+ depVersion : '2.12',`
`14`	`15`	`compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import']`
`15`	`16`	`]`
`16`	`17`
`17`	`18`	`gradle.ext.scalafmt = [`
`18`	`19`	`version: '1.5.0',`
`19`	`20`	`config: new File(rootProject.projectDir, '.scalafmt.conf')`
`20`	`21`	`]`
	`22`	`+`
	`23`	`+gradle.ext.akka = [version : '2.6.12']`
	`24`	`+gradle.ext.akka_http = [version : '10.2.4']`