Skip to content

Update sbt-scala-module to 2.4.0 #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 16, 2021
Merged

Update sbt-scala-module to 2.4.0 #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dabe5be
Update sbt-scala-module to 2.4.0
scala-steward Aug 3, 2021
461f891
Adjust build definition and CI process
julienrf Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
Global / cancelable := true
publish / skip := true // in root

ThisBuild / versionScheme := Some("early-semver")
ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible

lazy val commonSettings: Seq[Setting[_]] =
Seq(scalaModuleAutomaticModuleName := Some("scala.collection.parallel")) ++
ScalaModulePlugin.scalaModuleSettings ++ Seq(
versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,
Compile / compile / scalacOptions --= (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, _)) => Seq("-Xlint")
case _ => Seq()
Expand All @@ -22,7 +20,6 @@ lazy val core = project.in(file("core"))
.settings(
name := "scala-parallel-collections",
Compile / doc / autoAPIMappings := true,
scalaModuleMimaPreviousVersion := Some("1.0.3"),
)

lazy val junit = project.in(file("junit"))
Expand Down
3 changes: 2 additions & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ verPat="[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)?"
tagPat="^v$verPat(#.*)?$"

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

sbt clean ${projectPrefix}test versionPolicyCheck core/headerCheck ${projectPrefix}publishLocal $releaseTask
sbt clean ${projectPrefix}test core/headerCheck ${projectPrefix}publishLocal $versionCheckTask $releaseTask
3 changes: 1 addition & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.3.1")
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.2.1")
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.4.0")