Skip to content

Commit 349ee31

Browse files
authored
Merge branch 'main' into update/sbt-scoverage-2.0.12
2 parents 1d3d1a6 + a4e0afa commit 349ee31

File tree

5 files changed

+34
-28
lines changed

5 files changed

+34
-28
lines changed

Diff for: .github/workflows/ci.yml

+25-19
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,26 @@ jobs:
2323
strategy:
2424
matrix:
2525
os: [ubuntu-latest]
26-
scala: [2.12.19, 2.13.13, 3.3.3]
27-
java: [temurin@8]
26+
scala: [2.12.20, 2.13.15, 3.4.1]
27+
java: [zulu@8]
2828
runs-on: ${{ matrix.os }}
2929
steps:
3030
- name: Checkout current branch (full)
3131
uses: actions/checkout@v4
3232
with:
3333
fetch-depth: 0
3434

35-
- name: Setup Java (temurin@8)
36-
if: matrix.java == 'temurin@8'
35+
- name: Setup Java (zulu@8)
36+
if: matrix.java == 'zulu@8'
3737
uses: actions/setup-java@v4
3838
with:
39-
distribution: temurin
39+
distribution: zulu
4040
java-version: 8
4141
cache: sbt
4242

43+
- name: Setup sbt
44+
uses: sbt/setup-sbt@v1
45+
4346
- name: Check binary compatibility
4447
run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues
4548

@@ -68,49 +71,52 @@ jobs:
6871
strategy:
6972
matrix:
7073
os: [ubuntu-latest]
71-
scala: [3.3.3]
72-
java: [temurin@8]
74+
scala: [3.4.1]
75+
java: [zulu@8]
7376
runs-on: ${{ matrix.os }}
7477
steps:
7578
- name: Checkout current branch (full)
7679
uses: actions/checkout@v4
7780
with:
7881
fetch-depth: 0
7982

80-
- name: Setup Java (temurin@8)
81-
if: matrix.java == 'temurin@8'
83+
- name: Setup Java (zulu@8)
84+
if: matrix.java == 'zulu@8'
8285
uses: actions/setup-java@v4
8386
with:
84-
distribution: temurin
87+
distribution: zulu
8588
java-version: 8
8689
cache: sbt
8790

88-
- name: Download target directories (2.12.19)
91+
- name: Setup sbt
92+
uses: sbt/setup-sbt@v1
93+
94+
- name: Download target directories (2.12.20)
8995
uses: actions/download-artifact@v4
9096
with:
91-
name: target-${{ matrix.os }}-2.12.19-${{ matrix.java }}
97+
name: target-${{ matrix.os }}-2.12.20-${{ matrix.java }}
9298

93-
- name: Inflate target directories (2.12.19)
99+
- name: Inflate target directories (2.12.20)
94100
run: |
95101
tar xf targets.tar
96102
rm targets.tar
97103
98-
- name: Download target directories (2.13.13)
104+
- name: Download target directories (2.13.15)
99105
uses: actions/download-artifact@v4
100106
with:
101-
name: target-${{ matrix.os }}-2.13.13-${{ matrix.java }}
107+
name: target-${{ matrix.os }}-2.13.15-${{ matrix.java }}
102108

103-
- name: Inflate target directories (2.13.13)
109+
- name: Inflate target directories (2.13.15)
104110
run: |
105111
tar xf targets.tar
106112
rm targets.tar
107113
108-
- name: Download target directories (3.3.3)
114+
- name: Download target directories (3.4.1)
109115
uses: actions/download-artifact@v4
110116
with:
111-
name: target-${{ matrix.os }}-3.3.3-${{ matrix.java }}
117+
name: target-${{ matrix.os }}-3.4.1-${{ matrix.java }}
112118

113-
- name: Inflate target directories (3.3.3)
119+
- name: Inflate target directories (3.4.1)
114120
run: |
115121
tar xf targets.tar
116122
rm targets.tar

Diff for: .scalafmt.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.8.1
1+
version = 3.8.3
22

33
runner.dialect = scala213
44

Diff for: build.sbt

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ homepage := Some(url("https://sangria-graphql.github.io/"))
1515
licenses := Seq(
1616
"Apache License, ASL Version 2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0"))
1717

18-
ThisBuild / crossScalaVersions := Seq("2.12.19", "2.13.13", "3.3.3")
18+
ThisBuild / crossScalaVersions := Seq("2.12.20", "2.13.15", "3.4.1")
1919
ThisBuild / scalaVersion := crossScalaVersions.value.last
2020
ThisBuild / githubWorkflowPublishTargetBranches := List()
2121
ThisBuild / githubWorkflowBuildPreamble ++= List(
@@ -33,10 +33,10 @@ scalacOptions ++= {
3333
javacOptions ++= Seq("-source", "8", "-target", "8")
3434

3535
libraryDependencies ++= Seq(
36-
"org.sangria-graphql" %% "sangria-marshalling-api" % "1.0.8",
37-
"io.argonaut" %% "argonaut" % "6.3.9",
36+
"org.sangria-graphql" %% "sangria-marshalling-api" % "1.1.2",
37+
"io.argonaut" %% "argonaut" % "6.3.10",
3838
"org.sangria-graphql" %% "sangria-marshalling-testkit" % "1.0.4" % Test,
39-
"org.scalatest" %% "scalatest" % "3.2.18" % Test
39+
"org.scalatest" %% "scalatest" % "3.2.19" % Test
4040
)
4141

4242
git.remoteRepo := "[email protected]:sangria-graphql/sangria-argonaut.git"

Diff for: project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.2

Diff for: project/plugins.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
1+
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
22
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.2")
33
addSbtPlugin("com.github.sbt" % "sbt-site" % "1.6.0")
44
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
55
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")
6-
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.11")
7-
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.23.0")
6+
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.14")
7+
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.24.0")
88
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
99
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")

0 commit comments

Comments
 (0)