Skip to content

Commit f34cca2

Browse files
committed
Adjust build definition and CI process
- remove `versionScheme` (already set by sbt-version-policy) - scope `versionPolicyIntention` to projects, instead of to `ThisBuild` - replace `versionPolicyDependencySchemes` with `libraryDependencySchemes` - remove `scalaModuleMimaPreviousVersion` (already set by sbt-version-policy) - remove invocation of `versionPolicyCheck` from CI (already invoked by `test`) - add invocation of `versionCheck` before publishing a release
1 parent ba30ac6 commit f34cca2

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

build.sbt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
33
ThisBuild / startYear := Some(2002)
44
ThisBuild / licenses += (("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0")))
55

6-
ThisBuild / versionScheme := Some("early-semver")
7-
ThisBuild / versionPolicyIntention := Compatibility.BinaryCompatible
86
// because it doesn't declare it itself
9-
ThisBuild / versionPolicyDependencySchemes += "org.scala-js" %% "scalajs-library" % "semver-spec"
7+
ThisBuild / libraryDependencySchemes += "org.scala-js" %% "scalajs-library" % "semver-spec"
108

119
lazy val configSettings: Seq[Setting[_]] = Seq(
1210
unmanagedSourceDirectories ++= {
@@ -59,7 +57,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
5957
|""".stripMargin)),
6058

6159
// Note: See discussion on non-JVM Mima in https://github.com/scala/scala-xml/pull/517
62-
scalaModuleMimaPreviousVersion := Some("2.0.0"),
60+
versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,
6361
mimaReportSignatureProblems := true,
6462
mimaBinaryIssueFilters ++= {
6563
import com.typesafe.tools.mima.core._

build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ verPat="[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)?"
3737
tagPat="^v$verPat(#.*)?$"
3838

3939
if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
40+
versionCheckTask="versionCheck"
4041
releaseTask="ci-release"
4142
if ! isReleaseJob; then
4243
echo "Not releasing on Java $ADOPTOPENJDK with Scala $TRAVIS_SCALA_VERSION"
@@ -53,4 +54,4 @@ export CI_SNAPSHOT_RELEASE="${projectPrefix}publish"
5354
# for now, until we're confident in the new release scripts, just close the staging repo.
5455
export CI_SONATYPE_RELEASE="; sonatypePrepare; sonatypeBundleUpload; sonatypeClose"
5556

56-
sbt clean ${projectPrefix}test ${projectPrefix}versionPolicyCheck ${projectPrefix}publishLocal $releaseTask
57+
sbt clean ${projectPrefix}test ${projectPrefix}publishLocal $versionCheckTask $releaseTask

0 commit comments

Comments
 (0)