From 6235aa5ab023653cbbb36ba877bead37f618214e Mon Sep 17 00:00:00 2001 From: Aki Huttunen Date: Wed, 14 Jun 2023 17:04:09 +0300 Subject: [PATCH] Add Scala 3 build and update twitter-util to latest (22.12.0) --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- project/BuildHelper.scala | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5256e22..464d2bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: fail-fast: false matrix: java: ['adopt@1.8', 'adopt@1.11'] - scala: ['2.12.15', '2.13.8'] + scala: ['2.12.15', '2.13.8', '3.3.0'] steps: - name: Checkout current branch uses: actions/checkout@v2.4.0 diff --git a/build.sbt b/build.sbt index 0c2638e..46bacb5 100644 --- a/build.sbt +++ b/build.sbt @@ -39,7 +39,7 @@ lazy val twitter = project .settings( libraryDependencies ++= Seq( "dev.zio" %% "zio" % Zio, - "com.twitter" %% "util-core" % "21.2.0", + "com.twitter" %% "util-core" % "22.12.0" cross CrossVersion.for3Use2_13, "dev.zio" %% "zio-test" % Zio % Test, "dev.zio" %% "zio-test-sbt" % Zio % Test ) diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala index 1b9f9a0..5c54feb 100644 --- a/project/BuildHelper.scala +++ b/project/BuildHelper.scala @@ -23,6 +23,7 @@ object BuildHelper { val Scala212: String = versions("2.12") val Scala213: String = versions("2.13") + val Scala3: String = versions("3.3") val Zio: String = "2.0.15" @@ -36,7 +37,7 @@ object BuildHelper { def stdSettings(prjName: String) = Seq( name := s"$prjName", - crossScalaVersions := List(Scala212, Scala213), + crossScalaVersions := List(Scala212, Scala213, Scala3), ThisBuild / scalaVersion := Scala213, scalacOptions := stdOptions ++ extraOptions(scalaVersion.value, optimize = !isSnapshot.value), Test / parallelExecution := true,