diff --git a/LICENSE b/LICENSE index 9a0396066..19f636565 100644 --- a/LICENSE +++ b/LICENSE @@ -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 @@ -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 diff --git a/build.sbt b/build.sbt index 6a6e312f4..83d594ec9 100644 --- a/build.sbt +++ b/build.sbt @@ -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" } @@ -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` = diff --git a/project/plugins.sbt b/project/plugins.sbt index e9f871b24..902c8dc51 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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") @@ -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") diff --git a/project/project-info.conf b/project/project-info.conf index b5bd5d336..16a5f81fe 100644 --- a/project/project-info.conf +++ b/project/project-info.conf @@ -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" } ] }