Skip to content

Commit 6dc416a

Browse files
committed
jackson 2.16
1 parent bc15453 commit 6dc416a

File tree

5 files changed

+19
-38
lines changed

5 files changed

+19
-38
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,59 +17,42 @@ on:
1717
env:
1818
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1919

20-
21-
concurrency:
22-
group: ${{ github.workflow }} @ ${{ github.ref }}
23-
cancel-in-progress: true
24-
2520
jobs:
2621
build:
2722
name: Build and Test
2823
strategy:
2924
matrix:
3025
os: [ubuntu-latest]
31-
scala: [3]
26+
scala: [3.3.1]
3227
java: [zulu@8]
3328
runs-on: ${{ matrix.os }}
34-
timeout-minutes: 60
3529
steps:
3630
- name: Checkout current branch (full)
37-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3832
with:
3933
fetch-depth: 0
4034

4135
- name: Setup Java (zulu@8)
42-
id: setup-java-zulu-8
4336
if: matrix.java == 'zulu@8'
4437
uses: actions/setup-java@v3
4538
with:
4639
distribution: zulu
4740
java-version: 8
4841
cache: sbt
4942

50-
- name: sbt update
51-
if: matrix.java == 'zulu@8' && steps.setup-java-zulu-8.outputs.cache-hit == 'false'
52-
run: sbt '++ ${{ matrix.scala }}' reload +update
53-
5443
- name: Check that workflows are up to date
55-
run: sbt githubWorkflowCheck
44+
run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
5645

5746
- name: Build project
5847
run: sbt '++ ${{ matrix.scala }}' test
5948

60-
- name: Make target directories
61-
if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
62-
run: mkdir -p target project/target
63-
6449
- name: Compress target directories
65-
if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
6650
run: tar cf targets.tar target project/target
6751

6852
- name: Upload target directories
69-
if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
7053
uses: actions/upload-artifact@v3
7154
with:
72-
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}
55+
name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }}
7356
path: targets.tar
7457

7558
publish:
@@ -79,33 +62,29 @@ jobs:
7962
strategy:
8063
matrix:
8164
os: [ubuntu-latest]
65+
scala: [3.3.1]
8266
java: [zulu@8]
8367
runs-on: ${{ matrix.os }}
8468
steps:
8569
- name: Checkout current branch (full)
86-
uses: actions/checkout@v3
70+
uses: actions/checkout@v4
8771
with:
8872
fetch-depth: 0
8973

9074
- name: Setup Java (zulu@8)
91-
id: setup-java-zulu-8
9275
if: matrix.java == 'zulu@8'
9376
uses: actions/setup-java@v3
9477
with:
9578
distribution: zulu
9679
java-version: 8
9780
cache: sbt
9881

99-
- name: sbt update
100-
if: matrix.java == 'zulu@8' && steps.setup-java-zulu-8.outputs.cache-hit == 'false'
101-
run: sbt reload +update
102-
103-
- name: Download target directories (3)
82+
- name: Download target directories (3.3.1)
10483
uses: actions/download-artifact@v3
10584
with:
106-
name: target-${{ matrix.os }}-${{ matrix.java }}-3
85+
name: target-${{ matrix.os }}-3.3.1-${{ matrix.java }}
10786

108-
- name: Inflate target directories (3)
87+
- name: Inflate target directories (3.3.1)
10988
run: |
11089
tar xf targets.tar
11190
rm targets.tar

.github/workflows/clean.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1818
steps:
1919
- name: Delete artifacts
20+
shell: bash {0}
2021
run: |
2122
# Customize those three lines with your repository and credentials:
2223
REPO=${GITHUB_API_URL}/repos/${{ github.repository }}
@@ -25,7 +26,7 @@ jobs:
2526
ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; }
2627
2728
# A temporary file which receives HTTP response headers.
28-
TMPFILE=/tmp/tmp.$$
29+
TMPFILE=$(mktemp)
2930
3031
# An associative array, key: artifact name, value: number of artifacts of that name.
3132
declare -A ARTCOUNT

build.sbt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
import xml.Group
33
import sbt._
44
import Keys._
5-
import org.typelevel.sbt.gha.JavaSpec.Distribution.Zulu
5+
import sbtghactions.JavaSpec.Distribution.Zulu
66

77
organization := "com.github.swagger-akka-http"
88

9-
ThisBuild / scalaVersion := "3.3.0"
9+
ThisBuild / scalaVersion := "3.3.1"
1010

1111
ThisBuild / organizationHomepage := Some(url("https://github.com/swagger-akka-http/swagger-scala3-enum-module"))
1212

@@ -18,8 +18,8 @@ pomIncludeRepository := { x => false }
1818

1919
libraryDependencies ++= Seq(
2020
"io.swagger.core.v3" % "swagger-core-jakarta" % "2.2.19",
21-
"com.github.swagger-akka-http" %% "swagger-scala-module" % "2.11.0",
22-
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.15.3",
21+
"com.github.swagger-akka-http" %% "swagger-scala-module" % "2.12.0",
22+
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.16.0",
2323
"org.scalatest" %% "scalatest" % "3.2.17" % Test,
2424
"org.slf4j" % "slf4j-simple" % "2.0.9" % Test
2525
)
@@ -52,8 +52,9 @@ pomExtra := {
5252

5353
MetaInfLicenseCopy.settings
5454

55-
ThisBuild / tlSonatypeUseLegacyHost := true
5655
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec(Zulu, "8"))
56+
ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
57+
5758
ThisBuild / githubWorkflowPublishTargetBranches := Seq(
5859
RefPredicate.Equals(Ref.Branch("main")),
5960
RefPredicate.StartsWith(Ref.Tag("v"))

project/build.properties

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

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
44

55
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
66

7-
addSbtPlugin("org.typelevel" % "sbt-typelevel-sonatype-ci-release" % "0.5.0-RC2")
7+
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.19.0")
88

99
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")

0 commit comments

Comments
 (0)