Skip to content

Commit

Permalink
publishing: bye Bintray, hello Sonatype
Browse files Browse the repository at this point in the history
  • Loading branch information
SethTisue committed Jul 28, 2021
1 parent 0d51874 commit ae8b3a7
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 75 deletions.
19 changes: 7 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ env:
matrix:
- ADOPTOPENJDK=11

global:
# encrypt with: travis encrypt --pro BINTRAY_USER=...
- secure: "TV8cmq1UrtAmwxpaZTI89qEu+kYFgDqRJ2pm2F8TG75TmPWMUZ8YycYld8wWn2dMOXMc5mpDUYYXiJpqnxxiF90lYdCzN/TIJlLGEsHthXSS9UTHyqrCAh5JyT0XiQZmjP+6oCmWJLpdDayrgyTRqQNkUSFboEqN25aXJuCkCDw="
# encrypt with: travis encrypt --pro BINTRAY_PASS=...
- secure: "XHaF/fAX2H78Bc/5+nyQkSYLQfRX17SP4xBjF15iTxr9v9F2P0KxqsZ4qng2xHaQeUN122iXssOaZviQo4W+Z/o9FqoLXuUq9ukMol48RCFQjJXXnNNmdLmivetOJXOogAu9hHcRTeOoZ197RovIKbgnHIiavicsA3HMPNtm/bw="

jobs:
include:
- stage: test
Expand Down Expand Up @@ -50,16 +44,17 @@ jobs:
script: scripts/validate-docs.sh
name: "Validate documentation"

- stage: publish
name: "Publish artifacts to Bintray"
script: sbt +publish
- stage: release
name: "Release artifacts to Sonatype"
script: sbt ci-release
env:
- ADOPTOPENJDK=8

stages:
- name: test
- name: docs
- name: publish
# Snapshots from Bintray are picked up by a scheduled build on Lightbend's Vegemite
if: ((branch = main AND type = push) OR (tag IS present)) AND NOT fork
- name: release
if: tag IS present

notifications:
webhooks:
Expand Down
7 changes: 1 addition & 6 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@ This is released from the `main` branch from `1.6.0` forward. Unless an older ve
- Check the [draft release notes](https://github.com/playframework/twirl/releases) to see if everything is there
- Wait until [main build finished](https://travis-ci.com/github/playframework/twirl/builds) after merging the last PR
- Update the [draft release](https://github.com/playframework/twirl/releases) with the next tag version (eg. `1.6.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/twirl/builds) for the new tag and publish artifacts to Bintray)

### Requires Bintray access

- Go to [Bintray](https://bintray.com/playframework/maven/twirl) 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/twirl/builds) for the new tag and publish artifacts to Sonatype)

### Check Maven Central

Expand Down
10 changes: 6 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ val mimaSettings = Seq(
mimaPreviousArtifacts := previousVersion.map(organization.value %% name.value % _).toSet
)

ThisBuild / sonatypeProfileName := "com.typesafe"

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

Expand Down Expand Up @@ -48,7 +50,7 @@ lazy val nodeJs = {

lazy val api = crossProject(JVMPlatform, JSPlatform)
.in(file("api"))
.enablePlugins(Common, Playdoc, Omnidoc, PublishLibrary)
.enablePlugins(Common, Playdoc, Omnidoc)
.configs(Docs)
.settings(
mimaSettings,
Expand All @@ -71,7 +73,7 @@ lazy val apiJs = api.js

lazy val parser = project
.in(file("parser"))
.enablePlugins(Common, Omnidoc, PublishLibrary)
.enablePlugins(Common, Omnidoc)
.settings(
mimaSettings,
name := "twirl-parser",
Expand All @@ -82,7 +84,7 @@ lazy val parser = project

lazy val compiler = project
.in(file("compiler"))
.enablePlugins(Common, Omnidoc, PublishLibrary)
.enablePlugins(Common, Omnidoc)
.dependsOn(apiJvm, parser % "compile;test->test")
.settings(
mimaSettings,
Expand All @@ -94,7 +96,7 @@ lazy val compiler = project

lazy val plugin = project
.in(file("sbt-twirl"))
.enablePlugins(PublishSbtPlugin, SbtPlugin)
.enablePlugins(SbtPlugin)
.dependsOn(compiler)
.settings(
name := "sbt-twirl",
Expand Down
6 changes: 0 additions & 6 deletions project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,6 @@ object Common extends AutoPlugin {
crossScalaVersions := ScalaVersions,
scalacOptions ++= scalacParameters,
javacOptions ++= javacParameters,
scmInfo := Some(
ScmInfo(
url(s"https://github.com/playframework/${repoName}"),
s"scm:git:git@github.com:playframework/${repoName}.git"
)
),
developers += Developer(
"contributors",
"Contributors",
Expand Down
42 changes: 0 additions & 42 deletions project/Publish.scala

This file was deleted.

7 changes: 2 additions & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.6.1")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")

// For the Cross Build
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.6.0")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.6.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0")

addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.2")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")

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

0 comments on commit ae8b3a7

Please sign in to comment.