Skip to content

Commit efb56e0

Browse files
alexklibiszalexklibisz
committed
Merge remote-tracking branch 'origin/main' into mdc-logging-directives
2 parents d0ac46e + d4dd205 commit efb56e0

File tree

1,017 files changed

+1914
-1298
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,017 files changed

+1914
-1298
lines changed

‎.algolia-search-index-config.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"index_name": "akka_http_docs",
3+
"start_urls": [
4+
{
5+
"url": "https://doc.akka.io/docs/akka-http/current/",
6+
"extra_attributes": {
7+
"language": [
8+
"scala",
9+
"java"
10+
]
11+
}
12+
}
13+
],
14+
"stop_urls": [
15+
"/release-notes/"
16+
],
17+
"selectors": {
18+
"lvl0": {
19+
"selector": "//div[contains(@class,'nav-toc')]/ul/li[.//a[contains(@class,'active')]]/a",
20+
"type": "xpath",
21+
"global": true,
22+
"default_value": "Documentation"
23+
},
24+
"lvl1": "#docs h1",
25+
"lvl2": "#docs h2",
26+
"lvl3": "#docs h3",
27+
"lvl4": "#docs h4",
28+
"text": "#docs p"
29+
},
30+
"selectors_exclude": [
31+
"#scroller-anchor"
32+
],
33+
"min_indexed_level": 1,
34+
"only_content_level": true,
35+
"custom_settings": {
36+
"attributesForFaceting": [
37+
"language"
38+
]
39+
},
40+
"conversation_id": [
41+
"299459375"
42+
],
43+
"nb_hits": 1650
44+
}

‎.fossa.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 3
2+
# https://github.com/fossas/fossa-cli/blob/master/docs/references/files/fossa-yml.md
3+
4+
targets:
5+
# exclude non-distributed projects from dependency scanning
6+
exclude:
7+
- type: scala
8+
path: akka-http-bench-jmh
9+
- type: scala
10+
path: akka-http-compatibility-tests

‎.github/workflows/algolia-doc-site-scrape.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Akka.io Doc Site Algolia indexing
2+
3+
on:
4+
# once it works
5+
#schedule:
6+
# - cron: "0 0 * * *"
7+
workflow_dispatch:
8+
9+
permissions:
10+
contents: 'read'
11+
12+
jobs:
13+
scrape_index:
14+
name: Update search index
15+
runs-on: ubuntu-22.04
16+
steps:
17+
18+
- name: Checkout
19+
uses: actions/checkout@v3.1.0
20+
with:
21+
fetch-depth: 0
22+
23+
- name: Scrape
24+
uses: darrenjennings/algolia-docsearch-action@75b0f6d28d82eff3dd76f57a96a99490df11a250
25+
with:
26+
algolia_application_id: 'XUXZ6LW9B1'
27+
algolia_api_key: '${{ secrets.ALGOLIA_API_KEY }}'
28+
file: '.algolia-search-index-config.json'

‎.github/workflows/nightly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
SCALA_VERSION: [2.12, 2.13, 3.1]
18+
SCALA_VERSION: [2.12, 2.13, 3.2]
1919
JDK_VERSION: ["1.8", "1.11", "1.17"]
2020
include:
2121
- JDK_VERSION: 1.8

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ jobs:
3131

3232
- name: Publish Artifacts to Sonatype / Maven
3333
run: |
34-
mv .jvmopts-ghactions .jvmopts
3534
sbt ci-release
3635
env:
3736
CI_SONATYPE_RELEASE: "; sonatypePrepare; sonatypeBundleUpload; sonatypeClose"
3837
PGP_SECRET: ${{ secrets.PGP_SECRET }}
38+
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
3939
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
4040
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
4141

@@ -58,7 +58,6 @@ jobs:
5858

5959
- name: Publish Documentation
6060
run: |
61-
mv .jvmopts-ghactions .jvmopts
6261
eval "$(ssh-agent -s)" && echo $SCP_SECRET | base64 -d > /tmp/id_rsa && chmod 600 /tmp/id_rsa && ssh-add /tmp/id_rsa && sbt -Dakka.genjavadoc.enabled=true publishRsync
6362
env:
6463
SCP_SECRET: ${{ secrets.SCP_SECRET }}

‎.github/workflows/validate-and-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
strategy:
4949
fail-fast: false
5050
matrix: # align with publish-test-reports.yml
51-
SCALA_VERSION: [2.12, 2.13, 3.1]
51+
SCALA_VERSION: [2.12, 2.13, 3.2]
5252
JDK_VERSION: ["1.8", "1.11", "1.17"]
5353
include:
5454
- JDK_VERSION: 1.8

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1+
# IntelliJ
12
/.idea
3+
4+
# VS Code
5+
**/metals.sbt
6+
**/.bloop
7+
.metals
8+
settings.json
9+
210
.DS_Store
311
target
412

‎.scala-steward.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Only send PRs on Monday morning
22
pullRequests.frequency = "0 0 ? * 1"
33

4-
commits.message = "build: update ${artifactName} from ${currentVersion} to ${nextVersion}"
4+
commits.message = "bump: update ${artifactName} from ${currentVersion} to ${nextVersion}"
55

66
updates.ignore = [
77
{ groupId = "com.typesafe.akka", artifactId = "akka-actor" },

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ For a Pull Request to be considered at all it has to meet these requirements:
179179

180180
Some additional guidelines regarding source code are:
181181

182-
- files should start with a ``Copyright (C) 2020 Lightbend Inc. <https://www.lightbend.com>`` copyright header
182+
- files should start with a ``Copyright (C) 2023 Lightbend Inc. <https://www.lightbend.com>`` copyright header
183183
- keep the code [DRY](https://www.oreilly.com/library/view/97-things-every/9780596809515/ch30.html)
184184
- apply the [Boy Scout Rule](https://www.oreilly.com/library/view/97-things-every/9780596809515/ch08.html) whenever you have the chance to
185185
- Never delete or change existing copyright notices, just add additional info.

‎LICENSE.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Business Source License 1.1
33
Parameters
44

55
Licensor: Lightbend, Inc.
6-
Licensed Work: Akka HTTP 10.5.x
6+
Licensed Work: Akka HTTP 10.5.2
77
The Licensed Work is (c) 2022 Lightbend Inc.
88
Additional Use Grant:
99
If you develop an application using a version of Play Framework that
@@ -15,7 +15,7 @@ Additional Use Grant:
1515
Connecting to a Play Framework websocket and/or Play Framework
1616
request/response bodies for server and play-ws client.
1717

18-
Change Date: TBD ( 3 years after 10.5.0 release )
18+
Change Date: 2026-05-05
1919

2020
Change License: Apache License, Version 2.0
2121

0 commit comments

Comments
 (0)