Skip to content

Commit 3fc2eac

Browse files
authored
build actionloop from 1.16@1.18.0 (#33)
* build actionloop from 1.16@1.18.0 * update akka versions
1 parent 89a6381 commit 3fc2eac

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

core/rust1.34/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717

1818
# build go proxy from source
19-
FROM golang:1.15 AS builder_source
19+
FROM golang:1.16 AS builder_source
2020
ARG GO_PROXY_GITHUB_USER=apache
2121
ARG GO_PROXY_GITHUB_BRANCH=master
2222
RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
@@ -25,8 +25,8 @@ RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
2525
mv proxy /bin/proxy
2626

2727
# or build it from a release
28-
FROM golang:1.15 AS builder_release
29-
ARG GO_PROXY_RELEASE_VERSION=1.15@1.17.0
28+
FROM golang:1.16 AS builder_release
29+
ARG GO_PROXY_RELEASE_VERSION=1.16@1.18.0
3030
RUN curl -sL \
3131
https://github.com/apache/openwhisk-runtime-go/archive/{$GO_PROXY_RELEASE_VERSION}.tar.gz\
3232
| tar xzf -\

settings.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ gradle.ext.openwhisk = [
2525
]
2626

2727
gradle.ext.scala = [
28-
version: '2.11.8',
28+
version: '2.12.7',
29+
depVersion : '2.12',
2930
compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import']
3031
]
3132

@@ -34,3 +35,5 @@ gradle.ext.scalafmt = [
3435
config: new File(rootProject.projectDir, '.scalafmt.conf')
3536
]
3637

38+
gradle.ext.akka = [version : '2.6.12']
39+
gradle.ext.akka_http = [version : '10.2.4']

tests/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ dependencies {
3737
compile "org.scala-lang:scala-library:${gradle.scala.version}"
3838
compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:tests"
3939
compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:test-sources"
40+
implementation group: 'com.typesafe.akka', name: "akka-http2-support_${gradle.scala.depVersion}", version: "${gradle.akka_http.version}"
41+
implementation group: 'com.typesafe.akka', name: "akka-http-xml_${gradle.scala.depVersion}", version: "${gradle.akka_http.version}"
42+
implementation group: 'com.typesafe.akka', name: "akka-discovery_${gradle.scala.depVersion}", version: "${gradle.akka.version}"
43+
implementation group: 'com.typesafe.akka', name: "akka-protobuf_${gradle.scala.depVersion}", version: "${gradle.akka.version}"
44+
implementation group: 'com.typesafe.akka', name: "akka-remote_${gradle.scala.depVersion}", version: "${gradle.akka.version}"
45+
implementation group: 'com.typesafe.akka', name: "akka-cluster_${gradle.scala.depVersion}", version: "${gradle.akka.version}"
4046
}
4147

4248
tasks.withType(ScalaCompile) {

0 commit comments

Comments
 (0)