Skip to content

Commit

Permalink
scala 3 build
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning committed Dec 17, 2022
1 parent 090bc99 commit 43e646c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
12 changes: 11 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.11, 2.12, 2.13]
scala: [2.11, 2.12, 2.13, 3]
java: [zulu@8]
runs-on: ${{ matrix.os }}
timeout-minutes: 60
Expand Down Expand Up @@ -131,6 +131,16 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (3)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3

- name: Inflate target directories (3)
run: |
tar xf targets.tar
rm targets.tar
- env:
CI_SNAPSHOT_RELEASE: +publishSigned
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ organization := "com.github.swagger-akka-http"

ThisBuild / scalaVersion := "2.13.10"

ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.17", "2.13.10")
ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.17", "2.13.10", "3.2.1")

ThisBuild / organizationHomepage := Some(url("https://github.com/swagger-akka-http/swagger-enumeratum-module"))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class SwaggerEnumeratumModelConverter extends ModelResolver(Json.mapper()) {
if (isEnum(cls)) {
val sp: Schema[String] = PrimitiveType.STRING.createProperty().asInstanceOf[Schema[String]]
setRequired(annotatedType)
getValues(cls).foreach { v: String =>
getValues(cls).foreach { v =>
sp.addEnumItemObject(v)
}
nullSafeList(annotatedType.getCtxAnnotations).foreach {
Expand Down

0 comments on commit 43e646c

Please sign in to comment.