You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by fa...@apache.org on 2024/06/16 06:58:31 UTC
(pekko-grpc) branch main updated (61e10972 -> 9e9d8bac)
This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-grpc.git
from 61e10972 scalapb: update to 0.11.7 (#324)
new 3a24d479 Update scalafmt-core to 3.8.2
new e1dd1c01 Reformat with scalafmt 3.8.2
new 9e9d8bac Add 'Reformat with scalafmt 3.8.2' to .git-blame-ignore-revs
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:
.git-blame-ignore-revs | 3 +++
.scalafmt.conf | 2 +-
.../scala/io/grpc/testing/integration2/Settings.scala | 9 ++++++---
.../example/myapp/helloworld/ErrorReportingSpec.scala | 3 ++-
.../apache/pekko/grpc/internal/MetadataImplSpec.scala | 3 +--
.../apache/pekko/grpc/scaladsl/headers/HeadersSpec.scala | 16 +++++-----------
.../src/sbt-test/gen-java/01-gen-basic-java/build.sbt | 3 ++-
.../src/sbt-test/gen-java/04-crash-on-keywords/build.sbt | 3 ++-
8 files changed, 22 insertions(+), 20 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org
(pekko-grpc) 01/03: Update scalafmt-core to 3.8.2
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-grpc.git
commit 3a24d479d4f6cfd33d6b34e3580ee29d2842e47f
Author: scala-steward-asf[bot] <14...@users.noreply.github.com>
AuthorDate: Sun Jun 16 00:04:58 2024 +0000
Update scalafmt-core to 3.8.2
---
.scalafmt.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.scalafmt.conf b/.scalafmt.conf
index 36ebb04a..ef128e90 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.8.1
+version = 3.8.2
runner.dialect = scala213
project.git = true
style = defaultWithAlign
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org
(pekko-grpc) 03/03: Add 'Reformat with scalafmt 3.8.2' to .git-blame-ignore-revs
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-grpc.git
commit 9e9d8bacefc35d91c33f7a7a8e421af5849ea1d8
Author: scala-steward-asf[bot] <14...@users.noreply.github.com>
AuthorDate: Sun Jun 16 00:05:05 2024 +0000
Add 'Reformat with scalafmt 3.8.2' to .git-blame-ignore-revs
---
.git-blame-ignore-revs | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 72088196..343b3660 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -5,3 +5,6 @@
# manual
6d565ee5f4851d9c7bb3546f684cceeb23b9eb73
ef953f191a9007bbd7da816f445fde89680c6159
+
+# Scala Steward: Reformat with scalafmt 3.8.2
+a873c91c285bc60ea274eb612eb14c4be77e8d32
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org
(pekko-grpc) 02/03: Reformat with scalafmt 3.8.2
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-grpc.git
commit e1dd1c01c31d496e9107eebab2cadf38c9c88b49
Author: scala-steward-asf[bot] <14...@users.noreply.github.com>
AuthorDate: Sun Jun 16 00:05:05 2024 +0000
Reformat with scalafmt 3.8.2
Executed command: scalafmt --non-interactive
---
.../scala/io/grpc/testing/integration2/Settings.scala | 9 ++++++---
.../example/myapp/helloworld/ErrorReportingSpec.scala | 3 ++-
.../apache/pekko/grpc/internal/MetadataImplSpec.scala | 3 +--
.../apache/pekko/grpc/scaladsl/headers/HeadersSpec.scala | 16 +++++-----------
.../src/sbt-test/gen-java/01-gen-basic-java/build.sbt | 3 ++-
.../src/sbt-test/gen-java/04-crash-on-keywords/build.sbt | 3 ++-
6 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala b/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala
index c1cc57d5..300e18da 100644
--- a/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala
+++ b/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala
@@ -68,9 +68,12 @@ object Settings {
| --use_tls=true|false Whether to use TLS. Default ${defaultSettings.useTls}
| --use_test_ca=true|false Whether to trust our fake CA. Requires --use_tls=true
| to have effect. Default ${defaultSettings.useTestCa}
- | --use_pekkoHttp=true|false Whether to use pekko-http instead of Netty. Default ${defaultSettings.usePekkoHttp}
- | --default_service_account Email of GCE default service account. Default ${defaultSettings.defaultServiceAccount}
- | --service_account_key_file Path to service account json key file. ${defaultSettings.serviceAccountKeyFile}
+ | --use_pekkoHttp=true|false Whether to use pekko-http instead of Netty. Default ${defaultSettings
+ .usePekkoHttp}
+ | --default_service_account Email of GCE default service account. Default ${defaultSettings
+ .defaultServiceAccount}
+ | --service_account_key_file Path to service account json key file. ${defaultSettings
+ .serviceAccountKeyFile}
| --oauth_scope Scope for OAuth tokens. Default ${defaultSettings.oauthScope}
""".stripMargin)
System.exit(-1)
diff --git a/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala b/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
index 83fc07b8..44c07000 100644
--- a/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
+++ b/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
@@ -50,7 +50,8 @@ class ErrorReportingSpec extends AnyWordSpec with Matchers with ScalaFutures wit
Http(sys)
.newServerAt("127.0.0.1", 0)
- .bind((req => handler(req)): pekko.japi.function.Function[HttpRequest, CompletionStage[
+ .bind((req => handler(req)): pekko.japi.function.Function[HttpRequest,
+ CompletionStage[
HttpResponse]])
.toCompletableFuture
.get
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/MetadataImplSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/MetadataImplSpec.scala
index 7aa38a2e..b02f713d 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/MetadataImplSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/MetadataImplSpec.scala
@@ -25,8 +25,7 @@ object MetadataImplSpec {
val TEXT_ENTRIES = List(("key-a", "value-a"), ("key-c", "value-c"), ("key-b", "value-b"))
val BINARY_ENTRIES = List(
- ("key-a-bin", ByteString.fromInts(10, 20, 30, 40)),
- ("key-c-bin", ByteString.fromInts(11, 21, 31, 41)),
+ ("key-a-bin", ByteString.fromInts(10, 20, 30, 40)), ("key-c-bin", ByteString.fromInts(11, 21, 31, 41)),
("key-b-bin", ByteString.fromInts(12, 22, 32, 42)))
val DUPE_TEXT_KEY = "key-dupe"
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/headers/HeadersSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/headers/HeadersSpec.scala
index 3fe0b748..9fdffe71 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/headers/HeadersSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/headers/HeadersSpec.scala
@@ -29,8 +29,7 @@ class HeadersSpec extends AnyWordSpec with Matchers {
"use percent-encoding" in {
// test cases taken from https://github.com/grpc/grpc-java/blob/79e75bace40cea7e4be72e7dcd1f41c3ad6ee857/api/src/test/java/io/grpc/StatusTest.java#L65
val inAndExpectedOut = Table(
- ("raw input", "expected encoded value"),
- ("my favorite character is i", "my favorite character is i"),
+ ("raw input", "expected encoded value"), ("my favorite character is i", "my favorite character is i"),
("my favorite character is \n", "my favorite character is %0A"),
("my favorite character is \u0000", "my favorite character is %00"),
("my favorite character is %", "my favorite character is %25"),
@@ -52,10 +51,8 @@ class HeadersSpec extends AnyWordSpec with Matchers {
"should decode percent-encoded values" in {
// test cases taken from https://github.com/grpc/grpc-java/blob/79e75bace40cea7e4be72e7dcd1f41c3ad6ee857/api/src/test/java/io/grpc/StatusTest.java#L65
val inAndExpectedOut = Table(
- ("raw input", "expected decoded value"),
- (Array[Byte]('H', 'e', 'l', 'l', 'o'), "Hello"),
- (Array[Byte]('H', '%', '6', '1', 'o'), "Hao"),
- (Array[Byte]('H', '%', '0', 'A', 'o'), "H\no"),
+ ("raw input", "expected decoded value"), (Array[Byte]('H', 'e', 'l', 'l', 'o'), "Hello"),
+ (Array[Byte]('H', '%', '6', '1', 'o'), "Hao"), (Array[Byte]('H', '%', '0', 'A', 'o'), "H\no"),
(Array[Byte]('%', 'F', '0', '%', '9', '0', '%', '8', '0', '%', '8', '1'), "𐀁"),
(Array[Byte]('a', 'b', 'c', '%', 'C', '5', '%', '8', '2'), "abcł"))
@@ -67,11 +64,8 @@ class HeadersSpec extends AnyWordSpec with Matchers {
"should decode as is in case two chars following percent cannot be decoded as hex" in {
val inAndExpectedOut = Table(
- ("raw input", "expected decoded value"),
- (Array[Byte]('%', 'G'), "%G"),
- (Array[Byte]('%', 'G', '0'), "%G0"),
- (Array[Byte]('%', 'G', '0', '%', ',', '0'), "%G0%,0"),
- (Array[Byte]('%', '%', '0', '%', '%'), "%%0%%"))
+ ("raw input", "expected decoded value"), (Array[Byte]('%', 'G'), "%G"), (Array[Byte]('%', 'G', '0'), "%G0"),
+ (Array[Byte]('%', 'G', '0', '%', ',', '0'), "%G0%,0"), (Array[Byte]('%', '%', '0', '%', '%'), "%%0%%"))
forAll(inAndExpectedOut) { (in, expected) =>
val actual = `Status-Message`.parse(new String(in))
diff --git a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt
index 8e72f39a..fa3de259 100644
--- a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt
@@ -17,4 +17,5 @@ javacOptions += "-Xdoclint:all"
pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)
-libraryDependencies += "com.google.protobuf" % "protobuf-java" % org.apache.pekko.grpc.gen.BuildInfo.googleProtobufJavaVersion % "protobuf"
+libraryDependencies += "com.google.protobuf" % "protobuf-java" % org.apache.pekko.grpc.gen.BuildInfo
+ .googleProtobufJavaVersion % "protobuf"
diff --git a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt
index 8e72f39a..fa3de259 100644
--- a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt
@@ -17,4 +17,5 @@ javacOptions += "-Xdoclint:all"
pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)
-libraryDependencies += "com.google.protobuf" % "protobuf-java" % org.apache.pekko.grpc.gen.BuildInfo.googleProtobufJavaVersion % "protobuf"
+libraryDependencies += "com.google.protobuf" % "protobuf-java" % org.apache.pekko.grpc.gen.BuildInfo
+ .googleProtobufJavaVersion % "protobuf"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org