diff --git a/.travis.yml b/.travis.yml index 8e386b5..c283053 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,15 +33,12 @@ jobs: env: - TRAVIS_JDK=8 - - stage: publish - name: "Publish artifacts to Bintray" - script: sbt +publish - env: - - TRAVIS_JDK=11 - # encrypt with: travis encrypt --pro BINTRAY_USER=... - - secure: "tT0bg7NL5BQIgiqmVKtcRLY685fzVznSlb42E9BDtkkvMKIPa7KnwI/imX9WySDo2mpLXRHyLz3raBH+Gfflx2aWFIJG+3qMYUfEDHx+XBLtfAYb7xtPqAfrN0jATNABSu+9PNGrVQBSJf0nNPEpmRIooN1Uw79weBVS0RNq++idA1QgilTy0oEP1OHtQvspu2kZQ6PPPxwNNor4LW4ep2jneYaJVzVNWqfUYnSiSMZAHmSjgQFZJLfdsQxSqlKR1QvyH+M0H8mJt6ezJ4Dn33t+S/xqJsigLe4mX4wdz+2qhGzJxMjZygSsY3dT6a5I1z7RZzCJl4WJpq0JQeir/0B33E2McolOGPXbmClTphDov55Vcro2wUmw5RmhIpKaBFEH46iTi3saS3E7UlPqm19cophUtegBAyDsjafj/QGMs52CNt4Sn+jSOUQ4RUeWuAZEZZs//NRGoQOzgEO5SpQ7sRXD5WEeDLW+A27N5bXOzR80tqlJ9Y8DM8e9tFIV7oIHT1Sx88t7mUQb289zqEOHcRWCPo0Z0/JVulrbyXrUndcMiGwvhjZE4XSZb1GajfzcApZNv1RA4yrAoDdOqoLXgK0cccEIABP+8AXVOy/iJYRvbtsBG5+SeFFg/2/AL7r45YrcpXUD628n0zPdUeNkFukE8lpI0Owx7cnHfJg=" - # encrypt with: travis encrypt --pro BINTRAY_PASS=... - - secure: "mbwRVzh074r1a1q/GSvRajk8lyxOAmIW1xpYG6zP7MO8Mf8m2aOsa2DFB2gc0D+yHg/KgAxgVfONAXHeCsXkuOO4zr53GVbu9ZuYqudnawMKab6ZZVbnopRzjFwRpk+cdLVmHAYXIchIG9/ApN5zUfl+elOZw6iNZ9EZ6ur1492s8z+MStvmY3Q6/EsndeFLgRBiorF8eoqmiu7jY+PlFUAOT4CRG2CmNdhlNTLpgtBIXhujt0NnWGArkPYIqe+l8GRYtExZKvLztbhDG6uqUKAoVs5BsQq9oGWOkL2vz/7YNlHTyDY/+rdFm/IBtaWTMdosPQfQOZh161bksCayfsdjloMR6Pj9mdcg4xehScEhr3MDQuzMnEvRlZiBqKh3qYJYbV7piq1elNSANx+KXC5HHHEgIuLqdi53t8NuzR0/6odZJQy8DZ/aLsyQ5+KbP6d6NwSjZUHQP7Xg1n+M36yzJEARqPa8NXQcNLvQkjXCG8nnQXQB4bCkNpGoc4bs8NHQ79pV1b3HcphkQvWdNLl2IU0pCulIQyZiLoNlQXw2BwI8Om3oxQ785PY2e9Rc3vXbOkyJh5cXsxp38uMFdrj60Eb+rXHQ1+5BVj4jtWUbO1Ag+UW6XdI6IqlS+GFw4HsC5jNLFF5378sAI3wwonYCTNQ0mZLacLBK3wV/25I=" +# TODO replace with Sonatype +# - stage: publish +# name: "Publish artifacts to Bintray" +# script: sbt +publish +# env: +# - TRAVIS_JDK=11 stages: - name: test diff --git a/RELEASING.md b/RELEASING.md index 3bd0dd0..8f1ea23 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -9,12 +9,7 @@ This is released from the `master` branch (from version 1.1.13). Unless an older - Check the [draft release notes](https://github.com/playframework/play-file-watch/releases) to see if everything is there - Wait until [master build finished](https://travis-ci.com/github/playframework/play-file-watch/builds) after merging the last PR - Update the [draft release](https://github.com/playframework/play-file-watch/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-file-watch/builds) for the new tag and publish artifacts to Bintray) - -### Requires Bintray access - -- Go to [Bintray](https://bintray.com/playframework/maven/play-file-watch) 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-file-watch/builds) for the new tag and publish artifacts to Sonatype) ### Check Maven Central diff --git a/build.sbt b/build.sbt index e0e017f..e65a324 100644 --- a/build.sbt +++ b/build.sbt @@ -19,7 +19,7 @@ Global / onLoad := (Global / onLoad).value.andThen { s => lazy val `play-file-watch` = project .in(file(".")) - .enablePlugins(Common, Publish) + .enablePlugins(Common) .settings( // workaround for https://github.com/scala/scala-dev/issues/249 scalacOptions in (Compile, doc) ++= ( diff --git a/project/Publish.scala b/project/Publish.scala deleted file mode 100644 index 5bae60e..0000000 --- a/project/Publish.scala +++ /dev/null @@ -1,19 +0,0 @@ -import sbt.Keys._ -import sbt._ - -object Publish extends AutoPlugin { - - import bintray.BintrayPlugin - import bintray.BintrayPlugin.autoImport._ - - override def trigger = noTrigger - - override def requires = BintrayPlugin - - override def projectSettings = - Seq( - bintrayOrganization := Some("playframework"), - bintrayRepository := (if (isSnapshot.value) "snapshots" else "maven"), - bintrayPackage := Common.repoName - ) -} diff --git a/project/plugins.sbt b/project/plugins.sbt index aaa0cc0..8a79b95 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,3 @@ -addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.6.1") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") -addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") +addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")