Skip to content

Commit 2e78598

Browse files
authored
Merge pull request #304 from evolution-gaming/feature/sbt-version-policy
Migrate to sbt-version-policy Fixed: #299 Also: - updated sbt to 1.10.11 - updated release action to v4 - harmonized ci action with other Evo OSS projects
2 parents 90a2d87 + a4f4bfa commit 2e78598

5 files changed

Lines changed: 12 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ jobs:
3737
- name: setup SBT
3838
uses: sbt/setup-sbt@v1
3939

40+
- name: check code ${{ matrix.scala }}
41+
run: sbt ++${{ matrix.scala }} clean check
42+
4043
- name: build ${{ matrix.scala }}
4144
run: sbt ++${{ matrix.scala }} clean coverage test
4245

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ on:
77

88
jobs:
99
release:
10-
uses: evolution-gaming/scala-github-actions/.github/workflows/release.yml@v3
10+
uses: evolution-gaming/scala-github-actions/.github/workflows/release.yml@v4
1111
secrets: inherit

build.sbt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Dependencies._
1+
import Dependencies.*
22

33
def crossSettings[T](scalaVersion: String, if3: T, if2: T) = {
44
scalaVersion match {
@@ -20,6 +20,8 @@ organizationName := "Evolution"
2020
organizationHomepage := Some(url("https://evolution.com"))
2121
coverageExcludedFiles := ".*CacheOpsCompat.*"
2222

23+
versionPolicyIntention := Compatibility.BinaryCompatible
24+
2325
scalaVersion := crossScalaVersions.value.head
2426

2527
crossScalaVersions := Seq("2.13.16", "3.3.5")
@@ -83,5 +85,5 @@ developers := List(
8385

8486
publishTo := Some(Resolver.evolutionReleases)
8587

86-
//addCommandAlias("check", "all versionPolicyCheck Compile/doc")
87-
addCommandAlias("check", "show version")
88+
addCommandAlias("check", "all versionPolicyCheck Compile/doc")
89+
addCommandAlias("build", "all test package")

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.10
1+
sbt.version=1.10.11

project/plugins.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.15")
55
// This sets the 'version' property based on the git tag during release process to publish the right version
66
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0")
77

8+
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1")
9+
810
addSbtPlugin("com.evolution" % "sbt-scalac-opts-plugin" % "0.0.9")
911

1012
addSbtPlugin("com.evolution" % "sbt-artifactory-plugin" % "0.0.2")

0 commit comments

Comments
 (0)