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.

Sign up for GitHub

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

Jump to bottom

Remove more Bintray references #1039

Merged
merged 2 commits into from
Apr 29, 2021
Merged

Remove more Bintray references #1039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6311ac
Remove more Bintray references
andreaTP Apr 29, 2021
4281e41
fmt
andreaTP Apr 29, 2021
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
117 changes: 49 additions & 68 deletions core/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,74 +441,55 @@ 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(
organization := "com.lightbend.cloudflow",
headerLicense := Some(HeaderLicense.ALv2("(C) 2016-2021", "Lightbend Inc. <https://www.lightbend.com>")),
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 += 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,
publishTo := sonatypePublishToBundle.value
)
lazy val commonSettings = Seq(
organization := "com.lightbend.cloudflow",
headerLicense := Some(HeaderLicense.ALv2("(C) 2016-2021", "Lightbend Inc. <https://www.lightbend.com>")),
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
Expand Down
3 changes: 1 addition & 2 deletions core/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +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.foundweekends" % "sbt-bintray" % "0.5.6")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8")

addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.31")
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.10.2"
2 changes: 0 additions & 2 deletions docs/shared-content-source/docs/modules/develop/pages/project-structure.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 0 additions & 4 deletions tools/cloudflow-sbt-plugin/src/main/scala/cloudflow/sbt/CommonSettingsAndTasksPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down