Update dependencies #4036

ikhoon · 2022-01-18T16:45:32Z

Brave 5.13.3 -> 5.13.7
Bouncy Castle 1.69 -> 1.70
Bucket4J 6.3.0 -> 7.0.0
Caffeine 2.9.2 -> 2.9.3
Dropwizard 2.0.25 -> 2.0.28
Dropwizard Metrics 4.2.4 -> 4.2.7
gRPC Java 1.41.1 -> 1.41.2
gRPC Kotlin 1.1.0 -> 1.2.1
Jackson 2.13.0 -> 2.13.1
java-jwt 3.18.2 -> 3.18.3
jcl-over-slf4j 1.7.32 -> 1.7.33
jboss-logging 3.4.2 -> 3.4.3
Kafka 3.0.0 -> 3.1.0
Kotlin 1.5.32 -> 1.6.10
Logback 1.2.7 -> 1.2.10
Micrometer 1.7.6 -> 1.8.2
Netty 4.1.70 -> 4.1.73
- io_uring 0.0.1 -> 0.0.11
Prometheus 0.12.0 -> 0.14.1
protobuf-jackson 1.2.0 -> 2.0.0
protobuf-java 3.17.3 -> 3.19.2
Reactor 3.4.12 -> 3.4.14
RESTEasy 4.7.3 -> 5.0.2
Scala 2.13.7 -> 2.13.8, 3.1.1(new)
scala-collection-compat 2.5.0 -> 2.6.0
ScalaPB 0.11.6 -> 0.11.8
SLF4J 1.7.33 -> 1.7.34
Spring 5.3.13 -> 5.3.15
Spring Boot 2.5.7 -> 2.6.2
Tomcat 9.0.55 -> 9.0.56
Build
- AssertJ 3.21.0 -> 3.22.0
- Checkstyle 8.45.1 -> 9.2.1
- Dagger 2.37 -> 2.40.5
- Finagle 2.0.25 -> 2.0.28
- graphql-dgs-client 4.9.10 -> 4.9.16
- graphql-kotlin 5.1.1 -> 5.3.2
- gax-grpc 1.67.0 -> 2.10.0
- JMH 1.33 -> 1.34
- ktlint 10.2.0 -> 10.2.1
- Mockito 4.0.0 -> 4.3.0
- TestNG 7.4.0 -> 7.5
Fixes Support for Scala 3 #3614

ikhoon · 2022-01-18T16:46:51Z

TODO: Fix the failed tests in the Actuator module.

- Brave 5.13.3 -> 5.13.7 - Bouncy Castle 1.69 -> 1.70 - Bucket4J 6.3.0 -> 7.0.0 - Caffeine 2.9.2 -> 2.9.3 - Dropwizard 2.0.25 -> 2.0.28 - Dropwizard Metrics 4.2.4 -> 4.2.7 - gRPC Java 1.41.1 -> 1.41.2 - gRPC Kotlin 1.1.0 -> 1.2.0 - Jackson 2.13.0 -> 2.13.1 - java-jwt 3.18.2 -> 3.18.3 - jcl-over-slf4j 1.7.32 -> 1.7.33 - jboss-logging 3.4.2 -> 3.4.3 - Kotlin 1.5.32 -> 1.6.10 - Logback 1.2.7 -> 1.2.10 - Micrometer 1.7.6 -> 1.8.2 - Netty 4.1.70 -> 4.1.73 - io_uring 0.0.1 -> 0.0.11 - Prometheus 0.12.0 -> 0.14.1 - protobuf-jackson 1.2.0 -> 2.0.0 - protobuf-java 3.17.3 -> 3.19.2 - Reactor 3.4.12 -> 3.4.14 - RESTEasy 4.7.3 -> 5.0.2 - Scala 3.13.7 -> 2.13.8 - scala-collection-compat 2.5.0 -> 2.6.0 - ScalaPB 0.11.6 -> 0.11.8 - Spring 5.3.13 -> 5.3.15 - Spring Boot 2.5.7 -> 2.6.2 - Tomcat 9.0.55 -> 9.0.56 - Build - AssertJ 3.21.0 -> 3.22.0 - Checkstyle 8.45.1 -> 9.2.1 - Dagger 2.37 -> 2.40.5 - Finagle 2.0.25 -> 2.0.28 - graphql-dgs-client 4.9.10 -> 4.9.16 - graphql-kotlin 5.1.1 -> 5.3.2 - gax-grpc 1.67.0 -> 2.9.0 - JMH 1.33 -> 1.34 - ktlint 10.2.0 -> 10.2.1 - Mockito 4.0.0 -> 4.2.0 - TestNG 7.4.0 -> 7.5

