Skip to content

Commit 8488e51

Browse files
Scala3 build (#194)
* scala3 cross build * bump akka/akka-http
1 parent 41363a4 commit 8488e51

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
matrix:
2424
os: [ubuntu-latest]
25-
scala: [2.12.18, 2.13.11]
25+
scala: [2.12.18, 2.13.11, 3.2.2]
2626
java: [temurin@8]
2727
runs-on: ${{ matrix.os }}
2828
steps:

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ThisBuild / organization := "com.github.matsluni"
22
// https://www.scala-lang.org/download/all.html
3-
ThisBuild / crossScalaVersions := List("2.12.18", "2.13.11")
3+
ThisBuild / crossScalaVersions := List("2.12.18", "2.13.11", "3.2.2")
44
ThisBuild / scalaVersion := crossScalaVersions.value.last
55

66
ThisBuild / githubWorkflowPublishTargetBranches := Nil
@@ -57,8 +57,8 @@ lazy val root = (project in file("."))
5757

5858
lazy val deps = {
5959
val awsSDKVersion = "2.11.4"
60-
val akkaVersion = "2.6.21"
61-
val AkkaHttpVersion = "10.2.10"
60+
val akkaVersion = "2.8.4"
61+
val AkkaHttpVersion = "10.5.2"
6262

6363
Seq(
6464
"com.typesafe.akka" %% "akka-stream" % akkaVersion,
@@ -78,7 +78,7 @@ lazy val deps = {
7878

7979
"org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2" % "it,test",
8080
"org.scalatest" %% "scalatest" % "3.2.16" % "it,test",
81-
"org.scalatestplus" %% "scalatestplus-junit" % "1.0.0-M2" % "it,test",
81+
"org.scalatestplus" %% "junit-4-13" % "3.2.12.0" % "it,test",
8282
"ch.qos.logback" % "logback-classic" % "1.3.11" % "it,test"
8383
)
8484
}

src/test/scala/com/github/matsluni/akkahttpspi/BaseAwsClientTest.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,21 @@ trait LocalstackBaseAwsClientTest[C <: SdkClient] extends BaseAwsClientTest[C] {
5252

5353
lazy val exposedServicePort: Int = 4566
5454

55-
override lazy val container: GenericContainer =
56-
new GenericContainer(
57-
dockerImage = "localstack/localstack",
58-
exposedPorts = Seq(exposedServicePort),
59-
env = Map("SERVICES" -> service),
60-
waitStrategy = Some(LocalStackReadyLogWaitStrategy)
61-
)
55+
private lazy val containerInstance = new GenericContainer(
56+
dockerImage = "localstack/localstack",
57+
exposedPorts = Seq(exposedServicePort),
58+
env = Map("SERVICES" -> service),
59+
waitStrategy = Some(LocalStackReadyLogWaitStrategy)
60+
)
61+
override val container: GenericContainer = containerInstance
6262
}
6363

6464
trait ElasticMQSQSBaseAwsClientTest[C <: SdkClient] extends BaseAwsClientTest[C] {
6565
def service: String
6666

6767
lazy val exposedServicePort: Int = 9324
6868

69-
override lazy val container: GenericContainer =
69+
override val container: GenericContainer =
7070
new GenericContainer(
7171
dockerImage = "softwaremill/elasticmq-native",
7272
exposedPorts = Seq(exposedServicePort)

src/test/scala/com/github/matsluni/akkahttpspi/s3/TestS3.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,10 @@ class TestS3 extends BaseAwsClientTest[S3AsyncClient] {
123123

124124
override def exposedServicePort: Int = 9090
125125

126-
override lazy val container: GenericContainer = new GenericContainer(
126+
private lazy val containerInstance = new GenericContainer(
127127
dockerImage = "adobe/s3mock:2.13.0",
128128
exposedPorts = Seq(exposedServicePort),
129129
waitStrategy = Some(TimeoutWaitStrategy(10 seconds))
130130
)
131+
override val container: GenericContainer = containerInstance
131132
}

0 commit comments

Comments
 (0)