Skip to content

Commit fbcd6da

Browse files
authored
Upgrade (#163)
* Upgrade to scalameta 1.8 * Fix failing tests * Clean up cli. This previous implementation was quite a mess. This changes the cli to more properly aggregate and propagate error handling. This also made it easier to adapt to how the Semantic API requires the scala.meta.Input to be reused. Previously, scalafix created its own Input but now it re-uses the Input from scala.meta.Database. * Reorganize * Disable cache. It took 5 minutes to load the cache and still sbt downloaded everything from scratch * Fix last few bugs in cli. - Skip compiling rewrites if inputs.isEmpty. - Print warning if inputs is empty. - More cleanup * Upgrade platform docker image in CI. * s/--debug/--verbose/
1 parent 864dc01 commit fbcd6da

File tree

31 files changed

+940
-671
lines changed

31 files changed

+940
-671
lines changed

.drone.yml

Lines changed: 4 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,14 @@
11
pipeline:
2-
# Fetch folders from distributed cache
3-
sftp_cache_restore:
4-
image: plugins/sftp-cache
5-
restore: true
6-
mount:
7-
- /drone/.ivy2
8-
- /drone/.coursier-cache
9-
- /drone/.sbt
10-
- /drone/.git
11-
when:
12-
event: [push, pull_request, tag, deployment]
13-
142
tests:
15-
image: scalaplatform/scala:0.6
16-
pull: true
3+
image: scalaplatform/scala:1.2
174
environment:
18-
- COURSIER_CACHE=/drone/cache/coursier
19-
volumes:
20-
- /platform:/keys
5+
- BINTRAY_USERNAME=foo_user
6+
- BINTRAY_PASSWORD=foo_password
7+
pull: true
218
commands:
229
- git fetch --tags && git log | head -n 20
2310
- ./scalafmt --test
24-
- ./bin/copy_cache.sh /drone /root
2511
- /usr/bin/sbt $CI_TEST
26-
- ./bin/before_cache.sh
27-
- ./bin/copy_cache.sh /root /drone
2812

2913
publish:
3014
image: olafurpg/scalafix:0.3.0
@@ -37,28 +21,6 @@ pipeline:
3721
event: [push, tag]
3822
branch: [master]
3923

40-
notify:
41-
image: drillster/drone-email
42-
host: smtp.mailgun.org
43-
44-
password: ${MAILGUN_PASSWORD}
45-
46-
recipients:
47-
48-
when:
49-
event: push
50-
branch: [master]
51-
status: [changed, failure]
52-
53-
# Save folders in distributed cache
54-
sftp_cache_rebuild:
55-
image: plugins/sftp-cache
56-
rebuild: true
57-
mount:
58-
- /drone/.ivy2
59-
- /drone/.coursier-cache
60-
- /drone/.sbt
61-
- /drone/.git
6224
matrix:
6325
include:
6426
- CI_TEST: ci-fast

.drone.yml.sig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgIyBGZXRjaCBmb2xkZXJzIGZyb20gZGlzdHJpYnV0ZWQgY2FjaGUKICBzZnRwX2NhY2hlX3Jlc3RvcmU6CiAgICBpbWFnZTogcGx1Z2lucy9zZnRwLWNhY2hlCiAgICByZXN0b3JlOiB0cnVlCiAgICBtb3VudDoKICAgICAgLSAvZHJvbmUvLml2eTIKICAgICAgLSAvZHJvbmUvLmNvdXJzaWVyLWNhY2hlCiAgICAgIC0gL2Ryb25lLy5zYnQKICAgICAgLSAvZHJvbmUvLmdpdAogICAgd2hlbjoKICAgICAgZXZlbnQ6IFtwdXNoLCBwdWxsX3JlcXVlc3QsIHRhZywgZGVwbG95bWVudF0KCiAgdGVzdHM6CiAgICBpbWFnZTogc2NhbGFwbGF0Zm9ybS9zY2FsYTowLjYKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICAtIENPVVJTSUVSX0NBQ0hFPS9kcm9uZS9jYWNoZS9jb3Vyc2llcgogICAgdm9sdW1lczoKICAgICAgLSAvcGxhdGZvcm06L2tleXMKICAgIGNvbW1hbmRzOgogICAgICAtIGdpdCBmZXRjaCAtLXRhZ3MgJiYgZ2l0IGxvZyB8IGhlYWQgLW4gMjAKICAgICAgLSAuL3NjYWxhZm10IC0tdGVzdAogICAgICAtIC4vYmluL2NvcHlfY2FjaGUuc2ggL2Ryb25lIC9yb290CiAgICAgIC0gL3Vzci9iaW4vc2J0ICRDSV9URVNUCiAgICAgIC0gLi9iaW4vYmVmb3JlX2NhY2hlLnNoCiAgICAgIC0gLi9iaW4vY29weV9jYWNoZS5zaCAvcm9vdCAvZHJvbmUKCiAgcHVibGlzaDoKICAgIGltYWdlOiBvbGFmdXJwZy9zY2FsYWZpeDowLjMuMAogICAgcHVsbDogdHJ1ZQogICAgdm9sdW1lczoKICAgICAgLSAvcGxhdGZvcm06L2tleXMKICAgIGNvbW1hbmRzOgogICAgICAtIC4vYmluL3B1Ymxpc2guc2gKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbcHVzaCwgdGFnXQogICAgICBicmFuY2g6IFttYXN0ZXJdCgogIG5vdGlmeToKICAgIGltYWdlOiBkcmlsbHN0ZXIvZHJvbmUtZW1haWwKICAgIGhvc3Q6IHNtdHAubWFpbGd1bi5vcmcKICAgIHVzZXJuYW1lOiBub3JlcGx5QGRyb25lLmdlaXJzc29uLmNvbQogICAgcGFzc3dvcmQ6ICR7TUFJTEdVTl9QQVNTV09SRH0KICAgIGZyb206IG5vcmVwbHlAZHJvbmUuZ2VpcnNzb24uY29tCiAgICByZWNpcGllbnRzOgogICAgICAtIG9sYWZ1cnBnQGdtYWlsLmNvbQogICAgd2hlbjoKICAgICAgZXZlbnQ6IHB1c2gKICAgICAgYnJhbmNoOiBbbWFzdGVyXQogICAgICBzdGF0dXM6IFtjaGFuZ2VkLCBmYWlsdXJlXQoKICAjIFNhdmUgZm9sZGVycyBpbiBkaXN0cmlidXRlZCBjYWNoZQogIHNmdHBfY2FjaGVfcmVidWlsZDoKICAgIGltYWdlOiBwbHVnaW5zL3NmdHAtY2FjaGUKICAgIHJlYnVpbGQ6IHRydWUKICAgIG1vdW50OgogICAgICAtIC9kcm9uZS8uaXZ5MgogICAgICAtIC9kcm9uZS8uY291cnNpZXItY2FjaGUKICAgICAgLSAvZHJvbmUvLnNidAogICAgICAtIC9kcm9uZS8uZ2l0Cm1hdHJpeDoKICBpbmNsdWRlOgogICAgLSBDSV9URVNUOiBjaS1mYXN0CiAgICAgIENJX1NDQUxBX1ZFUlNJT046IDIuMTEuMTEKICAgICAgQ0lfUFVCTElTSDogdHJ1ZQogICAgLSBDSV9URVNUOiBjaS1mYXN0CiAgICAgIENJX1NDQUxBX1ZFUlNJT046IDIuMTIuMgogICAgLSBDSV9URVNUOiBjaS1zbG93CiAgICAgIENJX1NDQUxBX1ZFUlNJT046IDIuMTEuMTEK.hNTPcSvNi3K5Ec4RIkD1c9c7UCBP9XikWuqVmQIqXbA
1+
eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgdGVzdHM6CiAgICBpbWFnZTogc2NhbGFwbGF0Zm9ybS9zY2FsYToxLjIKICAgIGVudmlyb25tZW50OgogICAgICAtIEJJTlRSQVlfVVNFUk5BTUU9Zm9vX3VzZXIKICAgICAgLSBCSU5UUkFZX1BBU1NXT1JEPWZvb19wYXNzd29yZAogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gZ2l0IGZldGNoIC0tdGFncyAmJiBnaXQgbG9nIHwgaGVhZCAtbiAyMAogICAgICAtIC4vc2NhbGFmbXQgLS10ZXN0CiAgICAgIC0gL3Vzci9iaW4vc2J0ICRDSV9URVNUCgogIHB1Ymxpc2g6CiAgICBpbWFnZTogb2xhZnVycGcvc2NhbGFmaXg6MC4zLjAKICAgIHB1bGw6IHRydWUKICAgIHZvbHVtZXM6CiAgICAgIC0gL3BsYXRmb3JtOi9rZXlzCiAgICBjb21tYW5kczoKICAgICAgLSAuL2Jpbi9wdWJsaXNoLnNoCiAgICB3aGVuOgogICAgICBldmVudDogW3B1c2gsIHRhZ10KICAgICAgYnJhbmNoOiBbbWFzdGVyXQoKbWF0cml4OgogIGluY2x1ZGU6CiAgICAtIENJX1RFU1Q6IGNpLWZhc3QKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMS4xMQogICAgICBDSV9QVUJMSVNIOiB0cnVlCiAgICAtIENJX1RFU1Q6IGNpLWZhc3QKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMi4yCiAgICAtIENJX1RFU1Q6IGNpLXNsb3cKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMS4xMQo.CAw7B_peQuTMacKIPeaUMHKi4cjPPs-8TNi9oQ7OOEU

.scalafmt.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ align.tokens = [
66
{ code = "%%%", owner = "Infix" }
77
]
88
onTestFailure = "To fix this, run `./scalafmt` from the project base directory"
9+
optIn.annotationNewlines = true

build.sbt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ lazy val `scalafix-sbt` = project
182182
"; very scalafix-sbt/scripted"
183183
)(state.value)
184184
},
185+
addSbtPlugin(scalahostSbt),
185186
scalaVersion := scala210,
186187
crossScalaVersions := Seq(scala210),
187188
moduleName := "sbt-scalafix",
@@ -233,7 +234,7 @@ lazy val tests = project
233234
libraryDependencies ++= Seq(
234235
scalahost % Test,
235236
// integration property tests
236-
"org.renucci" %% "scala-xml-quote" % "0.1.1" % Test,
237+
"org.renucci" %% "scala-xml-quote" % "0.1.3" % Test,
237238
"org.typelevel" %% "catalysts-platform" % "0.0.5" % Test,
238239
"com.typesafe.slick" %% "slick" % "3.2.0-M2" % Test,
239240
"com.chuusai" %% "shapeless" % "2.3.2" % Test,

project/Dependencies.scala

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,17 @@ import sbt._
22
/* scalafmt: { maxColumn = 120 }*/
33

44
object Dependencies {
5-
val scalametaV = "1.8.0-650-890aeec1"
6-
val paradiseV = "3.0.0-308-ec15a2f8"
7-
val metaconfigV = "0.3.2"
5+
val scalametaV = "1.8.0"
6+
val paradiseV = "3.0.0-M9"
7+
val metaconfigV = "0.3.3"
88

99
var testClasspath: String = "empty"
10-
def scalahost: ModuleID = "org.scalameta" % s"scalahost" % scalametaV cross CrossVersion.full
10+
def scalameta: ModuleID = "org.scalameta" %% "contrib" % scalametaV
11+
def scalahost: ModuleID = "org.scalameta" % "scalahost" % scalametaV cross CrossVersion.full
12+
def scalahostSbt: ModuleID = "org.scalameta" % "sbt-scalahost" % scalametaV
1113
def scalatest: ModuleID = "org.scalatest" %% "scalatest" % "3.0.0"
1214
def metaconfig: ModuleID = "com.geirsson" %% "metaconfig-typesafe-config" % metaconfigV
13-
def ammonite = "com.lihaoyi" %% "ammonite-ops" % "0.8.2"
15+
def ammonite = "com.lihaoyi" %% "ammonite-ops" % "0.9.0"
16+
def fastparse = "com.lihaoyi" %% "fastparse" % "0.4.3"
1417
def googleDiff = "com.googlecode.java-diff-utils" % "diffutils" % "1.3.0"
15-
16-
def scalameta: ModuleID =
17-
"org.scalameta" %% "contrib" % scalametaV excludeAll (
18-
ExclusionRule("org.scalameta", "testkit_2.11"),
19-
ExclusionRule("org.scalameta", "testkit_2.12"),
20-
ExclusionRule("org.apache.commons"),
21-
ExclusionRule("commons-io")
22-
)
2318
}

project/plugins.sbt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
addSbtPlugin("com.eed3si9n" % "sbt-doge" % "0.1.5")
2-
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.6.1")
3-
addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.3.7")
1+
addSbtPlugin("com.eed3si9n" % "sbt-doge" % "0.1.5")
2+
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.6.1")
3+
resolvers += Resolver.bintrayIvyRepo("scalameta", "sbt-plugins") // only needed for scalatex 0.3.8-pre
4+
addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.3.8-pre")
45
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15")
56
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "1.2.1")
67
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")

0 commit comments

Comments
 (0)