Skip to content

Commit 6f76452

Browse files
authored
Merge branch 'ThoughtWorksInc:template' into template
2 parents 078e700 + 9a891e1 commit 6f76452

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

.github/workflows/scala.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
scala:
16-
- 2.12.8
16+
- 2.12.15
1717

1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
2020
with:
2121
fetch-depth: 0 # Need the git history for sbt-dynver to determine the version
2222
- name: Set up JDK 11
23-
uses: actions/setup-java@v2
23+
uses: actions/setup-java@v3
2424
with:
2525
java-version: '11'
26-
distribution: 'adopt'
26+
distribution: temurin
2727
- name: Cache SBT
28-
uses: actions/cache@v2
28+
uses: actions/cache@v3
2929
with:
3030
path: |
3131
~/.ivy2/local/

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ secret/
44
.metals/
55
.bloop/
66
metals.sbt
7-
.bsp/sbt.json
7+
.bsp/
88
.vscode/launch.json
9+
*.scala.semanticdb

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
runner.dialect = "scala213"
1+
runner.dialect = scala212source3
22
version = "3.1.1"
33
maxColumn = 80

project/build.properties

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

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.2.1")
1+
addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.2.4")
22

33
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8")
44

0 commit comments

Comments
 (0)