Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: pre 24.10 release items #1786

Merged
merged 3 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Business Source License 1.1
Parameters

Licensor: Lightbend, Inc.
Licensed Work: Alpakka Kafka 6.0.0
Licensed Work: Alpakka Kafka 7.0.0
This license applies to all sub directories and files
UNLESS another license file is present in a sub
directory, then that other license applies to all files
Expand All @@ -19,7 +19,7 @@ Additional Use Grant:
Connecting to a Play Framework websocket and/or Play Framework
request/response bodies for server and play-ws client.

Change Date: 2027-05-14
Change Date: 2027-10-24

Change License: Apache License, Version 2.0

Expand Down
6 changes: 4 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ val ScalaVersions = Seq(Scala213, Scala3)

val Scala3Settings = Seq(crossScalaVersions := ScalaVersions)

val akkaVersion = "2.10.0-M1"
val akkaVersion = "2.10.0"
val AkkaBinaryVersionForDocs = VersionNumber(akkaVersion).numbers match {
case Seq(major, minor, _*) => s"$major.$minor"
}
Expand Down Expand Up @@ -157,7 +157,9 @@ val commonSettings = Def.settings(
|""".stripMargin
)
),
projectInfoVersion := (if (isSnapshot.value) "snapshot" else version.value)
projectInfoVersion := (if (isSnapshot.value) "snapshot" else version.value),
// can be removed once we this project is on 2.13.15
dependencyOverrides += "org.scala-lang" % "scala-library" % Scala213
)

lazy val `alpakka-kafka` =
Expand Down
4 changes: 3 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
resolvers += "Akka library repository".at("https://repo.akka.io/maven")

addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1")
addSbtPlugin("net.aichler" % "sbt-jupiter-interface" % "0.11.1")
Expand All @@ -7,7 +9,7 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
// docs
addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.57")
addSbtPlugin("io.akka" % "sbt-paradox-akka" % "24.10.3")
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-dependencies" % "0.2.4")
addSbtPlugin("com.lightbend.sbt" % "sbt-publish-rsync" % "0.3")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.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 @@ -19,7 +19,7 @@ project-info {
forums: [
{
text: "Lightbend Discuss"
url: "https://discuss.lightbend.com/c/akka/streams-and-alpakka"
url: "https://discuss.akka.io"
}
]
}
Expand Down
Loading