Skip to content

Commit

Permalink
chore: repo gardening (#4373)
Browse files Browse the repository at this point in the history
* chore: repo gardening
* bump akka-paradox as well
  • Loading branch information
johanandren authored Apr 5, 2024
1 parent 1380546 commit 404dd02
Show file tree
Hide file tree
Showing 12 changed files with 69 additions and 33 deletions.
3 changes: 3 additions & 0 deletions .fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ version: 3
paths:
# exclude non-distributed projects from dependency scanning
exclude:
- akka-http2-tests
- akka-http-bench-jmh
- akka-http-compatibility-tests
- akka-http-scalafix
- akka-http-tests
- native-image-tests
4 changes: 3 additions & 1 deletion .github/workflows/algolia-doc-site-scrape.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ jobs:
steps:

- name: Checkout
uses: actions/[email protected]
# https://github.com/actions/checkout/releases
# v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
fetch-depth: 0

Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,22 @@ jobs:
if: github.repository == 'akka/akka-http'
steps:
- name: Checkout
uses: actions/[email protected]
# https://github.com/actions/checkout/releases
# v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
# we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
fetch-depth: 0

- name: Cache Coursier cache
uses: coursier/[email protected]
# https://github.com/coursier/cache-action/releases
# v6.4.5
uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d

- name: Set up JDK temurin:1.17
uses: coursier/[email protected]
# https://github.com/coursier/setup-action/releases
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: temurin:1.17

Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/native-image-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ jobs:
steps:
- name: Checkout
# https://github.com/actions/checkout/releases
uses: actions/[email protected]
# v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
fetch-depth: 0

Expand All @@ -27,11 +28,13 @@ jobs:
- name: Cache Coursier cache
# https://github.com/coursier/cache-action/releases
uses: coursier/[email protected]
# v6.4.5
uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d

- name: Set up JDK 11
# https://github.com/coursier/setup-action/releases
uses: coursier/[email protected]
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: temurin:1.11

Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,21 @@ jobs:

steps:
- name: Checkout
uses: actions/[email protected]
# https://github.com/actions/checkout/releases
# v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
fetch-depth: 0

- name: Cache Coursier cache
uses: coursier/[email protected]
# https://github.com/coursier/cache-action/releases
# v6.4.5
uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d

- name: Set up JDK ${{ matrix.JDK_VERSION }}
uses: coursier/[email protected]
# https://github.com/coursier/setup-action/releases
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: ${{ matrix.JVM_NAME }}

Expand Down
20 changes: 15 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,21 @@ jobs:
if: github.event.repository.fork == false
steps:
- name: Checkout
uses: actions/[email protected]
# https://github.com/actions/checkout/releases
# v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
fetch-depth: 0

- name: Cache Coursier cache
uses: coursier/[email protected]
# https://github.com/coursier/cache-action/releases
# v6.4.5
uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d

- name: Set up JDK 1.11
uses: coursier/[email protected]
# https://github.com/coursier/setup-action/releases
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: temurin:1.11.0.17 # align with akka/akka

Expand Down Expand Up @@ -61,13 +67,17 @@ jobs:
if: github.event.repository.fork == false
steps:
- name: Checkout
uses: actions/[email protected]
# https://github.com/actions/checkout/releases
# v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
# we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
fetch-depth: 0

- name: Set up JDK 11
uses: coursier/[email protected]
# https://github.com/coursier/setup-action/releases
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: temurin:1.11

Expand Down
24 changes: 18 additions & 6 deletions .github/workflows/validate-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,19 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/[email protected]
# https://github.com/actions/checkout/releases
# v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11

- name: Cache Coursier cache
uses: coursier/[email protected]
# https://github.com/coursier/cache-action/releases
# v6.4.5
uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d

- name: Set up JDK 17
uses: coursier/[email protected]
# https://github.com/coursier/setup-action/releases
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: temurin:1.17

Expand Down Expand Up @@ -59,15 +65,21 @@ jobs:
extraOpts: ''
steps:
- name: Checkout
uses: actions/[email protected]
# https://github.com/actions/checkout/releases
# v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
fetch-depth: 0

- name: Cache Coursier cache
uses: coursier/[email protected]
# https://github.com/coursier/cache-action/releases
# v6.4.5
uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d

- name: Set up JDK ${{ matrix.JDK_VERSION }}
uses: coursier/[email protected]
# https://github.com/coursier/setup-action/releases
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: ${{ matrix.JVM_NAME }}

Expand Down
7 changes: 0 additions & 7 deletions CODE_OF_CONDUCT.md

This file was deleted.

4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Akka HTTP
=========
The Akka family of projects is managed by teams at [Lightbend](https://lightbend.com/) with help from the community.

The Akka HTTP modules implement a full server- and client-side HTTP stack on top
of akka-actor and akka-stream. It's not a web-framework but rather a more
Expand Down Expand Up @@ -73,4 +74,5 @@ Joining the extended team in such form gives you, in addition to street-cred, of
License
-------

Akka HTTP is licensed under the Business Source License 1.1, see LICENSE.txt.
Akka is licensed under the Business Source License 1.1, please see the [Akka License FAQ](https://www.lightbend.com/akka/license-faq).

3 changes: 1 addition & 2 deletions docs/release-train-issue-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ For minor or major releases:
### Afterwards
- [ ] Add the released version to `project/MiMa.scala` to the `mimaPreviousArtifacts` key *of all current compatible branches*.
- [ ] Update version for [Lightbend Supported Modules](https://developer.lightbend.com/docs/lightbend-platform/introduction/getting-help/build-dependencies.html) in [private project](https://github.com/lightbend/lightbend-technology-intro-doc/blob/master/docs/modules/getting-help/examples/build.sbt)
- [ ] Update [akka-dependencies bom](https://github.com/lightbend/akka-dependencies)
- [ ] Update [akka-dependencies bom](https://github.com/lightbend/akka-dependencies) and version for [Akka module versions](https://doc.akka.io/docs/akka-dependencies/current/) in [akka-dependencies repo](https://github.com/akka/akka-dependencies)
- [ ] Update [Akka Guide samples](https://github.com/akka/akka-platform-guide)
- [ ] Update quickstarts:
- [ ] [Akka HTTP Java](https://github.com/akka/akka-http-quickstart-java.g8/blob/main/src/main/g8/default.properties)
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1") // for
addSbtPlugin("com.github.sbt" % "sbt-boilerplate" % "0.7.0")
addSbtPlugin("com.lightbend.sbt" % "sbt-publish-rsync" % "0.3")
addSbtPlugin("com.lightbend.sbt" % "sbt-bill-of-materials" % "1.0.2")
addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.54")
addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.55")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.32")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0")
Expand Down
2 changes: 1 addition & 1 deletion project/project-info.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project-info {
scaladoc: "https://doc.akka.io/api/akka-http/"${project-info.version}"/akka/http/scaladsl"
javadoc: "https://doc.akka.io/japi/akka-http/"${project-info.version}
shared-info {
jdk-versions: ["Eclipse Temurin JDK 11", "Eclipse Temurin JDK 17"]
jdk-versions: ["Eclipse Temurin JDK 11", "Eclipse Temurin JDK 17", "Eclipse Temurin JDK 21"]
snapshots: {
url: "contributing.html#snapshots"
text: "Snapshots are available"
Expand Down

0 comments on commit 404dd02

Please sign in to comment.