Skip to content

Commit

Permalink
Merge pull request #364 from Philippus/add-version-scheme
Browse files Browse the repository at this point in the history
  • Loading branch information
SethTisue committed Mar 29, 2021
2 parents 6e2264f + d59923b commit 1caf77a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
8 changes: 7 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,20 @@ lazy val root = project.in(file("."))
.aggregate(parserCombinatorsJVM, parserCombinatorsJS, parserCombinatorsNative)
.settings(
publish / skip := true,
ThisBuild / versionScheme := Some("early-semver"),
ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible
)

lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatform)
.in(file("."))
.settings(
ScalaModulePlugin.scalaModuleSettings,
name := "scala-parser-combinators",
scalaModuleMimaPreviousVersion := None, // until we publish 1.2.0
scalaModuleMimaPreviousVersion := (CrossVersion.partialVersion(scalaVersion.value) match {
// pending resolution of https://github.com/scalacenter/sbt-version-policy/issues/62
case Some((3, _)) => None
case _ => Some("1.2.0-M2")
}),

libraryDependencies += "junit" % "junit" % "4.13.2" % Test,
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,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 ${projectPrefix}publishLocal $releaseTask
sbt clean ${projectPrefix}test ${projectPrefix}versionPolicyCheck ${projectPrefix}publishLocal $releaseTask
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)

addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.0-RC5")
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.3")

0 comments on commit 1caf77a

Please sign in to comment.