Skip to content

Commit a4e96e8

Browse files
committed
Adjust build definition and CI process
- remove `scalaModuleMimaPreviousVersion` (already set by sbt-version-policy) - add `scalaModuleAutomaticModuleName` (required by sbt-scala-module 2.3+) - add `versionPolicyIntention` - invoke `versionCheck` before publishing a release Fixes #72 Fixes #15
1 parent a31e86c commit a4e96e8

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

build.sbt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ lazy val scalaLibraryNext = crossProject(JVMPlatform, JSPlatform)
1818
.jsEnablePlugins(ScalaJSJUnitPlugin)
1919
.settings(
2020
ScalaModulePlugin.scalaModuleSettings,
21-
scalaModuleMimaPreviousVersion := None,
21+
scalaModuleAutomaticModuleName := Some("scala.library.next"),
22+
versionPolicyIntention := Compatibility.None, // TODO Change to `Compatibility.BinaryAndSourceCompatible` after the first release
2223
scalacOptions ++= Seq("-deprecation", "-feature", "-Werror"),
2324
libraryDependencies ++= Seq(
2425
"org.scalacheck" %%% "scalacheck" % "1.15.4" % Test,

build.sh

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

3636
if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
37+
versionCheckTask="versionCheck"
3738
releaseTask="ci-release"
3839
if ! isReleaseJob; then
3940
echo "Not releasing on Java $ADOPTOPENJDK with Scala $TRAVIS_SCALA_VERSION"
@@ -50,4 +51,4 @@ export CI_SNAPSHOT_RELEASE="${projectPrefix}publish"
5051
# for now, until we're confident in the new release scripts, just close the staging repo.
5152
export CI_SONATYPE_RELEASE="; sonatypePrepare; sonatypeBundleUpload; sonatypeClose"
5253

53-
sbt clean ${projectPrefix}test ${projectPrefix}publishLocal $releaseTask
54+
sbt clean ${projectPrefix}test ${projectPrefix}publishLocal $versionCheckTask $releaseTask

0 commit comments

Comments
 (0)