Skip to content

Commit d47156b

Browse files
authored
Merge pull request #127 from Atry/update-template
Update template
2 parents fdcab33 + 341c9df commit d47156b

File tree

11 files changed

+107
-50
lines changed

11 files changed

+107
-50
lines changed

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Scala Steward: Reformat with scalafmt 3.1.2
2+
fb6cfb8aea15a1b339e3ed69e1e96acd7df4cae6
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
on:
2+
push:
3+
branches-ignore:
4+
- "update/**"
5+
schedule:
6+
- cron: "0 0 * * 0"
7+
workflow_dispatch:
8+
9+
name: Launch Scala Steward
10+
11+
jobs:
12+
scala-steward:
13+
runs-on: ubuntu-22.04
14+
name: Launch Scala Steward
15+
steps:
16+
- name: Launch Scala Steward
17+
uses: scala-steward-org/scala-steward-action@v2
18+
with:
19+
github-token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
20+
branches: ${{ github.ref_name }}

.github/workflows/scala.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Scala CI
2+
3+
on:
4+
push:
5+
branches-ignore:
6+
- "update/**"
7+
tags:
8+
- "v*"
9+
pull_request:
10+
11+
jobs:
12+
build:
13+
runs-on: ubuntu-latest
14+
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
scala:
19+
- 2.10.7
20+
- 2.11.12
21+
- 2.12.11
22+
23+
steps:
24+
- uses: actions/checkout@v3
25+
with:
26+
fetch-depth: 0 # Need the git history for sbt-dynver to determine the version
27+
- name: Set up JDK 11
28+
uses: actions/setup-java@v3
29+
with:
30+
java-version: "11"
31+
distribution: temurin
32+
- name: Cache SBT
33+
uses: actions/cache@v3
34+
with:
35+
path: |
36+
~/.ivy2/local/
37+
~/.ivy2/cache/
38+
~/.sbt/
39+
~/.coursier/
40+
key: |
41+
${{runner.os}}-${{matrix.scala}}-${{hashFiles('**/*.sbt')}}-${{matrix.sbt-args}}
42+
${{runner.os}}-${{matrix.scala}}-${{hashFiles('**/*.sbt')}}-
43+
${{runner.os}}-${{matrix.scala}}-
44+
- name: Run tests
45+
run: sbt ${{matrix.sbt-args}} ++${{ matrix.scala }} test
46+
- name: Publish to Maven Central Repository
47+
env:
48+
GITHUB_PERSONAL_ACCESS_TOKEN: ${{secrets.PERSONAL_ACCESS_TOKEN}}
49+
if: ${{ env.GITHUB_PERSONAL_ACCESS_TOKEN != '' && github.event_name != 'pull_request' }}
50+
run: sbt ${{matrix.sbt-args}} ++${{ matrix.scala }} "set every Seq(sonatypeSessionName := \"${{github.workflow}} ${{github.run_id}}-${{github.run_number}}-${{github.run_attempt}}-$$ ${{ matrix.scala }}\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease

.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
target/
22
local.sbt
33
secret/
4-
*.class
4+
.metals/
5+
.bloop/
6+
metals.sbt
7+
.bsp/
8+
.vscode/launch.json
9+
*.scala.semanticdb

.gitpod.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
image: igeolise/scalajs-test-runner:latest
2+
vscode:
3+
extensions:
4+
- scala-lang.scala@0.3.8:wQBBM+lKILHBqOqlqW60xA==
5+
- scalameta.metals@1.9.0:EyAIfy0ykjUn9htpw3f7GA==

.scalafmt.conf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
version = "1.5.1"
2-
maxColumn = 120
1+
runner.dialect = scala212source3
2+
version = "3.7.1"
3+
maxColumn = 80

.travis.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"files.watcherExclude": {
3+
"**/target": true
4+
}
5+
}

project/build.properties

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

project/plugins.sbt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.1")
1+
addSbtPlugin(
2+
"com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.2.5"
3+
)
24

35
addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.0.0")
46

5-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.31")
7+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.32")
68

7-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1")
9+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.17")
810

9-
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0")
11+
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
1012

11-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
13+
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
1214

1315
addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2")
1416

15-
addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "7.0.0")
17+
addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "9.2.1")

0 commit comments

Comments
 (0)