ikhoon · 2022-01-19T02:45:17Z

TODO: Fix the failed tests in the Actuator module.

Decided that Spring (Boot) be upgraded in a separate PR.

codecov · 2022-01-19T03:13:49Z

Codecov Report

Merging #4036 (b0d0891) into master (1284b5e) will decrease coverage by 0.01%.
The diff coverage is 75.00%.

@@             Coverage Diff              @@
##             master    #4036      +/-   ##
============================================
- Coverage     73.41%   73.40%   -0.02%     
  Complexity    15934    15934              
============================================
  Files          1386     1386              
  Lines         60866    60869       +3     
  Branches       7715     7715              
============================================
- Hits          44687    44682       -5     
+ Misses        12275    12268       -7     
- Partials       3904     3919      +15

Impacted Files	Coverage Δ
...ttling/bucket4j/TokenBucketThrottlingStrategy.java	`80.64% <66.66%> (ø)`
.../internal/common/kotlin/FlowCollectingPublisher.kt	`89.47% <100.00%> (+1.23%)`	⬆️
...on/kotlin/FlowResponseConverterFunctionProvider.kt	`63.63% <0.00%> (-9.10%)`	⬇️
...ria/server/annotated/kotlin/ContextAwareService.kt	`92.85% <0.00%> (-7.15%)`	⬇️
...rnal/common/GracefulConnectionShutdownHandler.java	`68.08% <0.00%> (-6.39%)`	⬇️
...in/example/armeria/grpc/kotlin/HelloServiceImpl.kt	`90.32% <0.00%> (-2.79%)`	⬇️
...rmeria/common/stream/ConcatArrayStreamMessage.java	`77.77% <0.00%> (-2.23%)`	⬇️
...ia/internal/common/stream/ByteBufDecoderInput.java	`84.89% <0.00%> (-2.16%)`	⬇️
...p/armeria/common/stream/AbstractStreamMessage.java	`79.20% <0.00%> (-1.99%)`	⬇️
...nternal/common/AbstractHttp2ConnectionHandler.java	`86.53% <0.00%> (-1.93%)`	⬇️
... and 19 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1284b5e...b0d0891. Read the comment docs.

ikhoon · 2022-01-19T08:05:48Z

Working on supporting Scala 3. Let me ship it in this PR together. 😀

ikhoon · 2022-01-19T12:02:26Z

scala/scala_2.13/src/test/scala/com/linecorp/armeria/server/ServerListenerBuilderSuite.scala

-      .whenStopping { server: Server => server.activePorts }
-      .whenStopped { server: Server => println(s"$server is stopped.") }
-      .whenStopped { server: Server => server.isClosed }
+      .whenStarting { (server: Server) => println(s"$server is starting.") }


The parameter of a lambda is now required to be enclosed in parentheses.
https://docs.scala-lang.org/scala3/guides/migration/incompat-syntactic.html#parentheses-around-lambda-parameter

ikhoon · 2022-01-19T12:03:59Z

...src/test/scala/com/linecorp/armeria/server/scalapb/ScalaPbRequestConverterFunctionTest.scala

