You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ra...@apache.org on 2021/06/11 19:54:36 UTC
[openwhisk-runtime-nodejs] branch master updated (411a662 ->
b010309)
This is an automated email from the ASF dual-hosted git repository.
rabbah pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-nodejs.git.
from 411a662 Update notice
new 205455a Constraint all transitive akka-* dependencies
new cd2795c Upgrade the scala version
new b010309 Apply review comments
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
settings.gradle | 7 ++++++-
tests/build.gradle | 9 +++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
[openwhisk-runtime-nodejs] 03/03: Apply review comments
Posted by ra...@apache.org.
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-nodejs.git
commit b010309b68f059976d869113640e5cadae7e7ad3
Author: Dominic Kim <st...@apache.org>
AuthorDate: Fri Jun 11 13:28:56 2021 +0900
Apply review comments
---
tests/build.gradle | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/tests/build.gradle b/tests/build.gradle
index 2654d91..126607a 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -24,25 +24,6 @@ repositories {
mavenLocal()
}
-pluginManager.withPlugin('scala') {
- // Constraint all transitive akka-* dependencies to the one we want to use to avoid issues.
- // List generated via
- // ./gradlew :test:dependencies | grep -o 'akka-.*_' | cut -c 6- | rev | cut -c 2- | rev | sort -u
- def cons = project.getDependencies().getConstraints()
- def akka = ['akka-actor', 'akka-cluster', 'akka-cluster-metrics', 'akka-cluster-tools', 'akka-coordination',
- 'akka-discovery', 'akka-distributed-data', 'akka-protobuf', 'akka-remote', 'akka-slf4j',
- 'akka-stream', 'akka-stream-testkit', 'akka-testkit']
- def akkaHttp = ['akka-http', 'akka-http-core', 'akka-http-spray-json', 'akka-http-testkit', 'akka-http-xml',
- 'akka-parsing', 'akka-http2-support']
-
- akka.forEach {
- cons.add('compile', "com.typesafe.akka:${it}_${gradle.scala.depVersion}:${gradle.akka.version}")
- }
- akkaHttp.forEach {
- cons.add('compile', "com.typesafe.akka:${it}_${gradle.scala.depVersion}:${gradle.akka_http.version}")
- }
-}
-
tasks.withType(Test) {
testLogging {
events "passed", "skipped", "failed"
@@ -56,6 +37,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) {
[openwhisk-runtime-nodejs] 01/03: Constraint all transitive akka-*
dependencies
Posted by ra...@apache.org.
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-nodejs.git
commit 205455ab6810a9d44acc57df34505dcc759ec53a
Author: Dominic Kim <st...@apache.org>
AuthorDate: Thu Jun 10 23:23:07 2021 +0900
Constraint all transitive akka-* dependencies
---
settings.gradle | 5 +++++
tests/build.gradle | 19 +++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/settings.gradle b/settings.gradle
index 138f8e5..de31890 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -35,9 +35,14 @@ gradle.ext.openwhisk = [
gradle.ext.scala = [
version: '2.12.7',
+ depVersion : '2.12',
compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import']
]
+
+gradle.ext.akka = [version : '2.6.12']
+gradle.ext.akka_http = [version : '10.2.4']
+
gradle.ext.scalafmt = [
version: '1.5.0',
config: new File(rootProject.projectDir, '.scalafmt.conf')
diff --git a/tests/build.gradle b/tests/build.gradle
index 1dc2da8..2654d91 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -24,6 +24,25 @@ repositories {
mavenLocal()
}
+pluginManager.withPlugin('scala') {
+ // Constraint all transitive akka-* dependencies to the one we want to use to avoid issues.
+ // List generated via
+ // ./gradlew :test:dependencies | grep -o 'akka-.*_' | cut -c 6- | rev | cut -c 2- | rev | sort -u
+ def cons = project.getDependencies().getConstraints()
+ def akka = ['akka-actor', 'akka-cluster', 'akka-cluster-metrics', 'akka-cluster-tools', 'akka-coordination',
+ 'akka-discovery', 'akka-distributed-data', 'akka-protobuf', 'akka-remote', 'akka-slf4j',
+ 'akka-stream', 'akka-stream-testkit', 'akka-testkit']
+ def akkaHttp = ['akka-http', 'akka-http-core', 'akka-http-spray-json', 'akka-http-testkit', 'akka-http-xml',
+ 'akka-parsing', 'akka-http2-support']
+
+ akka.forEach {
+ cons.add('compile', "com.typesafe.akka:${it}_${gradle.scala.depVersion}:${gradle.akka.version}")
+ }
+ akkaHttp.forEach {
+ cons.add('compile', "com.typesafe.akka:${it}_${gradle.scala.depVersion}:${gradle.akka_http.version}")
+ }
+}
+
tasks.withType(Test) {
testLogging {
events "passed", "skipped", "failed"
[openwhisk-runtime-nodejs] 02/03: Upgrade the scala version
Posted by ra...@apache.org.
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-nodejs.git
commit cd2795c53c474aa85dee7dd1a0b53f4c28010576
Author: Dominic Kim <st...@apache.org>
AuthorDate: Thu Jun 10 23:50:25 2021 +0900
Upgrade the scala version
---
settings.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/settings.gradle b/settings.gradle
index de31890..af8d33d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -34,7 +34,7 @@ gradle.ext.openwhisk = [
]
gradle.ext.scala = [
- version: '2.12.7',
+ version: '2.12.10',
depVersion : '2.12',
compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import']
]