Skip to content

Commit

Permalink
Merge branch 'main' into update/scala-library-2.12.18
Browse files Browse the repository at this point in the history
  • Loading branch information
johanandren authored Aug 16, 2023
2 parents 44e2099 + 3c0ab34 commit a8b79a2
Show file tree
Hide file tree
Showing 11 changed files with 65 additions and 11 deletions.
8 changes: 3 additions & 5 deletions .fossa.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
version: 3
# https://github.com/fossas/fossa-cli/blob/master/docs/references/files/fossa-yml.md

targets:
paths:
# exclude non-distributed projects from dependency scanning
exclude:
- type: scala
path: akka-http-bench-jmh
- type: scala
path: akka-http-compatibility-tests
- akka-http-bench-jmh
- akka-http-compatibility-tests
6 changes: 5 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,13 @@ inThisBuild(Def.settings(
url("https://github.com/akka/akka-http/graphs/contributors"))
),
startYear := Some(2014),
releaseNotesURL := (
if (isSnapshot.value) None
else Some(url(s"https://github.com/akka/akka-http/releases/tag/v${version.value}"))
),
licenses := {
val tagOrBranch =
if (version.value.endsWith("SNAPSHOT")) "main"
if (isSnapshot.value) "main"
else "v" + version.value
Seq(("BUSL-1.1", url(s"https://raw.githubusercontent.com/akka/akka-http/${tagOrBranch}/LICENSE")))
},
Expand Down
8 changes: 8 additions & 0 deletions docs/src/main/paradox/common/caching.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ time-based entry expiration.

## Dependency

The Akka dependencies are available from Akka's library repository. To access them there, you need to configure the URL for this repository.

@@repository [sbt,Gradle,Maven] {
id="akka-repository"
name="Akka library repository"
url="https://repo.akka.io/maven"
}

To use Akka HTTP Caching, add the module to your project:

@@dependency [sbt,Gradle,Maven] {
Expand Down
8 changes: 8 additions & 0 deletions docs/src/main/paradox/common/json-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ See [the list of current community extensions for Akka HTTP](https://akka.io/com

## Jackson Support

The Akka dependencies are available from Akka's library repository. To access them there, you need to configure the URL for this repository.

@@repository [sbt,Gradle,Maven] {
id="akka-repository"
name="Akka library repository"
url="https://repo.akka.io/maven"
}

To make use of the support module for (un)marshalling from and to JSON with [Jackson], add a library dependency onto:

@@dependency [sbt,Gradle,Maven] {
Expand Down
10 changes: 10 additions & 0 deletions docs/src/main/paradox/common/xml-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,16 @@ using [Jackson], which is also the library used for providing @ref[JSON support]

The custom XML (un)marshalling code shown above requires that you depend on the `jackson-dataformat-xml` library.

The Akka dependencies are available from Akka's library repository. To access them there, you need to configure the URL for this repository.

@@repository [sbt,Gradle,Maven] {
id="akka-repository"
name="Akka library repository"
url="https://repo.akka.io/maven"
}

Additionally, add the dependency as below.

@@dependency [sbt,Gradle,Maven] {
group="com.fasterxml.jackson.dataformat"
artifact="jackson-dataformat-xml"
Expand Down
10 changes: 10 additions & 0 deletions docs/src/main/paradox/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,16 @@ Akka HTTP is provided as independent modules from Akka itself under its own rele
with Akka >= $akka.minimum.version$ and future Akka 2.x versions that are released during the lifetime of Akka HTTP 10.4.x. The modules, however, do *not* depend on `akka-actor` or `akka-stream`, so the user is required to
choose an Akka version to run against and add a manual dependency to `akka-stream` of the chosen version.

The Akka dependencies are available from Akka's library repository. To access them there, you need to configure the URL for this repository.

@@repository [sbt,Gradle,Maven] {
id="akka-repository"
name="Akka library repository"
url="https://repo.akka.io/maven"
}

Additionally, add the dependencies as below.

@@dependency [sbt,Gradle,Maven] {
symbol1=AkkaVersion
value1=$akka.version$
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ caching support works.

## Dependency

The Akka dependencies are available from Akka's library repository. To access them there, you need to configure the URL for this repository.

@@repository [sbt,Gradle,Maven] {
id="akka-repository"
name="Akka library repository"
url="https://repo.akka.io/maven"
}

To use Akka HTTP Caching, add the module to your project:

@@dependency[sbt,Gradle,Maven] {
Expand Down
8 changes: 8 additions & 0 deletions docs/src/main/paradox/routing-dsl/testkit.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ route logic easy and convenient. This "route test DSL" is made available with th

## Dependency

The Akka dependencies are available from Akka's library repository. To access them there, you need to configure the URL for this repository.

@@repository [sbt,Gradle,Maven] {
id="akka-repository"
name="Akka library repository"
url="https://repo.akka.io/maven"
}

To use Akka HTTP TestKit, add the module to your project:

@@dependency [sbt,Gradle,Maven] {
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ object Dependencies {
val scalafixVersion = _root_.scalafix.sbt.BuildInfo.scalafixVersion // grab from plugin

val scala212Version = "2.12.18"
val scala213Version = "2.13.10"
val scala213Version = "2.13.11"
val scala3Version = "3.2.2"
val allScalaVersions = Seq(scala213Version, scala212Version, scala3Version)

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.8.2
sbt.version=1.9.1
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ resolvers += Resolver.sonatypeRepo("releases") // to more quickly obtain paradox
resolvers += Resolver.jcenterRepo

addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.4.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.2")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
Expand All @@ -17,9 +17,9 @@ addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1") // for
addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1")
addSbtPlugin("com.lightbend.sbt" % "sbt-publish-rsync" % "0.2")
addSbtPlugin("com.lightbend.sbt" % "sbt-bill-of-materials" % "1.0.2")
addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.49")
addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.51")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0")
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.30")
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.31")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11")

Expand Down

0 comments on commit a8b79a2

Please sign in to comment.