Skip to content

Commit 84d7e54

Browse files
authored
update NodeJS minor version; fix akka version problems (apache#231)
1 parent ec05216 commit 84d7e54

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
# Changelog
2121

2222
## Next
23-
24-
* NodeJS version: 10.24.0
23+
* Switch from Node.js 10 to Node.js 14 (#229)
24+
* Bump up cron to 1.8.2 (#223)
2525

2626
## 2.2.0
2727

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616
#
1717

18-
FROM node:14.16.1
18+
FROM node:14.17.2
1919

2020
# only package.json
2121
ADD package.json /

settings.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,9 @@ gradle.ext.openwhisk = [
2525

2626
gradle.ext.scala = [
2727
version: '2.12.8',
28+
depVersion : '2.12',
2829
compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import']
2930
]
31+
32+
gradle.ext.akka = [version : '2.6.12']
33+
gradle.ext.akka_http = [version : '10.2.4']

tests/build.gradle

+6
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ dependencies {
4242
compile "org.scala-lang:scala-library:${gradle.scala.version}"
4343
compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:tests"
4444
compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:test-sources"
45+
implementation group: 'com.typesafe.akka', name: "akka-http2-support_${gradle.scala.depVersion}", version: "${gradle.akka_http.version}"
46+
implementation group: 'com.typesafe.akka', name: "akka-http-xml_${gradle.scala.depVersion}", version: "${gradle.akka_http.version}"
47+
implementation group: 'com.typesafe.akka', name: "akka-discovery_${gradle.scala.depVersion}", version: "${gradle.akka.version}"
48+
implementation group: 'com.typesafe.akka', name: "akka-protobuf_${gradle.scala.depVersion}", version: "${gradle.akka.version}"
49+
implementation group: 'com.typesafe.akka', name: "akka-remote_${gradle.scala.depVersion}", version: "${gradle.akka.version}"
50+
implementation group: 'com.typesafe.akka', name: "akka-cluster_${gradle.scala.depVersion}", version: "${gradle.akka.version}"
4551
}
4652

4753
tasks.withType(ScalaCompile) {

0 commit comments

Comments
 (0)