Skip to content

Commit 3c3850b

Browse files
committed
Merge remote-tracking branch 'origin/main' into update/sbt-scala-module-3.2.0
2 parents 525c571 + 44050f0 commit 3c3850b

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
with:
2525
distribution: temurin
2626
java-version: ${{matrix.java}}
27+
- uses: sbt/setup-sbt@v1
2728
- name: Test
2829
run: sbt "setScalaVersion ${{matrix.scala}}" test core/headerCheck package
2930

@@ -49,5 +50,6 @@ jobs:
4950
with:
5051
distribution: temurin
5152
java-version: ${{matrix.java}}
53+
- uses: sbt/setup-sbt@v1
5254
- name: Test
5355
run: sbt "setScalaVersion ${{matrix.scala}}" test core/headerCheck package

.github/workflows/cla.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: "Check Scala CLA"
2+
on:
3+
pull_request:
4+
jobs:
5+
cla-check:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- name: Verify CLA
9+
uses: scala/cla-checker@v1
10+
with:
11+
author: ${{ github.event.pull_request.user.login }}

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ThisBuild / crossScalaVersions := Seq("2.13.14", "3.3.3")
1+
ThisBuild / crossScalaVersions := Seq("2.13.15", "3.3.4")
22
ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.head
33

44
Global / cancelable := true

project/build.properties

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

0 commit comments

Comments
 (0)