Skip to content

Commit 4c8513e

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 09b8f58 + 9416831 commit 4c8513e

File tree

5 files changed

+26
-5
lines changed

5 files changed

+26
-5
lines changed

.github/workflows/scala.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Scala CI
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Set up JDK 1.8
17+
uses: actions/setup-java@v1
18+
with:
19+
java-version: 1.8
20+
- name: Run tests
21+
run: sbt test

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "2.4.2"
1+
version = "2.5.2"
22

33
#
44
# See http://scalameta.org/scalafmt/#Configuration for details

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
4040
})
4141

4242
libraryDependencies ++= Seq(
43-
"org.scalatest" %% "scalatest" % "3.1.1" % "test"
43+
"org.scalatest" %% "scalatest" % "3.2.7" % "test"
4444
)
4545

4646
publishMavenStyle := true

project/build.properties

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

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
2-
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.2.1")
1+
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
2+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.2")
33

0 commit comments

Comments
 (0)