Skip to content

Commit b96b607

Browse files
authored
Current versions; drop CI publishing (#203)
1 parent 1d5b87d commit b96b607

File tree

7 files changed

+15
-29
lines changed

7 files changed

+15
-29
lines changed

.scalafmt.conf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
version = 2.7.5
1+
version = 3.2.1
22

3+
runner.dialect = scala212
4+
docstrings.style = Asterisk
35
maxColumn = 120
4-
docstrings = JavaDoc
56
assumeStandardLibraryStripMargin = true
67
rewrite.rules = [RedundantBraces, RedundantParens, SortImports, SortModifiers]
78
unindentTopLevelOperators = true

.travis.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,19 @@ scala: 2.12.10
55
jobs:
66
include:
77
- stage: check
8-
script: sbt scalafmtCheckAll || { echo "[error] Unformatted code found. Please run 'scalafmtAll' and commit the reformatted code."; false; }
9-
name: Code style check (fixed with `sbt scalafmtAll`)
10-
- script: sbt scalafmtSbtCheck || { echo "[error] Unformatted sbt code found. Please run 'scalafmtSbt' and commit the reformatted code."; false; }
11-
name: Build code style check (fixed with `sbt scalafmtSbt`)
8+
script: sbt "scalafmtCheckAll; scalafmtSbtCheck" || { echo "[error] Unformatted code found. Please run 'scalafmtAll; scalafmtSbt' and commit the reformatted code."; false; }
9+
name: Code style check (fixed with `sbt "scalafmtAll; scalafmtSbt"`)
1210
- stage: test
1311
script: sbt test
1412
name: Run tests
1513
- script: sbt scripted
1614
name: Run sbt plugin tests
17-
- stage: publish
18-
script: sbt ^publish
19-
name: Publish artifacts
2015

2116
stages:
2217
- name: check # runs on master commits and PRs
2318
if: NOT tag =~ ^v
2419
- name: test # runs on master commits and PRs
2520
if: NOT tag =~ ^v
26-
- name: publish # runs on main repo master commits or version-tagged commits
27-
if: repo = lightbend/sbt-paradox-apidoc AND ( ( branch = master AND type = push ) OR tag =~ ^v )
2821

2922
cache:
3023
directories:
@@ -39,10 +32,3 @@ before_cache:
3932
notifications:
4033
email:
4134
on_success: never
42-
43-
env:
44-
global:
45-
# travis encrypt BINTRAY_USER=...
46-
- secure: "m2cgGJQahaCn2lKg27gG+15zymwGje1XTFULA3JZ1la2A+mpA8c5Eto8ZbNRSRl8zKdzidmaK5OkI4N6jCbhL9x9W4qRVwNiGL/hTluS30PuIyOs7mF+QpcybRPJ6GzXl+ZNTDZ/UfthuOlcXyLw+kpH1j44Egx+oPKTDn5rGbLvj/UZpwaQmT8QcOoXGSD5rOdKyogH+j7jnQNGFfzJ1Dj5UIRFySlTJhlW71eAjYtWdfFUdQ2DlET6TVHGONY6PlZQt8qE/8OQyt+Yr56gNBYLtFjzfKaGXxvQNNvpoxx/FW8rp+cfnp26O3fbkmKBFrw6KtamZVvKMQGmA75A+IC6DaRa32ui5zULCh6Hswf/EVqnmpfNJbRSyBm05fT1KOn5l+XYTcGLPJmnZ+sFKS+VB5z9fVtO7fdnEQzBtn3cKOjrb+zstMBsSZk1CYHLLHcGidh/8CAjbE6/JGlq5q+AlMKN21dlh/TRKx/jfNch8KVJA5gnjlkgfQwOVxpLVYTynlwnLoQuh0369xym4Quy8mLrXWZEV+xxxbRpl3MsGIZkEXvra5vyuK6SwZuk6Rpep6oEf5S5MItn++ZGPlzlXlQLG9AYYSjetXQJqwDDewYchGZQf1xYRYLjOoX9Fz5yfEw/V1Ew3eUTDJez+mInY3ykg6rscLD+dBM8d94="
47-
# travis encrypt BINTRAY_PASS=...
48-
- secure: "rqD2YmU+2miMz/5a+qLnlIMMDqtvzbBZvCdFwbIJrm/QQyOlZhE3eMGznZ+ToA1mnHGDidQz7hS1vjsa1tpLAI/E+SKFzBQ9Wnud+Ei/PbL0JxJaFZizREOKW3jHd+MTuRIKfSOWXf/fWDCU3h0wEUM3yfXq0pR7ptcRORc6/e4oMclJ4/s1C/FyY61IotBuQIPFn1OksIfNFTtW8K6vuLwJYAo3L3nqisyPVQvSbts5ogdSlzs5ObLrrUBUoO36XhpwgxAPC6NS4Jin+JZ8k7JMsEoMRY8T4dBas7mjWAEFs2f5IV5apeimles+WQMqr9ebJi20Lw4Xh0Q0IXlfsbr3j1OEHFHN1fyMbYfVqfpSUXAbSBgTE+iJnJed+Z5uT4QZ5LA9MIkKcrOn4m7h9R8dNJeCGedKyEHaI+DrwFcDukV5AAFGP5yPrMPfvja48gH741mnP9E4A8lC8xlybkH43z1jThCg2UKUmOVHDlJFMBkcHmLnXOq+DQ26bEnP3MTjZ14aexNw9O1uik5EVKQiFmIdo4Zte4EVVv7qcMnLAAz8E4cOTHYyPKnngM5HIlHed1hmN57w0aRWImMDRUgzIH5Xqj1l5ldRSetuifdDoosynvzLdw2bTyfOwlsqCDVPK5xEPSqgbrqrHpVBm3pe3C0ADRsOWwQkRWd128A="

RELEASING.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Releasing
22

3+
Releasing from CI was removed as Bintray passed away.
4+
35
1. Wait until all running [Travis CI jobs](https://travis-ci.org/lightbend/sbt-paradox-apidoc/builds) complete, if any.
46
1. Fix up the [draft release](https://github.com/lightbend/sbt-paradox-apidoc/releases) created by the release drafter and set the next tag version (e.g. `v0.2`)
5-
1. Travis CI will start a [CI build](https://travis-ci.org/lightbend/sbt-paradox-apidoc/builds) for the new tag and publish artifacts to Bintray.
7+
1. Ensure you're on JDK 8
8+
1. Pull the tag, build and publish the release to Sonatype

build.sbt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ organizationName := "Lightbend Inc."
2929
organizationHomepage := Some(url("https://lightbend.com"))
3030
startYear := Some(2018)
3131

32-
bintrayOrganization := Some("sbt")
33-
bintrayRepository := "sbt-plugin-releases"
34-
3532
enablePlugins(AutomateHeaderPlugin)
3633
scalafmtOnCompile := true
3734

project/Dependencies.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import sbt._
22

33
object Library {
4-
val classgraph = "io.github.classgraph" % "classgraph" % "4.8.90"
5-
val sbtParadox = "com.lightbend.paradox" % "sbt-paradox" % "0.8.0"
6-
val scalatest = "org.scalatest" %% "scalatest" % "3.2.2"
7-
val paradoxTestkit = "com.lightbend.paradox" %% "testkit" % "0.8.0"
4+
val classgraph = "io.github.classgraph" % "classgraph" % "4.8.133"
5+
val sbtParadox = "com.lightbend.paradox" % "sbt-paradox" % "0.9.2"
6+
val scalatest = "org.scalatest" %% "scalatest" % "3.2.10"
7+
val paradoxTestkit = "com.lightbend.paradox" %% "testkit" % "0.9.2"
88
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.4.4
1+
sbt.version=1.5.7

project/plugins.sbt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
2-
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.6.1")
32
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
4-
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
3+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.5")

0 commit comments

Comments
 (0)