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

remove old Bintray-based publishing #599

Merged
merged 2 commits into from
Aug 4, 2021
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
9 changes: 2 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ git:
env:
jobs:
- TRAVIS_JDK=11
global:
# encrypt with: travis encrypt --pro BINTRAY_USER=...
- secure: "RZUI6IHOV95LVej30BSsU5Oi8pEoFJDEwaitRj6AxK11YEvheUbcXhudw7BLQjubVwOzsMcJvuo7WINigshYmZiBSbsinuFJMdhq6vJkmoKnrA6RvY3/jkPddSKBHpaaCAYW7hVX4SmvZZucM6NHtYY5R8BA3lVUZepG/402HANvx1hZEQ12mYSJxCUk4UBUWaXLb7sl21CcuIsaEMR9wY6qzirGsyQSXGALCi9y7txfzJvVrsmomIeDx3xdITP4GQ6UW9QhPdpqoNr9TaZG0mtCfzMEPqdBJ+eR/e7R6IxvDQQ+kb0wbviDaSvTPUgzDWApBmJhWiu1hzx+dxsVCbayon5nEAWMMqUaBHQvYuujn0YV0aE8Wca4yo0HT9lWwnW3EId5+f4Na99e2YwVp7OwPtBL1ISzojFTh3CzBqkzhiZRfuYVAHCIJgxOUwXvvSWYh4oc5JZDUef47RNkIGH/iBpJ6nBsTiR/S1ZaGVoqf6XZiRu8xVGpZTCAyMwofX6JJcaWJgX2mxz9kx5PadXb7eJPwOO9CsdhiNBEtDBZdKQbIMVCtFw/kjgujCtJsl7y5PcW0SOJeUG6M9V79hwDkni8PdV0xxlyR0GzI7fULDht+qE8xwUDuIh4J4EUp1RC+oqNAXVPlrNvSTCRsyYdPs9WhyPxmpR7eFiEFoo="
# encrypt with: travis encrypt --pro BINTRAY_PASS=...
- secure: "MFp03KTS8Xaigf5geg3cVRTN+yxUuON9T3bEAtCXIAdsIj0tPDTJJ8ilZ2qxSfrUdNXmXwcBhjcT8iAIpth1q5JUu2gUXWP/hTGktqrvMWEHbAxYC0FNZea53a6aow1EqbHZEL2t+Bi7SAUxbNtVFNPICfLxL0Y4wLpoCT0HBjfM+vnQ04L49YyGM1xECmkR3VD6d6qra71rmIwIr8yHU7NOd4dVXxSmTfAJU3NiKDYbJX2yOofW+Fo70HTghmCryjcK47DPmrHzeVGwhVlqPvcSY/Bf4Ib82mMR7g3+plVb48etJRfE/Bm+UzadcSzxx+PRfsu0qSwptwCmeDHB+wwfqu6NX5AZhuOjzXuctSqje5TDBjhmS9hIxOM8Abl3w4QVFLdk8bNc6sWJ7VyRxXt2VgIHEoN+cQwKbxAyrxokwp43O/tVB5+fho04vjwiX61pH4GKXzGTVaEZVCaEBmXqThVoeb9T+PxG/ofMGEqFT3NZVEhAZRx2AbqE7ALuDykKc5aIs4fFUZwnNYYoTWsnBHBaZZqVqeexVCt3cFAArNg6xhYujswOMWv9kkp2CgDY3jbqFisH9yanOuCoh2lKIgLzldv5q2kYoS4tUIKqqTnjMaB0/GyU5UT61IBxo5NMjDVb7YvhqgBXBzdoFQh1ODyKeNoKc/IWGbfXfYw="

scala:
- 2.13.6
Expand Down Expand Up @@ -61,13 +56,13 @@ jobs:
- TRAVIS_JDK=8

- stage: publish
name: "Publish artifacts to Bintray"
name: "Publish artifacts to Sonatype"
script: sbt +publish

stages:
- name: test
- name: publish
if: ((branch = main AND type = push) OR (tag IS present)) AND NOT fork
if: (tag IS present) AND NOT fork

