Skip to content

Commit ce977ae

Browse files
authored
Update scala versions (#318)
* Update scala versions * update workflow * update ci pipeline * update * update * drop 11 * update * update * fmt
1 parent 469a93e commit ce977ae

File tree

5 files changed

+127
-783
lines changed

5 files changed

+127
-783
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ jobs:
3030
- name: Cache scala dependencies
3131
uses: coursier/cache-action@v6
3232
- name: Check code formatting
33-
run: ./sbt check
33+
run: sbt check
3434

3535
compile:
3636
runs-on: ubuntu-22.04
3737
timeout-minutes: 30
3838
strategy:
3939
fail-fast: false
4040
matrix:
41-
java: ['17']
42-
scala: ['2.12.19', '2.13.13', '3.3.3']
41+
java: ['11']
42+
scala: ['2.12.20', '2.13.15', '3.3.4']
4343
steps:
4444
- name: Checkout current branch
4545
uses: actions/checkout@v4.0.0
@@ -54,16 +54,16 @@ jobs:
5454
- name: Cache scala dependencies
5555
uses: coursier/cache-action@v6
5656
- name: Compile sources
57-
run: ./sbt ++${{ matrix.scala }}! compileSources
57+
run: sbt ++${{ matrix.scala }}! compileSources
5858

5959
test:
6060
runs-on: ubuntu-22.04
6161
timeout-minutes: 30
6262
strategy:
6363
fail-fast: false
6464
matrix:
65-
java: ['8', '11', '17']
66-
scala: ['2.12.19', '2.13.13', '3.3.3']
65+
java: ['11', '17', '21']
66+
scala: ['2.12.20', '2.13.15', '3.3.4']
6767
steps:
6868
- name: Checkout current branch
6969
uses: actions/checkout@v4.0.0
@@ -78,7 +78,7 @@ jobs:
7878
- name: Cache scala dependencies
7979
uses: coursier/cache-action@v6
8080
- name: Run tests
81-
run: ./sbt ++${{ matrix.scala }}! testAll
81+
run: sbt ++${{ matrix.scala }}! testAll
8282

8383
publishLocal:
8484
runs-on: ubuntu-22.04
@@ -95,7 +95,7 @@ jobs:
9595
- name: Cache scala dependencies
9696
uses: coursier/cache-action@v6
9797
- name: Check that building packages works
98-
run: ./sbt +publishLocal
98+
run: sbt +publishLocal
9999

100100
website:
101101
runs-on: ubuntu-22.04
@@ -112,7 +112,7 @@ jobs:
112112
- name: Cache scala dependencies
113113
uses: coursier/cache-action@v6
114114
- name: Check Website Generation
115-
run: ./sbt docs/compileDocs
115+
run: sbt docs/compileDocs
116116

117117
ci:
118118
runs-on: ubuntu-22.04
@@ -135,12 +135,12 @@ jobs:
135135
uses: actions/setup-java@v3.12.0
136136
with:
137137
distribution: temurin
138-
java-version: 8
138+
java-version: 17
139139
check-latest: true
140140
- name: Cache scala dependencies
141141
uses: coursier/cache-action@v6
142142
- name: Release artifacts
143-
run: ./sbt ci-release
143+
run: sbt ci-release
144144
env:
145145
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
146146
PGP_SECRET: ${{ secrets.PGP_SECRET }}

.github/workflows/site.yml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# task and should be included in the git repository. Please do not edit it manually.
33

44
name: Website
5-
'on':
5+
6+
on:
67
workflow_dispatch: {}
78
release:
89
types:
@@ -11,39 +12,40 @@ name: Website
1112
branches:
1213
- master
1314
pull_request: {}
15+
1416
jobs:
1517
build:
1618
name: Build and Test
17-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-22.04
1820
if: ${{ github.event_name == 'pull_request' }}
1921
steps:
2022
- name: Git Checkout
21-
uses: actions/checkout@v3.3.0
23+
uses: actions/checkout@v4.0.0
2224
with:
2325
fetch-depth: '0'
2426
- name: Setup Scala
25-
uses: actions/setup-java@v3.9.0
27+
uses: actions/setup-java@v3.12.0
2628
with:
2729
distribution: temurin
2830
java-version: 17
2931
check-latest: true
3032
- name: Check if the README file is up to date
31-
run: sbt docs/checkReadme
33+
run: sbt docs/checkReadme
3234
- name: Check artifacts build process
33-
run: sbt +publishLocal
35+
run: sbt +publishLocal
3436
- name: Check website build process
35-
run: sbt docs/clean; sbt docs/buildWebsite
37+
run: sbt docs/clean; sbt docs/buildWebsite
3638
publish-docs:
3739
name: Publish Docs
38-
runs-on: ubuntu-latest
40+
runs-on: ubuntu-22.04
3941
if: ${{ ((github.event_name == 'release') && (github.event.action == 'published')) || (github.event_name == 'workflow_dispatch') }}
4042
steps:
4143
- name: Git Checkout
42-
uses: actions/checkout@v3.3.0
44+
uses: actions/checkout@v4.0.0
4345
with:
4446
fetch-depth: '0'
4547
- name: Setup Scala
46-
uses: actions/setup-java@v3.9.0
48+
uses: actions/setup-java@v3.12.0
4749
with:
4850
distribution: temurin
4951
java-version: 17
@@ -54,27 +56,27 @@ jobs:
5456
node-version: 16.x
5557
registry-url: https://registry.npmjs.org
5658
- name: Publish Docs to NPM Registry
57-
run: sbt docs/publishToNpm
59+
run: sbt docs/publishToNpm
5860
env:
5961
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
6062
generate-readme:
6163
name: Generate README
62-
runs-on: ubuntu-latest
64+
runs-on: ubuntu-22.04
6365
if: ${{ (github.event_name == 'push') || ((github.event_name == 'release') && (github.event.action == 'published')) }}
6466
steps:
6567
- name: Git Checkout
66-
uses: actions/checkout@v3.3.0
68+
uses: actions/checkout@v4.0.0
6769
with:
6870
ref: ${{ github.head_ref }}
6971
fetch-depth: '0'
7072
- name: Setup Scala
71-
uses: actions/setup-java@v3.9.0
73+
uses: actions/setup-java@v3.12.0
7274
with:
7375
distribution: temurin
7476
java-version: 17
7577
check-latest: true
7678
- name: Generate Readme
77-
run: sbt docs/generateReadme
79+
run: sbt docs/generateReadme
7880
- name: Commit Changes
7981
run: |
8082
git config --local user.email "github-actions[bot]@users.noreply.github.com"

project/BuildHelper.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,10 @@ object BuildHelper {
4040
scalacOptions := stdOptions ++ extraOptions(scalaVersion.value, optimize = !isSnapshot.value),
4141
semanticdbEnabled := scalaVersion.value == defaultScalaVersion,
4242
semanticdbOptions ++= (if (scalaVersion.value != Scala3) List("-P:semanticdb:synthetics:on") else Nil),
43-
semanticdbVersion := scalafixSemanticdb.revision,
44-
ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(scalaVersion.value),
45-
Compile / fork := true,
46-
Test / fork := true,
47-
Test / parallelExecution := true,
43+
semanticdbVersion := scalafixSemanticdb.revision,
44+
Compile / fork := true,
45+
Test / fork := true,
46+
Test / parallelExecution := true,
4847
incOptions ~= (_.withLogRecompileOnMacro(false)),
4948
autoAPIMappings := true,
5049
buildInfoKeys := Seq[BuildInfoKey](organization, moduleName, name, version, scalaVersion, sbtVersion, isSnapshot),

0 commit comments

Comments
 (0)