This is an automated email from the ASF dual-hosted git repository.
rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-rust.git
The following commit(s) were added to refs/heads/master by this push:
new 3fc2eac build actionloop from [email protected] (#33)
3fc2eac is described below
commit 3fc2eac494ff858cda2baa8a2f7812a1e5ec0ba6
Author: David Grove <[email protected]>
AuthorDate: Mon Aug 2 11:15:45 2021 -0400
build actionloop from [email protected] (#33)
* build actionloop from [email protected]
* update akka versions
---
core/rust1.34/Dockerfile | 6 +++---
settings.gradle | 5 ++++-
tests/build.gradle | 6 ++++++
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/core/rust1.34/Dockerfile b/core/rust1.34/Dockerfile
index 0377214..fbc0880 100644
--- a/core/rust1.34/Dockerfile
+++ b/core/rust1.34/Dockerfile
@@ -16,7 +16,7 @@
#
# build go proxy from source
-FROM golang:1.15 AS builder_source
+FROM golang:1.16 AS builder_source
ARG GO_PROXY_GITHUB_USER=apache
ARG GO_PROXY_GITHUB_BRANCH=master
RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
@@ -25,8 +25,8 @@ RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
mv proxy /bin/proxy
# or build it from a release
-FROM golang:1.15 AS builder_release
-ARG [email protected]
+FROM golang:1.16 AS builder_release
+ARG [email protected]
RUN curl -sL \
https://github.com/apache/openwhisk-runtime-go/archive/{$GO_PROXY_RELEASE_VERSION}.tar.gz\
| tar xzf -\
diff --git a/settings.gradle b/settings.gradle
index 65cc0b3..0d49158 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -25,7 +25,8 @@ gradle.ext.openwhisk = [
]
gradle.ext.scala = [
- version: '2.11.8',
+ version: '2.12.7',
+ depVersion : '2.12',
compileFlags: ['-feature', '-unchecked', '-deprecation',
'-Xfatal-warnings', '-Ywarn-unused-import']
]
@@ -34,3 +35,5 @@ gradle.ext.scalafmt = [
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 1ae5a4b..09adf17 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -37,6 +37,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) {
