Skip to content

Commit

Permalink
Merge pull request #93 from olafurpg/version
Browse files Browse the repository at this point in the history
  • Loading branch information
olafurpg authored Apr 21, 2020
2 parents ae173f4 + 4e47fdf commit 1a630f7
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 60 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* eol=lf
*.png eol=autocrlf
35 changes: 35 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: CI
on:
push:
branches:
- master
pull_request:
jobs:
test:
name: ${{ matrix.command }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
command:
- "++2.12.11 test scripted"
- "++2.10.7 test 'scripted sbt-scalafix/*'"
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v7
- run: sbt ${{ matrix.command }}
windows:
name: Windows tests
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v7
- run: sbt ci-windows
shell: bash
checks:
name: Scalafmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v7
- run: ./bin/scalafmt --test
30 changes: 0 additions & 30 deletions .travis.yml

This file was deleted.

28 changes: 0 additions & 28 deletions appveyor.yml

This file was deleted.

1 change: 1 addition & 0 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
inThisBuild(
List(
parallelExecution in Test := false,
scalafixDependencies := List(
// Custom rule published to Maven Central https://github.com/olafurpg/example-scalafix-rule
"com.geirsson" %% "example-scalafix-rule" % "1.3.0"
Expand Down
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ import sbt._

object Dependencies {
val x = List(1) // scalafix:ok
def scalafixVersion: String = "0.9.14"
def scalafixVersion: String = "0.9.15"
val all = List(
"org.eclipse.jgit" % "org.eclipse.jgit" % "5.5.1.201910021850-r",
"ch.epfl.scala" % "scalafix-interfaces" % scalafixVersion,
// coursier-small provides a binary stable API around Coursier making sure that
// sbt-scalafix doesn't conflict with the user's installed version of sbt-coursier.
// Details: https://github.com/olafurpg/coursier-small
"com.geirsson" %% "coursier-small" % "1.3.3",
"io.get-coursier" % "interface" % "0.0.19"
"io.get-coursier" % "interface" % "0.0.21"
)
}
2 changes: 2 additions & 0 deletions src/test/scala/scalafix/internal/sbt/ScalafixAPISuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import scalafix.interfaces.ScalafixError

import scala.collection.JavaConverters._
import org.scalatest.funsuite.AnyFunSuite
import scala.util.Properties

class ScalafixAPISuite extends AnyFunSuite {

Expand All @@ -23,6 +24,7 @@ class ScalafixAPISuite extends AnyFunSuite {
}

test("ScalafixPlugin.cli") {
assume(!Properties.isWin)
val baos = new ByteArrayOutputStream()
val logger = Compat.ConsoleLogger(new PrintStream(baos))
val ScalafixInterface(_, args) = ScalafixInterface.fromToolClasspath(
Expand Down

0 comments on commit 1a630f7

Please sign in to comment.