@@ -45,11 +45,13 @@ class ScalaPbRequestConverterFunctionTest {

  @Test
  def failProtobufToCollection(): Unit = {
-    val typeToken = new TypeToken[List[SimpleRequest]]() {}
+    val typeToken = new TypeReference[List[SimpleRequest]]() {}


Scala 3 fails to read the bytecode of TypeToken properly. 😅

ikhoon · 2022-01-19T12:05:42Z

...apb/scalapb_3/src/main/scala/com/linecorp/armeria/common/scalapb/ScalaPbJsonMarshaller.scala

+    jsonParser: Parser = jsonDefaultParser
+) extends GrpcJsonMarshaller {
+
+  // TODO(ikhoon): Remove this forked file if https://github.com/lampepfl/dotty/issues/11332 is fixed.


Forked to avoid using MethodHandle which is not supported yet. 😅

ikhoon · 2022-01-19T12:09:18Z

Working on supporting Scala 3. Let me ship it in this PR together. 😀

Because of some regressions about MethodHandle in Scala 3, the changes are bigger than I expected initially.

minwoox

Thanks!

...ia/sangria_2.13/src/test/scala/com/linecorp/armeria/server/sangria/SangriaGraphqlSuite.scala

minwoox · 2022-01-21T06:22:19Z

scala/scala_3/build.gradle

+    implementation 'com.fasterxml.jackson.module:jackson-module-scala_3'
+}
+
+// Use the sources from ':scala_2.13'.


Shouldn't we move sources to scala_3 and copy them to scala_2.13?

Why don't we make Scala 3 main version when scala/scala3#11332 is fixed and clean up the ScalaPB module?
I think Scala 3 is still experimental and we need to wait for it to be stabilized.

trustin

Thanks a lot, @ikhoon. Scala 3 users will be excited!

jrhee17

Looking forward to trying out the new scala3 integration! Thank you @ikhoon 🙇 👍 🙇

The changes have been reviewed in line/armeria#4036

ikhoon added the dependencies label Jan 18, 2022

ikhoon added this to the 1.14.0 milestone Jan 18, 2022

ikhoon force-pushed the up-deps branch from 7426664 to 0264b1a Compare January 18, 2022 16:48

Revert Spring versions upgraded seperately

3ebf84d

ikhoon marked this pull request as ready for review January 19, 2022 02:44

ikhoon requested review from jrhee17, minwoox and trustin as code owners January 19, 2022 02:44

trustin approved these changes Jan 19, 2022

View reviewed changes

ikhoon added 2 commits January 19, 2022 20:48

Support Scala 3

e668623

Clean up

72fd151

ikhoon commented Jan 19, 2022

View reviewed changes

minwoox approved these changes Jan 21, 2022

View reviewed changes

Bump Scalafmt version and revert incorrectly formatted files.

f8060a7

trustin approved these changes Jan 21, 2022

View reviewed changes

jrhee17 approved these changes Jan 24, 2022 •

edited

Loading

View reviewed changes

jrhee17 approved these changes Jan 24, 2022

View reviewed changes

ikhoon added 3 commits January 25, 2022 17:41

Catch up new updates

b74d132

Specify dialect to scala212source3 in scalafmt

54208f7

Merge branch 'master' into up-deps

b0d0891

ikhoon mentioned this pull request Jan 25, 2022

Support Scala 3 line/gradle-scripts#112

Merged

ikhoon merged commit 9e5c65a into line:master Jan 25, 2022

ikhoon deleted the up-deps branch January 25, 2022 12:14

ikhoon added a commit to line/gradle-scripts that referenced this pull request Jan 25, 2022

Support Scala 3 (#112)

546aa49

The changes have been reviewed in line/armeria#4036

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update dependencies #4036

Update dependencies #4036

ikhoon commented Jan 18, 2022 •

edited

Loading

ikhoon commented Jan 18, 2022

ikhoon commented Jan 19, 2022

codecov bot commented Jan 19, 2022 •

edited

Loading

ikhoon commented Jan 19, 2022 •

edited

Loading

ikhoon Jan 19, 2022

ikhoon Jan 19, 2022

ikhoon Jan 19, 2022

ikhoon commented Jan 19, 2022

minwoox left a comment

minwoox Jan 21, 2022

ikhoon Jan 21, 2022

minwoox Jan 21, 2022

trustin left a comment

jrhee17 left a comment

Update dependencies #4036

Update dependencies #4036

Conversation

ikhoon commented Jan 18, 2022 • edited Loading

ikhoon commented Jan 18, 2022

ikhoon commented Jan 19, 2022

codecov bot commented Jan 19, 2022 • edited Loading

Codecov Report

ikhoon commented Jan 19, 2022 • edited Loading

ikhoon Jan 19, 2022

Choose a reason for hiding this comment

ikhoon Jan 19, 2022

Choose a reason for hiding this comment

ikhoon Jan 19, 2022

Choose a reason for hiding this comment

ikhoon commented Jan 19, 2022

minwoox left a comment

Choose a reason for hiding this comment

minwoox Jan 21, 2022

Choose a reason for hiding this comment

ikhoon Jan 21, 2022

Choose a reason for hiding this comment

minwoox Jan 21, 2022

Choose a reason for hiding this comment

trustin left a comment

Choose a reason for hiding this comment

jrhee17 left a comment

Choose a reason for hiding this comment

ikhoon commented Jan 18, 2022 •

edited

Loading

codecov bot commented Jan 19, 2022 •

edited

Loading

ikhoon commented Jan 19, 2022 •

edited

Loading