Skip to content

Commit bc431e2

Browse files
committed
Fix workflows and scala 2.12 build
1 parent ca0666d commit bc431e2

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,10 @@ jobs:
147147
echo "email: ${{ steps.import_gpg.outputs.email }}"
148148
149149
- name: run tests
150-
run: sbt ++3.3 test
150+
run: sbt ++3.6 test
151151

152152
- name: publish snapshot
153-
run: sbt ++3.3 publish
153+
run: sbt ++3.6 publish
154154
env:
155155
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
156156
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ jobs:
9090
run: docker-compose up -d
9191

9292
- name: run tests
93-
run: sbt ++3.3 test
93+
run: sbt ++3.6 test

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ jobs:
149149
echo "email: ${{ steps.import_gpg.outputs.email }}"
150150
151151
- name: run tests
152-
run: sbt ++3.3 test
152+
run: sbt ++3.6 test
153153

154154
- name: publish release
155-
run: sbt ++3.3 publishSigned
155+
run: sbt ++3.6 publishSigned
156156
env:
157157
RELEASE_VERSION: ${{ github.event.inputs.version }}
158158
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}

build.sbt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,5 +310,9 @@ lazy val pekko_streams = Project("pulsar4s-pekko-streams", file("pulsar4s-pekko-
310310
.settings(
311311
libraryDependencies ++= Seq(
312312
"org.apache.pekko" %% "pekko-stream" % PekkoStreamVersion
313-
)
313+
),
314+
// ignore scala-java8-compat issues with scala 2.12
315+
libraryDependencySchemes ++= (CrossVersion.partialVersion(scalaVersion.value).collect {
316+
case (2, 12) => "org.scala-lang.modules" %% "scala-java8-compat" % VersionScheme.Always
317+
})
314318
)

0 commit comments

Comments
 (0)