diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7a2be5e90..2c169d6de 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -28,13 +28,13 @@ jobs: - name: Publish run: |- - sbt ci-release - CI_RELEASE=akka-grpc-codegen/publishSigned CI_SNAPSHOT_RELEASE=akka-grpc-codegen/publish sbt ++2.13.10\! ci-release + sbt +publishSigned + CI_RELEASE=akka-grpc-codegen/publishSigned CI_SNAPSHOT_RELEASE=akka-grpc-codegen/publish sbt ++2.13.10\! publishSigned env: PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} PGP_SECRET: ${{ secrets.PGP_SECRET }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + PUBLISH_USER: ${{ secrets.PUBLISH_USER }} + PUBLISH_PASSWORD: ${{ secrets.PUBLISH_PASSWORD }} gradle-plugin: name: Release gradle plugin diff --git a/benchmark-java/build.sbt b/benchmark-java/build.sbt index 609f7bd6c..da209490e 100644 --- a/benchmark-java/build.sbt +++ b/benchmark-java/build.sbt @@ -2,6 +2,8 @@ scalaVersion := "2.13.11" enablePlugins(AkkaGrpcPlugin) +resolvers += "Akka library repository".at("https://repo.akka.io/maven") + run / javaOptions ++= List("-Xms1g", "-Xmx1g", "-XX:+PrintGCDetails", "-XX:+PrintGCTimeStamps") // generate both client and server (default) in Java diff --git a/benchmark-java/project/plugins.sbt b/benchmark-java/project/plugins.sbt index eda93b3aa..218a15174 100644 --- a/benchmark-java/project/plugins.sbt +++ b/benchmark-java/project/plugins.sbt @@ -1,3 +1,4 @@ +resolvers += "Akka library repository".at("https://repo.akka.io/maven") lazy val plugins = project in file(".") dependsOn ProjectRef(file("../../"), "sbt-akka-grpc") // Use this instead of above when importing to IDEA, after publishLocal and replacing the version here //addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "0.1+32-fd597fcb+20180618-1248") diff --git a/build.sbt b/build.sbt index 166629246..e55280fc8 100644 --- a/build.sbt +++ b/build.sbt @@ -4,19 +4,22 @@ import akka.grpc.ProjectExtensions._ import akka.grpc.build.ReflectiveCodeGen import com.typesafe.tools.mima.core._ import sbt.Keys.scalaVersion +import com.geirsson.CiReleasePlugin val akkaGrpcRuntimeName = "akka-grpc-runtime" lazy val mkBatAssemblyTask = taskKey[File]("Create a Windows bat assembly") // gradle plugin compatibility (avoid `+` in snapshot versions) -(ThisBuild / dynverSeparator) := "-" +ThisBuild / dynverSeparator := "-" +// append -SNAPSHOT to version when isSnapshot +ThisBuild / dynverSonatypeSnapshots := true val akkaGrpcCodegenId = "akka-grpc-codegen" lazy val codegen = Project(id = akkaGrpcCodegenId, base = file("codegen")) .enablePlugins(SbtTwirl, BuildInfoPlugin) .enablePlugins(ReproducibleBuildsPlugin) - .disablePlugins(MimaPlugin) + .disablePlugins(MimaPlugin, CiReleasePlugin) .settings(Dependencies.codegen) .settings(resolvers += Resolver.sbtPluginRepo("releases")) .settings( @@ -63,6 +66,7 @@ lazy val runtime = Project(id = akkaGrpcRuntimeName, base = file("runtime")) Test / PB.targets += (scalapb.gen() -> (Test / sourceManaged).value)) .enablePlugins(akka.grpc.build.ReflectiveCodeGen) .enablePlugins(ReproducibleBuildsPlugin) + .disablePlugins(CiReleasePlugin) /** This could be an independent project - or does upstream provide this already? didn't find it.. */ val akkaGrpcProtocPluginId = "akka-grpc-scalapb-protoc-plugin" @@ -87,11 +91,12 @@ lazy val scalapbProtocPlugin = Project(id = akkaGrpcProtocPluginId, base = file( .settings(addArtifact((Compile / assembly / artifact), assembly)) .settings(addArtifact(Artifact(akkaGrpcProtocPluginId, "bat", "bat", "bat"), mkBatAssemblyTask)) .enablePlugins(ReproducibleBuildsPlugin) + .disablePlugins(CiReleasePlugin) lazy val mavenPlugin = Project(id = "akka-grpc-maven-plugin", base = file("maven-plugin")) .enablePlugins(akka.grpc.SbtMavenPlugin) .enablePlugins(ReproducibleBuildsPlugin) - .disablePlugins(MimaPlugin) + .disablePlugins(MimaPlugin, CiReleasePlugin) .settings(Dependencies.mavenPlugin) .settings( publishMavenStyle := true, @@ -103,7 +108,7 @@ lazy val mavenPlugin = Project(id = "akka-grpc-maven-plugin", base = file("maven lazy val sbtPlugin = Project(id = "sbt-akka-grpc", base = file("sbt-plugin")) .enablePlugins(SbtPlugin) .enablePlugins(ReproducibleBuildsPlugin) - .disablePlugins(MimaPlugin) + .disablePlugins(MimaPlugin, CiReleasePlugin) .settings(Dependencies.sbtPlugin) .settings( /** And for scripted tests: */ @@ -121,7 +126,7 @@ lazy val sbtPlugin = Project(id = "sbt-akka-grpc", base = file("sbt-plugin")) .dependsOn(codegen) lazy val interopTests = Project(id = "akka-grpc-interop-tests", base = file("interop-tests")) - .disablePlugins(MimaPlugin) + .disablePlugins(MimaPlugin, CiReleasePlugin) .settings(Dependencies.interopTests) .settings( crossScalaVersions := Dependencies.Versions.CrossScalaForLib, @@ -162,7 +167,7 @@ lazy val interopTests = Project(id = "akka-grpc-interop-tests", base = file("int lazy val benchmarks = Project(id = "benchmarks", base = file("benchmarks")) .dependsOn(runtime) .enablePlugins(JmhPlugin) - .disablePlugins(MimaPlugin) + .disablePlugins(MimaPlugin, CiReleasePlugin) .settings( crossScalaVersions := Dependencies.Versions.CrossScalaForLib, scalaVersion := Dependencies.Versions.CrossScalaForLib.head, @@ -173,7 +178,7 @@ lazy val docs = Project(id = "akka-grpc-docs", base = file("docs")) .dependsOn(pluginTesterScala) .dependsOn(pluginTesterJava) .enablePlugins(SitePreviewPlugin, AkkaParadoxPlugin, ParadoxSitePlugin, PreprocessPlugin, PublishRsyncPlugin) - .disablePlugins(MimaPlugin) + .disablePlugins(MimaPlugin, CiReleasePlugin) .settings( name := "Akka gRPC", publish / skip := true, @@ -213,7 +218,7 @@ lazy val docs = Project(id = "akka-grpc-docs", base = file("docs")) scalaVersion := Dependencies.Versions.CrossScalaForLib.head) lazy val pluginTesterScala = Project(id = "akka-grpc-plugin-tester-scala", base = file("plugin-tester-scala")) - .disablePlugins(MimaPlugin) + .disablePlugins(MimaPlugin, CiReleasePlugin) .settings(Dependencies.pluginTester) .settings( (publish / skip) := true, @@ -224,7 +229,7 @@ lazy val pluginTesterScala = Project(id = "akka-grpc-plugin-tester-scala", base .pluginTestingSettings lazy val pluginTesterJava = Project(id = "akka-grpc-plugin-tester-java", base = file("plugin-tester-java")) - .disablePlugins(MimaPlugin) + .disablePlugins(MimaPlugin, CiReleasePlugin) .settings(Dependencies.pluginTester) .settings( (publish / skip) := true, @@ -236,7 +241,7 @@ lazy val pluginTesterJava = Project(id = "akka-grpc-plugin-tester-java", base = .pluginTestingSettings lazy val root = Project(id = "akka-grpc", base = file(".")) - .disablePlugins(SitePlugin, MimaPlugin) + .disablePlugins(SitePlugin, MimaPlugin, CiReleasePlugin) .aggregate( runtime, codegen, diff --git a/docs/release-train-issue-template.md b/docs/release-train-issue-template.md index b049f5717..96e5c8bb3 100644 --- a/docs/release-train-issue-template.md +++ b/docs/release-train-issue-template.md @@ -22,15 +22,15 @@ Variables to be expanded in this template: - [ ] For recent dependency updates or changes on a minor release branch the Fossa validation can be triggered from the GitHub actions "Dependency License Scanning" (Manually choosing the release branch) - [ ] Update the revision in Fossa in the Akka Group for the Akka umbrella version, e.g. `22.10`. Note that the revisions for the release is updated by Akka Group > Projects > Edit. - [ ] Update the [draft release](https://github.com/akka/akka-grpc/releases) with the next tag version `v$VERSION$`, title and release description. Use the `Publish release` button, which will create the tag. -- [ ] Check that GitHub Actions release build has executed successfully (GitHub Actions will start a [CI build](https://github.com/akka/akka-grpc/actions) for the new tag and publish artifacts to Maven central via Sonatype) +- [ ] Check that GitHub Actions release build has executed successfully (GitHub Actions will start a [CI build](https://github.com/akka/akka-grpc/actions) for the new tag and publish artifacts to https://repo.akka.io/maven) ### Check availability - [ ] Check [API](https://doc.akka.io/api/akka-grpc/$VERSION$/) documentation - [ ] Check [reference](https://doc.akka.io/docs/akka-grpc/$VERSION$/) documentation. Check that the reference docs were deployed and show a version warning (see section below on how to fix the version warning). -- [ ] Check the release on [Maven central](https://repo1.maven.org/maven2/com/lightbend/akka/grpc/akka-grpc-scalapb-protoc-plugin_2.13/$VERSION$/) +- [ ] Check the release on https://repo.akka.io/maven/com/lightbend/akka/grpc/akka-grpc-scalapb-protoc-plugin_2.13/$VERSION$/akka-grpc-scalapb-protoc-plugin_2.13-$VERSION$.pom -### When everything is on maven central +### When everything is on https://repo.akka.io/maven - [ ] Log into `gustav.akka.io` as `akkarepo` - [ ] If this updates the `current` version, run `./update-akka-grpc-current-version.sh $VERSION$` - [ ] otherwise check changes and commit the new version to the local git repository diff --git a/docs/src/main/paradox/client/walkthrough.md b/docs/src/main/paradox/client/walkthrough.md index 14c95d618..d8edbcfe9 100644 --- a/docs/src/main/paradox/client/walkthrough.md +++ b/docs/src/main/paradox/client/walkthrough.md @@ -14,8 +14,11 @@ sbt : @@@vars ```scala // in project/plugins.sbt: +resolvers += "Akka library repository".at("https://repo.akka.io/maven") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "$project.version$") +// // in build.sbt: +resolvers += "Akka library repository".at("https://repo.akka.io/maven") enablePlugins(AkkaGrpcPlugin) ``` @@@ @@ -49,10 +52,17 @@ Maven my-grpc-app 0.1-SNAPSHOT - $project.version$ - $grpc.version$ - UTF-8 - + $project.version$ + $grpc.version$ + UTF-8 + + + + akka-repository + Akka library repository + https://repo.akka.io/maven + + com.lightbend.akka.grpc diff --git a/docs/src/main/paradox/server/walkthrough.md b/docs/src/main/paradox/server/walkthrough.md index 4d909440e..39ab34141 100644 --- a/docs/src/main/paradox/server/walkthrough.md +++ b/docs/src/main/paradox/server/walkthrough.md @@ -12,9 +12,11 @@ sbt : @@@vars ```scala // in project/plugins.sbt: + resolvers += "Akka library repository".at("https://repo.akka.io/maven") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "$project.version$") // // in build.sbt: + resolvers += "Akka library repository".at("https://repo.akka.io/maven") enablePlugins(AkkaGrpcPlugin) ``` @@@ @@ -26,6 +28,9 @@ Gradle repositories { mavenLocal() gradlePluginPortal() + maven { + url "https://repo.akka.io/maven" + } } dependencies { // see https://plugins.gradle.org/plugin/com.lightbend.akka.grpc.gradle @@ -41,6 +46,9 @@ Gradle repositories { mavenLocal() mavenCentral() + maven { + url "https://repo.akka.io/maven" + } } ``` @@@ @@ -59,6 +67,13 @@ Maven $grpc.version$ UTF-8 + + + akka-repository + Akka library repository + https://repo.akka.io/maven + + com.lightbend.akka.grpc diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle index fa10d19b5..ea817f7de 100644 --- a/gradle-plugin/build.gradle +++ b/gradle-plugin/build.gradle @@ -45,6 +45,9 @@ jar { repositories { mavenCentral() + maven { + url "https://repo.akka.io/maven" + } } dependencies { diff --git a/plugin-tester-java/build.gradle b/plugin-tester-java/build.gradle index 11fe181df..10a91baf8 100644 --- a/plugin-tester-java/build.gradle +++ b/plugin-tester-java/build.gradle @@ -13,11 +13,15 @@ akkaGrpc { repositories { mavenLocal() + mavenCentral() + maven { + url "https://repo.akka.io/maven" + } } def scalaVersion = org.gradle.util.VersionNumber.parse(System.getenv("TRAVIS_SCALA_VERSION") ?: "2.13") def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}" -def akkaVersion = "2.9.0-M2" +def akkaVersion = "2.9.0-M3" dependencies { implementation group: 'ch.megard', name: "akka-http-cors_${scalaBinaryVersion}", version: '1.1.3' diff --git a/plugin-tester-java/pom.xml b/plugin-tester-java/pom.xml index b628a75c7..28b8d6e68 100644 --- a/plugin-tester-java/pom.xml +++ b/plugin-tester-java/pom.xml @@ -15,7 +15,7 @@ 3.1.2 3.0.0 1.1.0 - 2.9.0-M2 + 2.9.0-M3 1.54.2 UTF-8 3.3.0 @@ -23,6 +23,14 @@ 2.16.0 + + + akka-repository + Akka library repository + https://repo.akka.io/maven + + + com.lightbend.akka.grpc diff --git a/plugin-tester-java/settings.gradle b/plugin-tester-java/settings.gradle index cc1fa6f28..7c95d580c 100644 --- a/plugin-tester-java/settings.gradle +++ b/plugin-tester-java/settings.gradle @@ -2,6 +2,9 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + maven { + url "https://repo.akka.io/maven" + } } plugins { id 'com.lightbend.akka.grpc.gradle' version "${System.getProperty('akka.grpc.project.version')}" diff --git a/plugin-tester-scala/build.gradle b/plugin-tester-scala/build.gradle index 71e18c14d..3e6774266 100644 --- a/plugin-tester-scala/build.gradle +++ b/plugin-tester-scala/build.gradle @@ -8,11 +8,15 @@ akkaGrpc { repositories { mavenLocal() + mavenCentral() + maven { + url "https://repo.akka.io/maven" + } } def scalaVersion = org.gradle.util.VersionNumber.parse(System.getenv("TRAVIS_SCALA_VERSION") ?: "2.13") def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}" -def akkaVersion = "2.9.0-M2" +def akkaVersion = "2.9.0-M3" dependencies { implementation group: 'ch.megard', name: "akka-http-cors_${scalaBinaryVersion}", version: '1.1.3' diff --git a/plugin-tester-scala/pom.xml b/plugin-tester-scala/pom.xml index e83eccb5a..594bd4be7 100644 --- a/plugin-tester-scala/pom.xml +++ b/plugin-tester-scala/pom.xml @@ -12,12 +12,20 @@ 11 - 2.9.0-M2 + 2.9.0-M3 0.4.2 1.54.2 UTF-8 + + + akka-repository + Akka library repository + https://repo.akka.io/maven + + + com.lightbend.akka.grpc diff --git a/plugin-tester-scala/settings.gradle b/plugin-tester-scala/settings.gradle index 87858e3bb..15e7c197e 100644 --- a/plugin-tester-scala/settings.gradle +++ b/plugin-tester-scala/settings.gradle @@ -2,6 +2,9 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() + maven { + url "https://repo.akka.io/maven" + } } plugins { id 'com.lightbend.akka.grpc.gradle' version "${System.getProperty('akka.grpc.project.version')}" diff --git a/project/Common.scala b/project/Common.scala index 97a8f28f6..5d10a3f93 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -9,7 +9,6 @@ import org.scalafmt.sbt.ScalafmtPlugin.autoImport.scalafmtOnCompile import com.typesafe.tools.mima.plugin.MimaKeys._ import sbtprotoc.ProtocPlugin.autoImport.PB import xerial.sbt.Sonatype -import xerial.sbt.Sonatype.autoImport.sonatypeProfileName object Common extends AutoPlugin { override def trigger = allRequirements @@ -23,7 +22,7 @@ object Common extends AutoPlugin { organization := "com.lightbend.akka.grpc", organizationName := "Lightbend Inc.", organizationHomepage := Some(url("https://www.lightbend.com/")), - resolvers ++= Resolver.sonatypeOssRepos("staging"), // makes testing HTTP releases early easier + resolvers += "Akka library repository".at("https://repo.akka.io/maven"), homepage := Some(url("https://akka.io/")), scmInfo := Some(ScmInfo(url("https://github.com/akka/akka-grpc"), "git@github.com:akka/akka-grpc")), developers += Developer( @@ -46,7 +45,6 @@ object Common extends AutoPlugin { override lazy val projectSettings = Seq( projectInfoVersion := (if (isSnapshot.value) "snapshot" else version.value), - sonatypeProfileName := "com.lightbend", scalacOptions ++= Seq( "-release", "11", diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 7078def49..95d3fd685 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -17,9 +17,9 @@ object Dependencies { // We don't force Akka updates because downstream projects can upgrade // themselves. For more information see // https://doc.akka.io//docs/akka/current/project/downstream-upgrade-strategy.html - val akka = "2.9.0-M2" + val akka = "2.9.0-M3" val akkaBinary = "2.8" - val akkaHttp = "10.6.0-M1" + val akkaHttp = "10.6.0-M2" val akkaHttpBinary = "10.6" val grpc = "1.54.2" // checked synced by VersionSyncCheckPlugin diff --git a/project/Publish.scala b/project/Publish.scala new file mode 100644 index 000000000..7a0d70686 --- /dev/null +++ b/project/Publish.scala @@ -0,0 +1,60 @@ +package akka.grpc + +import java.util.concurrent.atomic.AtomicBoolean + +import scala.language.postfixOps + +import sbt.{ Def, _ } +import Keys._ +import com.geirsson.CiReleasePlugin +import com.jsuereth.sbtpgp.PgpKeys.publishSigned +import xerial.sbt.Sonatype.autoImport.sonatypeProfileName + +/** + * For projects that are not published. + */ +object NoPublish extends AutoPlugin { + override def requires = plugins.JvmPlugin && Common + + override def projectSettings = + Seq(publish / skip := true, publishArtifact := false, publish := {}, publishLocal := {}) +} + +object Publish extends AutoPlugin { + override def requires = plugins.JvmPlugin && Common + override def trigger = AllRequirements + + lazy val beforePublishTask = taskKey[Unit]("setup before publish") + + lazy val beforePublishDone = new AtomicBoolean(false) + + def beforePublish(snapshot: Boolean) = { + if (beforePublishDone.compareAndSet(false, true)) { + CiReleasePlugin.setupGpg() + if (!snapshot) + cloudsmithCredentials(validate = true) + } + } + + override def projectSettings: Seq[Def.Setting[_]] = Seq( + sonatypeProfileName := "com.lightbend", + beforePublishTask := beforePublish(isSnapshot.value), + publishSigned := publishSigned.dependsOn(beforePublishTask).value, + publishTo := (if (isSnapshot.value) + Some(Resolver.file("file", target.value / "repository")) // FIXME snapshot repo + else + Some("Cloudsmith API".at("https://maven.cloudsmith.io/lightbend/akka/"))), + credentials ++= (if (isSnapshot.value) Seq[Credentials]() else cloudsmithCredentials(validate = false))) + + def cloudsmithCredentials(validate: Boolean): Seq[Credentials] = { + (sys.env.get("PUBLISH_USER"), sys.env.get("PUBLISH_PASSWORD")) match { + case (Some(user), Some(password)) => + Seq(Credentials("Cloudsmith API", "maven.cloudsmith.io", user, password)) + case _ => + if (validate) + throw new Exception("Publishing credentials expected in `PUBLISH_USER` and `PUBLISH_PASSWORD`.") + else + Nil + } + } +} diff --git a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt index bdbfcc16d..f7cdca78f 100644 --- a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt @@ -1,6 +1,6 @@ scalaVersion := "2.13.11" -resolvers += Resolver.sonatypeRepo("staging") +resolvers += "Akka library repository".at("https://repo.akka.io/maven") enablePlugins(AkkaGrpcPlugin) diff --git a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/plugins.sbt index 646e81fd9..a0bf6b16b 100644 --- a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/plugins.sbt @@ -1 +1,2 @@ +resolvers += "Akka library repository".at("https://repo.akka.io/maven") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) diff --git a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt index fa485943b..87faaac62 100644 --- a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt @@ -1,6 +1,6 @@ scalaVersion := "2.13.11" -resolvers += Resolver.sonatypeRepo("staging") +resolvers += "Akka library repository".at("https://repo.akka.io/maven") enablePlugins(AkkaGrpcPlugin) diff --git a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/plugins.sbt index 646e81fd9..a0bf6b16b 100644 --- a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/plugins.sbt @@ -1 +1,2 @@ +resolvers += "Akka library repository".at("https://repo.akka.io/maven") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) diff --git a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt index fa485943b..87faaac62 100644 --- a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt @@ -1,6 +1,6 @@ scalaVersion := "2.13.11" -resolvers += Resolver.sonatypeRepo("staging") +resolvers += "Akka library repository".at("https://repo.akka.io/maven") enablePlugins(AkkaGrpcPlugin) diff --git a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/plugins.sbt index 646e81fd9..a0bf6b16b 100644 --- a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/plugins.sbt @@ -1 +1,2 @@ +resolvers += "Akka library repository".at("https://repo.akka.io/maven") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) diff --git a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt index bdbfcc16d..f7cdca78f 100644 --- a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt @@ -1,6 +1,6 @@ scalaVersion := "2.13.11" -resolvers += Resolver.sonatypeRepo("staging") +resolvers += "Akka library repository".at("https://repo.akka.io/maven") enablePlugins(AkkaGrpcPlugin) diff --git a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/plugins.sbt index 646e81fd9..a0bf6b16b 100644 --- a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/plugins.sbt @@ -1 +1,2 @@ +resolvers += "Akka library repository".at("https://repo.akka.io/maven") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) diff --git a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt index fa485943b..87faaac62 100644 --- a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt @@ -1,6 +1,6 @@ scalaVersion := "2.13.11" -resolvers += Resolver.sonatypeRepo("staging") +resolvers += "Akka library repository".at("https://repo.akka.io/maven") enablePlugins(AkkaGrpcPlugin) diff --git a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/plugins.sbt index 646e81fd9..a0bf6b16b 100644 --- a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/plugins.sbt @@ -1 +1,2 @@ +resolvers += "Akka library repository".at("https://repo.akka.io/maven") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt index f1538ed1b..4ac1891fd 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt @@ -1,6 +1,6 @@ scalaVersion := "2.13.11" -resolvers += Resolver.sonatypeRepo("staging") +resolvers += "Akka library repository".at("https://repo.akka.io/maven") organization := "com.lightbend.akka.grpc" diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/plugins.sbt index 646e81fd9..a0bf6b16b 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/plugins.sbt @@ -1 +1,2 @@ +resolvers += "Akka library repository".at("https://repo.akka.io/maven") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt index 3ca9a4b5c..da5108779 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt @@ -1,6 +1,6 @@ scalaVersion := "2.13.11" -resolvers += Resolver.sonatypeRepo("staging") +resolvers += "Akka library repository".at("https://repo.akka.io/maven") scalacOptions += "-Xfatal-warnings" diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/plugins.sbt index 15a55e863..de880eeda 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/plugins.sbt @@ -1,3 +1,5 @@ +resolvers += "Akka library repository".at("https://repo.akka.io/maven") + addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1") diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt index ddcdca6f8..89a930afa 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt @@ -1,5 +1,5 @@ scalaVersion := "2.13.11" -resolvers += Resolver.sonatypeRepo("staging") +resolvers += "Akka library repository".at("https://repo.akka.io/maven") enablePlugins(AkkaGrpcPlugin) diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/plugins.sbt index 646e81fd9..a0bf6b16b 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/plugins.sbt @@ -1 +1,2 @@ +resolvers += "Akka library repository".at("https://repo.akka.io/maven") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt index ec4e12cf7..2f75213df 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt @@ -1,6 +1,6 @@ scalaVersion := "2.13.11" -resolvers += Resolver.sonatypeRepo("staging") +resolvers += "Akka library repository".at("https://repo.akka.io/maven") enablePlugins(AkkaGrpcPlugin) diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/plugins.sbt index ac863a667..a0bf6b16b 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/plugins.sbt @@ -1 +1,2 @@ -addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) \ No newline at end of file +resolvers += "Akka library repository".at("https://repo.akka.io/maven") +addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt index ddcdca6f8..89a930afa 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt @@ -1,5 +1,5 @@ scalaVersion := "2.13.11" -resolvers += Resolver.sonatypeRepo("staging") +resolvers += "Akka library repository".at("https://repo.akka.io/maven") enablePlugins(AkkaGrpcPlugin) diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/plugins.sbt index 646e81fd9..a0bf6b16b 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/plugins.sbt @@ -1 +1,2 @@ +resolvers += "Akka library repository".at("https://repo.akka.io/maven") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt index ddcdca6f8..89a930afa 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt @@ -1,5 +1,5 @@ scalaVersion := "2.13.11" -resolvers += Resolver.sonatypeRepo("staging") +resolvers += "Akka library repository".at("https://repo.akka.io/maven") enablePlugins(AkkaGrpcPlugin) diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/plugins.sbt index 646e81fd9..a0bf6b16b 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/plugins.sbt @@ -1 +1,2 @@ +resolvers += "Akka library repository".at("https://repo.akka.io/maven") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt index 13145edb1..e43cc14ac 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt @@ -1,6 +1,6 @@ scalaVersion := "2.13.11" -resolvers += Resolver.sonatypeRepo("staging") +resolvers += "Akka library repository".at("https://repo.akka.io/maven") // Disable for now because of: https://github.com/protocolbuffers/protobuf-javascript/issues/127 // enablePlugins(ProtocJSPlugin) // enable it first to test possibility of getting overriden diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/plugins.sbt index 646e81fd9..a0bf6b16b 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/plugins.sbt @@ -1 +1,2 @@ +resolvers += "Akka library repository".at("https://repo.akka.io/maven") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-27/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-27/build.sbt index bb67a341a..9f924dd1a 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-27/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-27/build.sbt @@ -1,10 +1,10 @@ scalaVersion := "2.13.11" -resolvers += Resolver.sonatypeRepo("staging") +resolvers += "Akka library repository".at("https://repo.akka.io/maven") enablePlugins(AkkaGrpcPlugin) -dependencyOverrides += "com.typesafe.akka" %% "akka-stream" % "2.9.0-M2" +dependencyOverrides += "com.typesafe.akka" %% "akka-stream" % "2.9.0-M3" assembly / assemblyMergeStrategy := { // https://github.com/akka/akka/issues/29456 diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-27/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-27/project/plugins.sbt index 15a55e863..de880eeda 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-27/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-27/project/plugins.sbt @@ -1,3 +1,5 @@ +resolvers += "Akka library repository".at("https://repo.akka.io/maven") + addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1") diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt index f65d0119b..e149daa4a 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt @@ -1,6 +1,6 @@ scalaVersion := "2.13.11" -resolvers += Resolver.sonatypeRepo("staging") +resolvers += "Akka library repository".at("https://repo.akka.io/maven") enablePlugins(AkkaGrpcPlugin) diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/plugins.sbt index ac863a667..a0bf6b16b 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/plugins.sbt @@ -1 +1,2 @@ -addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) \ No newline at end of file +resolvers += "Akka library repository".at("https://repo.akka.io/maven") +addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt index dbae7496a..5dcd0a4f5 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt @@ -1,6 +1,6 @@ scalaVersion := "2.13.11" -resolvers += Resolver.sonatypeRepo("staging") +resolvers += "Akka library repository".at("https://repo.akka.io/maven") //#setup import scalapb.GeneratorOption._ diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/plugins.sbt index 6b4e3a293..8ca9396df 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/plugins.sbt @@ -1,3 +1,5 @@ +resolvers += "Akka library repository".at("https://repo.akka.io/maven") + addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) libraryDependencies ++= Seq("com.thesamet.scalapb" %% "scalapb-validate-codegen" % "0.3.0") diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt index ddcdca6f8..89a930afa 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt @@ -1,5 +1,5 @@ scalaVersion := "2.13.11" -resolvers += Resolver.sonatypeRepo("staging") +resolvers += "Akka library repository".at("https://repo.akka.io/maven") enablePlugins(AkkaGrpcPlugin) diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/plugins.sbt index 646e81fd9..a0bf6b16b 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/plugins.sbt @@ -1 +1,2 @@ +resolvers += "Akka library repository".at("https://repo.akka.io/maven") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) diff --git a/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/build.sbt b/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/build.sbt index a1b53d66b..b270113ab 100644 --- a/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/build.sbt +++ b/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/build.sbt @@ -1,6 +1,6 @@ scalaVersion := "2.13.11" -resolvers += Resolver.sonatypeRepo("staging") +resolvers += "Akka library repository".at("https://repo.akka.io/maven") scalacOptions += "-Xfatal-warnings" @@ -8,5 +8,5 @@ enablePlugins(AkkaGrpcPlugin) libraryDependencies ++= Seq( // just to make sure it works with Scala 3 artifacts - "com.typesafe.akka" %% "akka-http" % "10.6.0-M1", + "com.typesafe.akka" %% "akka-http" % "10.6.0-M2", "org.scalatest" %% "scalatest" % "3.2.12" % "test") diff --git a/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/project/plugins.sbt b/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/project/plugins.sbt index 646e81fd9..a0bf6b16b 100644 --- a/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/project/plugins.sbt @@ -1 +1,2 @@ +resolvers += "Akka library repository".at("https://repo.akka.io/maven") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version")) diff --git a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt index 67ff17787..6071e721c 100644 --- a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt +++ b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt @@ -1,6 +1,6 @@ scalaVersion := "3.3.1" -resolvers += Resolver.sonatypeRepo("staging") +resolvers += "Akka library repository".at("https://repo.akka.io/maven") scalacOptions += "-Xfatal-warnings" @@ -8,5 +8,5 @@ enablePlugins(AkkaGrpcPlugin) libraryDependencies ++= Seq( // just to make sure it works with Scala 3 artifacts - "com.typesafe.akka" %% "akka-http" % "10.6.0-M1", + "com.typesafe.akka" %% "akka-http" % "10.6.0-M2", "org.scalatest" %% "scalatest" % "3.2.12" % "test") diff --git a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/plugins.sbt b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/plugins.sbt index 646e81fd9..a0bf6b16b 100644 --- a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/plugins.sbt +++ b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/plugins.sbt @@ -1 +1,2 @@ +resolvers += "Akka library repository".at("https://repo.akka.io/maven") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % sys.props("project.version"))