Skip to content

Commit

Permalink
Scala3 build (#194)
Browse files Browse the repository at this point in the history
* scala3 cross build

* bump akka/akka-http
  • Loading branch information
sebastian-alfers authored Sep 11, 2023
1 parent 41363a4 commit 8488e51
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.18, 2.13.11]
scala: [2.12.18, 2.13.11, 3.2.2]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ThisBuild / organization := "com.github.matsluni"
// https://www.scala-lang.org/download/all.html
ThisBuild / crossScalaVersions := List("2.12.18", "2.13.11")
ThisBuild / crossScalaVersions := List("2.12.18", "2.13.11", "3.2.2")
ThisBuild / scalaVersion := crossScalaVersions.value.last

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

lazy val deps = {
val awsSDKVersion = "2.11.4"
val akkaVersion = "2.6.21"
val AkkaHttpVersion = "10.2.10"
val akkaVersion = "2.8.4"
val AkkaHttpVersion = "10.5.2"

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

"org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2" % "it,test",
"org.scalatest" %% "scalatest" % "3.2.16" % "it,test",
"org.scalatestplus" %% "scalatestplus-junit" % "1.0.0-M2" % "it,test",
"org.scalatestplus" %% "junit-4-13" % "3.2.12.0" % "it,test",
"ch.qos.logback" % "logback-classic" % "1.3.11" % "it,test"
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,21 @@ trait LocalstackBaseAwsClientTest[C <: SdkClient] extends BaseAwsClientTest[C] {

lazy val exposedServicePort: Int = 4566

override lazy val container: GenericContainer =
new GenericContainer(
dockerImage = "localstack/localstack",
exposedPorts = Seq(exposedServicePort),
env = Map("SERVICES" -> service),
waitStrategy = Some(LocalStackReadyLogWaitStrategy)
)
private lazy val containerInstance = new GenericContainer(
dockerImage = "localstack/localstack",
exposedPorts = Seq(exposedServicePort),
env = Map("SERVICES" -> service),
waitStrategy = Some(LocalStackReadyLogWaitStrategy)
)
override val container: GenericContainer = containerInstance
}

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

lazy val exposedServicePort: Int = 9324

override lazy val container: GenericContainer =
override val container: GenericContainer =
new GenericContainer(
dockerImage = "softwaremill/elasticmq-native",
exposedPorts = Seq(exposedServicePort)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,10 @@ class TestS3 extends BaseAwsClientTest[S3AsyncClient] {

override def exposedServicePort: Int = 9090

override lazy val container: GenericContainer = new GenericContainer(
private lazy val containerInstance = new GenericContainer(
dockerImage = "adobe/s3mock:2.13.0",
exposedPorts = Seq(exposedServicePort),
waitStrategy = Some(TimeoutWaitStrategy(10 seconds))
)
override val container: GenericContainer = containerInstance
}

0 comments on commit 8488e51

Please sign in to comment.