From 16f5f947f5891296b06c421caddfbf6d70152eeb Mon Sep 17 00:00:00 2001 From: johannes karoff Date: Mon, 13 Nov 2023 00:27:44 +0100 Subject: [PATCH] use scala 3 --- .github/workflows/build.yml | 4 +--- build.sbt | 15 ++++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a8c9ff40..68239da4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: build: strategy: matrix: - scalaVersion: ["2.13.12"] + scalaVersion: ["2.13.12", "3.3.1"] runs-on: ubuntu-20.04 steps: @@ -71,8 +71,6 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - scala: [2.13.12] - java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 diff --git a/build.sbt b/build.sbt index c50a8bcf..23bf0451 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,8 @@ Global / onChangedBuildSource := ReloadOnSourceChanges inThisBuild( Seq( organization := "io.github.fun-stack", - scalaVersion := "2.13.12", + scalaVersion := crossScalaVersions.value.last, + crossScalaVersions := Seq("2.13.12", "3.3.1"), licenses := Seq("MIT License" -> url("https://opensource.org/licenses/MIT")), homepage := Some(url("https://github.com/fun-stack/fun-stack-scala")), scmInfo := Some( @@ -65,8 +66,8 @@ lazy val backend = project name := "fun-stack-backend", libraryDependencies ++= Deps.cats.effect.value :: - Deps.awsSdkJS.sns.value :: - Deps.awsSdkJS.cognitoidentityprovider.value :: + Deps.awsSdkJS.sns.value.cross(CrossVersion.for3Use2_13) :: + Deps.awsSdkJS.cognitoidentityprovider.value.cross(CrossVersion.for3Use2_13) :: Deps.sloth.value :: Deps.mycelium.core.value :: Nil, @@ -80,7 +81,7 @@ lazy val lambdaApigateway = project name := "fun-stack-lambda-apigateway", libraryDependencies ++= Deps.cats.effect.value :: - Deps.awsLambdaJS.value :: + Deps.awsLambdaJS.value.cross(CrossVersion.for3Use2_13) :: Nil, ) @@ -147,8 +148,8 @@ lazy val lambdaWsEventAuthorizer = project name := "fun-stack-lambda-ws-event-authorizer", libraryDependencies ++= Deps.cats.effect.value :: - Deps.awsSdkJS.sns.value :: - Deps.awsLambdaJS.value :: + Deps.awsSdkJS.sns.value.cross(CrossVersion.for3Use2_13) :: + Deps.awsLambdaJS.value.cross(CrossVersion.for3Use2_13) :: Deps.sloth.value :: Nil, ) @@ -182,7 +183,7 @@ lazy val clientNode = project .settings( name := "fun-stack-client-node", libraryDependencies ++= - Deps.awsSdkJS.cognitoidentityprovider.value :: + Deps.awsSdkJS.cognitoidentityprovider.value.cross(CrossVersion.for3Use2_13) :: Nil, Compile / npmDependencies ++= NpmDeps.nodeFetch ::