This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-http.git
from 2fe4c8cdd Rename RuleSuite package from akka to pekko
new d77e4b946 build: temporarily change test matrix to include Scala 3
new 890c7bd69 build: setup scala 3 building
new d7ead4681 parboiled: import latest scala-3 parboiled2 code
new 048f8c5ba parsing: Scala 3 port of LogHelper macros
new 1cf775772 parsing: port Akka HTTP version of DynamicRuleDispatchMacro
new ad513a2ad parsing: port Akka HTTP changes of parboiled2 Parser changes
new 9a589a3c3 parsing: use latest parboiled2 version
new fee4a4775 parsing: Scala 3 pre213 / since213 annotations (without
function)
new 10b7d4a89 core: fore now disable Scala 2.12 code that cannot be elided
in Scala 3 easily
new 013552172 core: make some types explicit as required by Scala 3
compiler
new 979ac0c1d core: typing fixes to improve Scala 3 compatibility
new ebd17d4dc core: fix remaining compilation errors (not related to
parsing)
new 5394bff9e core: ignore internal signature changes (required for Scala
3 compat)
new 96c640b51 parsing: port latest changing from parboiled2
new 6c045deda build: for now only enable Scala 3 for parsing and core
new cc9b468d1 core: move parsing code for now to Scala 2 only
new 44d1c28bd core: provide broken stub entries for header parsing for
Scala 3
new 56bb381e8 core: make a subset of parsers compile (Scala 3)
new 64d49c370 core: move all tests to scala-2 dir for now (for incremental
reenabling)
new 67adeabf5 build: for now change default Akka version to 2.6.18
new 71b2621bb parsing: add missing copyright header
new 019c24f8b Add missing header (#4085)
new 27685a25b http: compile akka-http module with Scala 3 (#4091)
new 0a979b87f scala3: compile akka-http-core and pass all its tests (#4097)
new ced91db7d Merge remote-tracking branch 'origin/main' into HEAD
new 78c8cbdd2 build: disable 2.12 building for now
new 8fb728a70 build: also increase minimum Akka version for docs
new 2c00be62d build: fix aggregation for Scala 3
new d36bd2720 parsing: fix copyright headers
new 229325279 caching: fix cached execution and test (#4099)
new 901f51234 build: use simpler PR validation task for now
new 495adb796 testkit: enable Scala 3
new 0e11df51c caching: enable Scala 3 support
new 8090ebc20 docs: use correct 'skip-packages' scalac option on Scala 3
(#4109)
new de551668e http2: enable Scala 3 for akka-http2-support (#4108)
new 471a0f626 http-tests: allow to compile with Scala 3 with 3.0-migration
option (#4107)
new 55859f029 http-core: Remove the 3.0-migration flag
new ab826edb4 http-tests: allow to compile tests without the 3.0-migration
flag
new 0af0c322d core: use Tcp(system) consistently
new 8d8b94a87 scala3: use Tcp(system) consistently in more places
new 42bc5d96a scala3: edit sources on-the-fly in sbt to support `@pre213`
methods in shared source code (#4113)
new 70b6b0ee1 build: cleanup leftovers from testing
new 98300c3cc core: slight simplification
new f4d6b264b http: simplify some tests
new 5d02a7ce8 Merge pull request #4119 from jrudolph/scala-3-cleanups
new a15ebade2 =sbt Update Scala 3 version to 3.1.3 (#4123)
new 63b343704 scala 3: compile and test marshalling, JMH and docs
subprojects (#4126)
new 7d0cea60f Update to Scala 3.2.2
new fb224dfba Merge commit '6d7fa0e0f85fa49f2fc2b6bbdd1480c992492cf7' into
scala-3-merged
new 04bc1b49d Merge remote-tracking branch 'origin/main' into
scala-3-simple-merge
new fe6d17929 Update to Scala 3.3.0
new cefb9b562 Merge pull request #150 from mdedetrich/scala-3-simple-merge
The 4400 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:
.github/workflows/validate-and-test.yml | 2 +-
build.sbt | 36 +++++++----
.../apache/pekko-http-file-listing.png} | Bin
.../scala/docs/http/scaladsl/Http2ClientApp.scala | 5 +-
.../docs/http/scaladsl/HttpClientExampleSpec.scala | 36 ++++++-----
.../docs/http/scaladsl/HttpServerExampleSpec.scala | 24 +++----
.../scaladsl/HttpServerWithActorInteraction.scala | 7 ++-
.../http/scaladsl/HttpServerWithActorsSample.scala | 3 +-
.../test/scala/docs/http/scaladsl/ModelSpec.scala | 2 +-
.../docs/http/scaladsl/SprayJsonExample.scala | 15 +++--
.../docs/http/scaladsl/SprayJsonExampleSpec.scala | 4 +-
.../http/scaladsl/SprayJsonPrettyMarshalSpec.scala | 4 +-
.../server/CaseClassExtractionExamplesSpec.scala | 2 +-
.../server/ExceptionHandlerExamplesSpec.scala | 6 +-
.../server/RejectionHandlerExamplesSpec.scala | 10 +--
.../http/scaladsl/server/TestKitFragmentSpec.scala | 2 +-
.../scaladsl/server/TestKitWithActorSpec.scala | 11 ++--
.../directives/BasicDirectivesExamplesSpec.scala | 4 +-
.../directives/CodingDirectivesExamplesSpec.scala | 6 +-
.../FileUploadDirectivesExamplesSpec.scala | 2 +-
.../directives/FutureDirectivesExamplesSpec.scala | 4 +-
.../directives/JsonStreamingExamplesSpec.scala | 18 +++---
.../directives/JsonStreamingFullExamples.scala | 11 ++--
.../MarshallingDirectivesExamplesSpec.scala | 6 +-
.../directives/MiscDirectivesExamplesSpec.scala | 11 ++--
.../directives/PathDirectivesExamplesSpec.scala | 2 +-
.../directives/RouteDirectivesExamplesSpec.scala | 10 +--
.../main/scala/org/apache/pekko/BenchRunner.scala | 2 +-
.../http/caching/scaladsl/LfuCacheSettings.scala | 8 +--
.../server/directives/CachingDirectives.scala | 3 +-
.../pekko/http/caching/ExpiringLfuCacheSpec.scala | 9 ++-
.../org/apache/pekko/http/javadsl/model/Query.java | 1 +
.../client/OutgoingConnectionBlueprint.scala | 2 +-
.../http/impl/engine/client/pool/SlotState.scala | 2 +-
.../impl/engine/http2/BufferedOutletSupport.scala | 2 +-
.../pekko/http/impl/engine/http2/Http2.scala | 7 ++-
.../http/impl/engine/http2/Http2Blueprint.scala | 2 +-
.../pekko/http/impl/engine/http2/Http2Demux.scala | 7 ++-
.../http/impl/engine/http2/Http2Protocol.scala | 2 +-
.../impl/engine/http2/Http2StreamHandling.scala | 14 ++---
.../http2/OutgoingConnectionBuilderImpl.scala | 17 ++---
.../impl/engine/parsing/HttpHeaderParser.scala | 2 +-
.../impl/engine/rendering/BodyPartRenderer.scala | 2 +-
.../http/impl/engine/rendering/RenderSupport.scala | 10 +--
.../impl/engine/server/HttpServerBluePrint.scala | 2 +-
.../impl/engine/ws/WebSocketClientBlueprint.scala | 2 +-
.../impl/model/parser/AcceptEncodingHeader.scala | 6 +-
.../pekko/http/impl/model/parser/CommonRules.scala | 14 +++--
.../http/impl/model/parser/HeaderParser.scala | 4 +-
.../pekko/http/impl/model/parser/LinkHeader.scala | 16 ++---
.../http/impl/model/parser/SimpleHeaders.scala | 7 ++-
.../pekko/http/impl/model/parser/UriParser.scala | 2 +-
.../http/impl/model/parser/WebSocketHeaders.scala | 2 +-
.../apache/pekko/http/impl/util/JavaMapping.scala | 3 +-
.../pekko/http/impl/util/One2OneBidiFlow.scala | 4 +-
.../apache/pekko/http/impl/util/Rendering.scala | 7 ++-
.../http/impl/util/StageLoggingWithOverride.scala | 7 +--
.../apache/pekko/http/impl/util/StreamUtils.scala | 2 +-
.../scala/org/apache/pekko/http/javadsl/Http.scala | 4 +-
.../apache/pekko/http/javadsl/ServerBuilder.scala | 2 +-
.../javadsl/settings/Http2ServerSettings.scala | 4 +-
.../pekko/http/scaladsl/ClientTransport.scala | 2 +-
.../org/apache/pekko/http/scaladsl/Http.scala | 8 +--
.../apache/pekko/http/scaladsl/ServerBuilder.scala | 2 +-
.../pekko/http/scaladsl/model/ErrorInfo.scala | 3 +-
.../pekko/http/scaladsl/model/HttpEntity.scala | 4 +-
.../pekko/http/scaladsl/model/HttpMessage.scala | 20 +++---
.../pekko/http/scaladsl/model/MediaType.scala | 38 ++++++------
.../http/scaladsl/model/headers/EntityTag.scala | 2 +-
.../http/scaladsl/model/headers/HttpCookie.scala | 21 +++----
.../scaladsl/model/headers/HttpCredentials.scala | 4 +-
.../http/scaladsl/model/headers/headers.scala | 69 ++++++++++++---------
.../settings/ClientConnectionSettings.scala | 4 +-
.../scaladsl/settings/ConnectionPoolSettings.scala | 8 +--
.../http/scaladsl/settings/ParserSettings.scala | 52 ++++++++--------
.../http/scaladsl/settings/ServerSettings.scala | 62 +++++++++---------
.../http/scaladsl/settings/WebSocketSettings.scala | 4 +-
.../http/HttpModelIntegrationSpec.scala | 6 +-
.../engine/client/HostConnectionPoolSpec.scala | 6 +-
.../client/LowLevelOutgoingConnectionSpec.scala | 23 ++++---
.../impl/engine/client/NewConnectionPoolSpec.scala | 2 +-
.../impl/engine/client/PrepareResponseSpec.scala | 10 +--
.../engine/client/ResponseParsingMergeSpec.scala | 2 +-
.../engine/parsing/HttpHeaderParserTestBed.scala | 2 +-
.../impl/engine/parsing/RequestParserSpec.scala | 4 +-
.../impl/engine/parsing/ResponseParserSpec.scala | 2 +-
.../engine/rendering/RequestRendererSpec.scala | 6 +-
.../engine/rendering/ResponseRendererSpec.scala | 6 +-
.../http/impl/engine/server/HttpServerSpec.scala | 2 +-
.../engine/server/HttpServerTestSetupBase.scala | 2 +-
.../impl/engine/server/PrepareRequestsSpec.scala | 8 +--
.../pekko/http/impl/engine/ws/BitBuilder.scala | 2 +-
.../http/impl/engine/ws/EchoTestClientApp.scala | 4 +-
.../pekko/http/impl/engine/ws/MessageSpec.scala | 2 +-
.../http/impl/engine/ws/WSClientAutobahnTest.scala | 4 +-
.../http/impl/engine/ws/WSServerAutobahnTest.scala | 4 +-
.../http/impl/engine/ws/WSTestSetupBase.scala | 2 +-
.../http/impl/engine/ws/WebSocketClientSpec.scala | 2 +-
.../impl/engine/ws/WebSocketIntegrationSpec.scala | 7 ++-
.../http/impl/model/parser/HttpHeaderSpec.scala | 5 +-
.../pekko/http/impl/util/One2OneBidiFlowSpec.scala | 6 +-
.../http/impl/util/PekkoSpecWithMaterializer.scala | 4 +-
.../pekko/http/impl/util/StreamUtilsSpec.scala | 5 +-
.../pekko/http/javadsl/model/MultipartsSpec.scala | 4 +-
.../pekko/http/scaladsl/ClientServerSpec.scala | 6 +-
.../apache/pekko/http/scaladsl/ClientSpec.scala | 4 +-
.../http/scaladsl/GracefulTerminationSpec.scala | 6 +-
.../apache/pekko/http/scaladsl/TestClient.scala | 4 +-
.../apache/pekko/http/scaladsl/TestServer.scala | 4 +-
.../http/scaladsl/TightRequestTimeoutSpec.scala | 6 +-
.../pekko/http/scaladsl/model/DateTimeSpec.scala | 4 +-
.../pekko/http/scaladsl/model/HttpEntitySpec.scala | 2 +-
.../scala/org/apache/pekko/testkit/PekkoSpec.scala | 4 +-
.../sprayjson/SprayJsonSupportSpec.scala | 7 ++-
.../pekko/http/scaladsl/testkit/RouteTest.scala | 10 +--
.../http/scaladsl/testkit/RouteTestTimeout.scala | 2 +-
.../scaladsl/testkit/ScalatestRouteTestSpec.scala | 3 +-
.../scaladsl/testkit/Specs2RouteTestSpec.scala | 3 +-
.../http/PekkoHttpServerLatencyMultiNodeSpec.scala | 2 +-
.../pekko/remote/testkit/MultiNodeConfig.scala | 6 +-
.../pekko/remote/testkit/PerfFlamesSupport.scala | 2 +-
.../apache/pekko/http/ccompat/ImplicitUtils.scala} | 6 +-
.../apache/pekko/http/ccompat/ImplicitUtils.scala} | 6 +-
.../apache/pekko/http/ccompat/ImplicitUtils.scala | 14 ++---
.../pekko/http/scaladsl/CustomMediaTypesSpec.scala | 2 +-
.../apache/pekko/http/scaladsl/FormDataSpec.scala | 2 +-
.../pekko/http/scaladsl/TestSingleRequest.scala | 4 +-
.../http/scaladsl/coding/CodecSpecSupport.scala | 4 +-
.../sprayjson/SprayJsonSupportSpec.scala | 3 +-
.../FromStatusCodeAndXYZMarshallerSpec.scala | 3 +-
.../scaladsl/marshalling/MarshallingSpec.scala | 4 +-
.../http/scaladsl/server/BasicRouteSpecs.scala | 7 ++-
.../http/scaladsl/server/ConnectionTestApp.scala | 4 +-
.../DontLeakActorsOnFailingConnectionSpecs.scala | 10 +--
.../http/scaladsl/server/EntityStreamingSpec.scala | 13 ++--
.../pekko/http/scaladsl/server/SizeLimitSpec.scala | 8 ++-
.../pekko/http/scaladsl/server/TcpLeakApp.scala | 6 +-
.../pekko/http/scaladsl/server/TestServer.scala | 10 +--
.../server/directives/CodingDirectivesSpec.scala | 2 +-
.../directives/FileAndResourceDirectivesSpec.scala | 2 +-
.../directives/FileUploadDirectivesSpec.scala | 4 +-
.../directives/FormFieldDirectivesSpec.scala | 4 +-
.../server/directives/FutureDirectivesSpec.scala | 4 +-
.../directives/MarshallingDirectivesSpec.scala | 2 +-
.../server/directives/MiscDirectivesSpec.scala | 2 +
.../directives/ParameterDirectivesSpec.scala | 7 ++-
.../server/directives/RouteDirectivesSpec.scala | 12 +++-
.../server/directives/TimeoutDirectivesSpec.scala | 2 +-
.../http/scaladsl/server/util/TupleOpsSpec.scala | 8 ++-
.../scaladsl/unmarshalling/UnmarshallingSpec.scala | 4 +-
.../javadsl/server/JavaPathMatchers.scala.template | 0
.../FormFieldDirectivesInstances.scala.template | 0
.../ParameterDirectivesInstances.scala.template | 0
.../util/ApplyConverterInstances.scala.template | 0
.../ConstructFromTupleInstances.scala.template | 0
.../util/TupleAppendOneInstances.scala.template | 0
.../server/util/TupleFoldInstances.scala.template | 0
.../http/javadsl/marshalling/Marshaller.scala | 2 +-
.../http/javadsl/server/RejectionHandler.scala | 2 +-
.../pekko/http/javadsl/server/Rejections.scala | 14 ++---
.../server/directives/AttributeDirectives.scala | 2 +-
.../FramedEntityStreamingDirectives.scala | 6 +-
.../javadsl/server/directives/PathDirectives.scala | 2 +-
.../server/directives/RouteDirectives.scala | 13 ++--
.../server/directives/SecurityDirectives.scala | 4 +-
.../server/directives/WebSocketDirectives.scala | 4 +-
.../server/directives/PathDirectives.scala | 4 +-
.../server/directives/RespondWithDirectives.scala | 19 +++---
.../scaladsl/server/util/ConstructFromTuple.scala | 1 +
.../http/scaladsl/settings/RoutingSettings.scala | 16 ++---
.../impl/engine/http2/H2SpecIntegrationSpec.scala | 4 +-
.../http/impl/engine/http2/H2cUpgradeSpec.scala | 4 +-
.../http/impl/engine/http2/Http2ClientSpec.scala | 7 ++-
.../http/impl/engine/http2/Http2ServerSpec.scala | 10 +--
.../impl/engine/http2/ProtocolSwitchSpec.scala | 4 +-
.../impl/engine/http2/RequestParsingSpec.scala | 22 +++----
.../http/impl/engine/http2/TelemetrySpiSpec.scala | 3 +-
.../engine/http2/WithInPendingUntilFixed.scala | 25 --------
.../impl/engine/http2/WithPriorKnowledgeSpec.scala | 2 +-
.../engine/http2/framing/Http2FramingSpec.scala | 4 +-
.../pekko/http/scaladsl/Http2ServerTest.scala | 2 +-
.../apache/pekko/http/ccompat/pre213macro.scala | 0
.../apache/pekko/http/ccompat/since213macro.scala | 0
.../org/apache/pekko/macros/LogHelperMacro.scala} | 31 +++------
.../apache/pekko/http/ccompat/pre213macro.scala | 12 ++--
.../apache/pekko/http/ccompat/since213macro.scala | 11 ++--
.../org/apache/pekko/macros/LogHelperMacro.scala | 35 +++++++++++
.../scala/org/apache/pekko/macros/LogHelper.scala | 42 +------------
project/Common.scala | 22 +++++--
project/Dependencies.scala | 34 ++++++----
project/Doc.scala | 8 ++-
project/NoScala3.scala | 9 +++
project/Pre213Preprocessor.scala | 28 +++++++++
193 files changed, 809 insertions(+), 691 deletions(-)
rename docs/src/main/paradox/{akka-http-file-listing.png =>
org/apache/pekko-http-file-listing.png} (100%)
copy
http-tests/src/test/scala-2.13-/{main/org/apache/pekko/http/scaladsl/server/util/package.scala
=> src/main/org/apache/pekko/http/ccompat/ImplicitUtils.scala} (75%)
copy
http-tests/src/test/{scala-2.13-/main/org/apache/pekko/http/scaladsl/server/util/package.scala
=> scala-2.13/src/main/org/apache/pekko/http/ccompat/ImplicitUtils.scala} (75%)
copy
http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/headers/UpgradeProtocol.scala
=>
http-tests/src/test/scala-3/src/main/org/apache/pekko/http/ccompat/ImplicitUtils.scala
(50%)
rename http/src/main/boilerplate/{akka =>
org/apache/pekko}/http/javadsl/server/JavaPathMatchers.scala.template (100%)
rename http/src/main/boilerplate/{akka =>
org/apache/pekko}/http/scaladsl/server/directives/FormFieldDirectivesInstances.scala.template
(100%)
rename http/src/main/boilerplate/{akka =>
org/apache/pekko}/http/scaladsl/server/directives/ParameterDirectivesInstances.scala.template
(100%)
rename http/src/main/boilerplate/{akka =>
org/apache/pekko}/http/scaladsl/server/util/ApplyConverterInstances.scala.template
(100%)
rename http/src/main/boilerplate/{akka =>
org/apache/pekko}/http/scaladsl/server/util/ConstructFromTupleInstances.scala.template
(100%)
rename http/src/main/boilerplate/{akka =>
org/apache/pekko}/http/scaladsl/server/util/TupleAppendOneInstances.scala.template
(100%)
rename http/src/main/boilerplate/{akka =>
org/apache/pekko}/http/scaladsl/server/util/TupleFoldInstances.scala.template
(100%)
delete mode 100644
http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/WithInPendingUntilFixed.scala
rename parsing/src/main/{scala =>
scala-2}/org/apache/pekko/http/ccompat/pre213macro.scala (100%)
rename parsing/src/main/{scala =>
scala-2}/org/apache/pekko/http/ccompat/since213macro.scala (100%)
copy parsing/src/main/{scala/org/apache/pekko/macros/LogHelper.scala =>
scala-2/org/apache/pekko/macros/LogHelperMacro.scala} (59%)
copy
http-core/src/main/scala-2.13+/org/apache/pekko/http/ccompat/imm/package.scala
=> parsing/src/main/scala-3/org/apache/pekko/http/ccompat/pre213macro.scala
(58%)
copy
http-core/src/main/scala-2.13+/org/apache/pekko/http/ccompat/imm/package.scala
=> parsing/src/main/scala-3/org/apache/pekko/http/ccompat/since213macro.scala
(65%)
create mode 100644
parsing/src/main/scala-3/org/apache/pekko/macros/LogHelperMacro.scala
create mode 100644 project/NoScala3.scala
create mode 100644 project/Pre213Preprocessor.scala
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
