From c6311acd8d08987f4d40a84e464e1a8016089bd2 Mon Sep 17 00:00:00 2001 From: Andrea Peruffo Date: Thu, 29 Apr 2021 10:47:50 +0100 Subject: [PATCH 1/2] Remove more Bintray references --- core/build.sbt | 21 +------------------ core/project/plugins.sbt | 1 - .../develop/pages/project-structure.adoc | 2 -- .../sbt/CommonSettingsAndTasksPlugin.scala | 4 ---- 4 files changed, 1 insertion(+), 27 deletions(-) diff --git a/core/build.sbt b/core/build.sbt index 7b7d176a5..311c68463 100644 --- a/core/build.sbt +++ b/core/build.sbt @@ -441,25 +441,7 @@ def cloudflowModule(moduleID: String): Project = .settings(commonSettings) .enablePlugins(AutomateHeaderPlugin) -// These settings are made active only when we use bintray for internal release -// It is important that when we do final releases we need to invoke sbt as -// `sbt -Dsbt.sbtbintray=false` -lazy val bintraySettings = - if (BintrayPlugin.isEnabledViaProp) { - Seq( - bintrayOrganization := Some("lightbend"), - bintrayRepository := "cloudflow", - bintrayOmitLicense := true, - publishMavenStyle := false, - resolvers ++= Seq( - "Akka Snapshots".at("https://repo.akka.io/snapshots/"), - "com-mvn".at("https://repo.lightbend.com/cloudflow"), - Resolver.url("com-ivy", url("https://repo.lightbend.com/cloudflow"))(Resolver.ivyStylePatterns) - ) - ) - } else Seq.empty - -lazy val commonSettings = bintraySettings ++ Seq( +lazy val commonSettings = Seq( organization := "com.lightbend.cloudflow", headerLicense := Some(HeaderLicense.ALv2("(C) 2016-2021", "Lightbend Inc. ")), scalaVersion := Version.Scala212, @@ -503,7 +485,6 @@ lazy val commonSettings = bintraySettings ++ Seq( "-doc-canonical-base-url", "https://cloudflow.io/docs/current/api/scaladoc/" ), - resolvers += Resolver.url("cloudflow", url("https://lightbend.bintray.com/cloudflow"))(Resolver.ivyStylePatterns), resolvers += "Akka Snapshots".at("https://repo.akka.io/snapshots/"), scalacOptions in (Compile, console) := (scalacOptions in (Global)).value.filter(_ == "-Ywarn-unused-import"), scalacOptions in (Test, console) := (scalacOptions in (Compile, console)).value, diff --git a/core/project/plugins.sbt b/core/project/plugins.sbt index 732498021..a91af2891 100644 --- a/core/project/plugins.sbt +++ b/core/project/plugins.sbt @@ -18,7 +18,6 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1") addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8") -addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.6") addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.31") libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.10.2" diff --git a/docs/shared-content-source/docs/modules/develop/pages/project-structure.adoc b/docs/shared-content-source/docs/modules/develop/pages/project-structure.adoc index 34025ad4a..e2fcce6ea 100644 --- a/docs/shared-content-source/docs/modules/develop/pages/project-structure.adoc +++ b/docs/shared-content-source/docs/modules/develop/pages/project-structure.adoc @@ -52,8 +52,6 @@ include::{cloudflow-examples-version}@docsnippets:ROOT:example$akkastreams-scala ---- <1> Adds the `sbt-cloudflow` plugin with a given version to the build definition. -ifdef::review[REVIEWERS: where does cloudflow-plugins.sbt contain the "bintray" location for cloudflow? I removed the comment because I don't see it, but if it is there, I'll add it back. ] - WARNING: The version of the `sbt-cloudflow` plugin defines which version of Cloudflow you are using. It must match with the version installed in your Kubernetes cluster. diff --git a/tools/cloudflow-sbt-plugin/src/main/scala/cloudflow/sbt/CommonSettingsAndTasksPlugin.scala b/tools/cloudflow-sbt-plugin/src/main/scala/cloudflow/sbt/CommonSettingsAndTasksPlugin.scala index 934597159..b52ed15c2 100644 --- a/tools/cloudflow-sbt-plugin/src/main/scala/cloudflow/sbt/CommonSettingsAndTasksPlugin.scala +++ b/tools/cloudflow-sbt-plugin/src/main/scala/cloudflow/sbt/CommonSettingsAndTasksPlugin.scala @@ -42,16 +42,12 @@ object CommonSettingsAndTasksPlugin extends AutoPlugin { import autoImport._ - // used for internal release - final val CloudflowBintrayReleasesRepoUrl = "https://lightbend.bintray.com/cloudflow" private final val CloudflowVersion = BuildInfo.version /** Set default values for keys. */ override def projectSettings = Seq( cloudflowVersion := CloudflowVersion, - // Cloudflow is released with Ivy patterns - bintray is used for internal release - resolvers += Resolver.url("cloudflow", url(CloudflowBintrayReleasesRepoUrl))(Resolver.ivyStylePatterns), cloudflowDockerImageName := Def.task { Some(DockerImageName((ThisProject / name).value.toLowerCase, (ThisProject / version).value)) }.value, From 4281e418874c5ac8c76b8b3d339f0a75ee82b19c Mon Sep 17 00:00:00 2001 From: Andrea Peruffo Date: Thu, 29 Apr 2021 10:53:26 +0100 Subject: [PATCH 2/2] fmt --- core/build.sbt | 96 ++++++++++++++++++++-------------------- core/project/plugins.sbt | 2 +- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/core/build.sbt b/core/build.sbt index 311c68463..1c9cd04e8 100644 --- a/core/build.sbt +++ b/core/build.sbt @@ -442,54 +442,54 @@ def cloudflowModule(moduleID: String): Project = .enablePlugins(AutomateHeaderPlugin) lazy val commonSettings = Seq( - organization := "com.lightbend.cloudflow", - headerLicense := Some(HeaderLicense.ALv2("(C) 2016-2021", "Lightbend Inc. ")), - scalaVersion := Version.Scala212, - autoAPIMappings := true, - useGpgAgent := false, - releaseProcess := Seq[ReleaseStep]( - // TODO: re-introduce this command - // checkSnapshotDependencies, - runClean, - releaseStepCommand("+test"), - releaseStepCommandAndRemaining("+publishSigned"), - releaseStepCommand("sonatypeBundleRelease"), - pushChanges - ), - unidocGenjavadocVersion := "0.16", - scalacOptions ++= Seq( - "-encoding", - "UTF-8", - "-target:jvm-1.8", - "-Xlog-reflective-calls", - "-Xlint", - "-Ywarn-unused", - "-deprecation", - "-feature", - "-language:_", - "-unchecked" - ), - Compile / doc / scalacOptions := (Compile / doc / scalacOptions).value ++ Seq( - "-doc-title", - "Cloudflow", - "-doc-version", - version.value, - "-sourcepath", - (baseDirectory in ThisBuild).value.toString, - "-skip-packages", - "akka.pattern:scala", // for some reason Scaladoc creates this - "-doc-source-url", { - val branch = if (isSnapshot.value) "master" else s"v${version.value}" - s"https://github.com/lightbend/cloudflow/tree/${branch}€{FILE_PATH_EXT}#L€{FILE_LINE}" - }, - "-doc-canonical-base-url", - "https://cloudflow.io/docs/current/api/scaladoc/" - ), - resolvers += "Akka Snapshots".at("https://repo.akka.io/snapshots/"), - scalacOptions in (Compile, console) := (scalacOptions in (Global)).value.filter(_ == "-Ywarn-unused-import"), - scalacOptions in (Test, console) := (scalacOptions in (Compile, console)).value, - publishTo := sonatypePublishToBundle.value - ) + organization := "com.lightbend.cloudflow", + headerLicense := Some(HeaderLicense.ALv2("(C) 2016-2021", "Lightbend Inc. ")), + scalaVersion := Version.Scala212, + autoAPIMappings := true, + useGpgAgent := false, + releaseProcess := Seq[ReleaseStep]( + // TODO: re-introduce this command + // checkSnapshotDependencies, + runClean, + releaseStepCommand("+test"), + releaseStepCommandAndRemaining("+publishSigned"), + releaseStepCommand("sonatypeBundleRelease"), + pushChanges + ), + unidocGenjavadocVersion := "0.16", + scalacOptions ++= Seq( + "-encoding", + "UTF-8", + "-target:jvm-1.8", + "-Xlog-reflective-calls", + "-Xlint", + "-Ywarn-unused", + "-deprecation", + "-feature", + "-language:_", + "-unchecked" + ), + Compile / doc / scalacOptions := (Compile / doc / scalacOptions).value ++ Seq( + "-doc-title", + "Cloudflow", + "-doc-version", + version.value, + "-sourcepath", + (baseDirectory in ThisBuild).value.toString, + "-skip-packages", + "akka.pattern:scala", // for some reason Scaladoc creates this + "-doc-source-url", { + val branch = if (isSnapshot.value) "master" else s"v${version.value}" + s"https://github.com/lightbend/cloudflow/tree/${branch}€{FILE_PATH_EXT}#L€{FILE_LINE}" + }, + "-doc-canonical-base-url", + "https://cloudflow.io/docs/current/api/scaladoc/" + ), + resolvers += "Akka Snapshots".at("https://repo.akka.io/snapshots/"), + scalacOptions in (Compile, console) := (scalacOptions in (Global)).value.filter(_ == "-Ywarn-unused-import"), + scalacOptions in (Test, console) := (scalacOptions in (Compile, console)).value, + publishTo := sonatypePublishToBundle.value +) releaseIgnoreUntrackedFiles := true // https://github.com/dwijnand/sbt-dynver#portable-version-strings diff --git a/core/project/plugins.sbt b/core/project/plugins.sbt index a91af2891..bd0cb3ddb 100644 --- a/core/project/plugins.sbt +++ b/core/project/plugins.sbt @@ -17,7 +17,7 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1") // to generate one complete scaladoc site and one complete javadoc site addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8") addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.31") libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.10.2"