cache:
directories:
Expand Down
9 changes: 2 additions & 7 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@ This is released from the `main` branch from `2.2.0` forward. Unless an older ve
- Check the [draft release notes](https://github.com/playframework/play-ws/releases) to see if everything is there
- Wait until [main branch build finishes](https://travis-ci.com/github/playframework/play-ws/builds) after merging the last PR
- Update the [draft release](https://github.com/playframework/play-ws/releases) with the next tag version (eg. `2.2.0`), title and release description
- Check that Travis CI release build has executed successfully (Travis will start a [CI build](https://travis-ci.com/github/playframework/play-ws/builds) for the new tag and publish artifacts to Bintray)

### Requires Bintray access

- Go to [Bintray](https://bintray.com/playframework/maven/play-ws) and select the just released version
- Go to the Maven Central tab and sync with Sonatype (using your Sonatype TOKEN key and password) (you may watch progress in the [Staging repository](https://oss.sonatype.org/#stagingRepositories))
- Check that Travis CI release build has executed successfully (Travis will start a [CI build](https://travis-ci.com/github/playframework/play-ws/builds) for the new tag and publish artifacts to Sonatype)

### Check Maven Central

- The artifacts will become visible at https://repo1.maven.org/maven2/com/typesafe/play/
- The artifacts will become visible at https://repo1.maven.org/maven2/com/typesafe/play/
11 changes: 1 addition & 10 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ import sbtassembly.MergeStrategy
// Shading and Project Settings
//---------------------------------------------------------------

resolvers ++= DefaultOptions.resolvers(snapshot = true)
ThisBuild / resolvers += Resolver.sonatypeRepo("public")
ThisBuild / resolvers += Resolver.bintrayRepo("akka", "snapshots")

// Customise sbt-dynver's behaviour to make it work with tags which aren't v-prefixed
ThisBuild / dynverVTagPrefix := false

Expand Down Expand Up @@ -80,6 +76,7 @@ lazy val mimaSettings = Seq(
)

lazy val commonSettings = Def.settings(
// sonatypeProfileName := "com.typesafe", // TODO uncomment when we add sbt-ci-release
organization := "com.typesafe.play",
organizationName := "Lightbend Inc.",
organizationHomepage := Some(url("https://www.lightbend.com/")),
Expand Down Expand Up @@ -180,7 +177,6 @@ def dependenciesFilter(n: XNode) =

lazy val `shaded-asynchttpclient` = project
.in(file("shaded/asynchttpclient"))
.enablePlugins(Publish)
.disablePlugins(MimaPlugin)
.settings(commonSettings)
.settings(shadeAssemblySettings)
Expand Down Expand Up @@ -227,7 +223,6 @@ lazy val `shaded-asynchttpclient` = project

lazy val `shaded-oauth` = project
.in(file("shaded/oauth"))
.enablePlugins(Publish)
.disablePlugins(MimaPlugin)
.settings(commonSettings)
.settings(shadeAssemblySettings)
Expand Down Expand Up @@ -277,7 +272,6 @@ lazy val shaded = Project(id = "shaded", base = file("shaded"))
// WS API, no play dependencies
lazy val `play-ws-standalone` = project
.in(file("play-ws-standalone"))
.enablePlugins(Publish)
.settings(commonSettings)
.settings(mimaSettings)
.settings(libraryDependencies ++= standaloneApiWSDependencies)
Expand Down Expand Up @@ -305,7 +299,6 @@ def addShadedDeps(deps: Seq[xml.Node], node: xml.Node): xml.Node = {
// Standalone implementation using AsyncHttpClient
lazy val `play-ahc-ws-standalone` = project
.in(file("play-ahc-ws-standalone"))
.enablePlugins(Publish)
.settings(
commonSettings ++ shadedAhcSettings ++ shadedOAuthSettings ++ Seq(
Test / fork := true,
Expand Down Expand Up @@ -344,7 +337,6 @@ lazy val `play-ahc-ws-standalone` = project

lazy val `play-ws-standalone-json` = project
.in(file("play-ws-standalone-json"))
.enablePlugins(Publish)
.settings(commonSettings)
.settings(mimaSettings)
.settings(
Expand All @@ -364,7 +356,6 @@ lazy val `play-ws-standalone-json` = project

lazy val `play-ws-standalone-xml` = project
.in(file("play-ws-standalone-xml"))
.enablePlugins(Publish)
.settings(commonSettings)
.settings(mimaSettings)
.settings(
Expand Down
19 changes: 0 additions & 19 deletions project/Publish.scala

This file was deleted.

10 changes: 0 additions & 10 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
resolvers ++= DefaultOptions.resolvers(snapshot = true)
resolvers += Resolver.typesafeRepo("releases")

addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.6.1")

addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.0.0")

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")

addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.2")

addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")

addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")

addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")