Skip to content

Update sbt-scala-module to 2.4.0 #274

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 3 commits into from
Aug 31, 2021
Merged

Update sbt-scala-module to 2.4.0 #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f47f5c
Update sbt-scala-module to 2.4.0
scala-steward Aug 3, 2021
4516321
configure sbt-version-policy
SethTisue Aug 31, 2021
d348fd2
Merge remote-tracking branch 'origin/main' into update/sbt-scala-modu…
SethTisue Aug 31, 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
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

val sharedSettings = ScalaModulePlugin.scalaModuleSettings ++ ScalaModulePlugin.scalaModuleOsgiSettings ++ Seq(
name := "scala-async",
scalaModuleAutomaticModuleName := Some("scala.async"),
versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,

OsgiKeys.exportPackage := Seq(s"scala.async.*;version=${version.value}"),

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 @@ -37,6 +37,7 @@ tagPat="^v$verPat(#$verPat)?$"

if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
releaseTask="ci-release"
versionCheckTask="versionCheck"
tagScalaVer=$(echo $TRAVIS_TAG | sed s/[^#]*// | sed s/^#//)
if [[ "$tagScalaVer" == "" ]]; then
if ! isReleaseJob; then
Expand All @@ -62,4 +63,4 @@ export CI_SNAPSHOT_RELEASE="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 "$setTagScalaVersion" clean test publishLocal $releaseTask
sbt "$setTagScalaVersion" clean test publishLocal $versionCheckTask $releaseTask
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.3.1")
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.4.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")