Skip to content

Commit

Permalink
Add Scala 3 support
Browse files Browse the repository at this point in the history
  • Loading branch information
rtyley committed Apr 12, 2024
1 parent d062772 commit 3857524
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ jobs:

- name: Build
run: |
sbt clean compile test
sbt clean +test
16 changes: 6 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
import ReleaseTransformations._
import ReleaseTransformations.*
import sbtversionpolicy.withsbtrelease.ReleaseVersion

name := "simple-configuration"

val scala_2_12: String = "2.12.19"
val scala_2_13: String = "2.13.13"

val awsSdkVersion = "2.25.26"

scalaVersion := scala_2_13
scalaVersion := "2.13.13"

val sharedSettings = Seq(
scalaVersion := scala_2_13,
crossScalaVersions := Seq(scala_2_12, scala_2_13),
scalaVersion := "2.13.13",
crossScalaVersions := Seq("3.3.3", scalaVersion.value, "2.12.19"),
licenses := Seq(License.Apache2),
organization := "com.gu",
scalacOptions := Seq("-release:11")
Expand Down Expand Up @@ -54,6 +51,7 @@ lazy val root = project
.settings(
publish / skip := true,
releaseCrossBuild := true,
releaseVersion := ReleaseVersion.fromAggregatedAssessedCompatibilityWithLatestRelease().value,
releaseProcess := Seq[ReleaseStep](
checkSnapshotDependencies,
inquireVersions,
Expand All @@ -64,7 +62,5 @@ lazy val root = project
tagRelease,
setNextVersion,
commitNextVersion
),
crossScalaVersions := Seq(scala_2_12, scala_2_13),
releaseVersion := ReleaseVersion.fromAggregatedAssessedCompatibilityWithLatestRelease().value
)
)

0 comments on commit 3857524

Please sign in to comment.