Skip to content

Commit

Permalink
fix CrossVersion.binary build. add test for CrossVersion.binary
Browse files Browse the repository at this point in the history
  • Loading branch information
xuwei-k committed Apr 18, 2020
1 parent 12dd6f0 commit 7495eca
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ matrix:
jdk: openjdk11
- scala: scripted-test
jdk: openjdk8
env: SCRIPT=";+ core/publishLocal;+ sbt-plugin/scripted"
env: SCRIPT=";+ publishLocal;+ sbt-plugin/scripted"
script:
- sbt "${SCRIPT}"
- os: windows
Expand All @@ -34,7 +34,7 @@ matrix:
- source .install-jdk-travis.sh
- wget https://raw.githubusercontent.com/paulp/sbt-extras/0ee2dae2eba72efb4a464a5ad255e348696ecda7/sbt && chmod +x ./sbt
script:
- ./sbt test "+ core/publishLocal" "+ sbt-plugin/scripted"
- ./sbt test "+ publishLocal" "+ sbt-plugin/scripted"
script: sbt "++${TRAVIS_SCALA_VERSION} -v" compile test
cache:
directories:
Expand Down
35 changes: 22 additions & 13 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -87,22 +87,25 @@ releaseProcess := Seq[ReleaseStep](
pushChanges
)

val coreId = "core"

def crossSrcSetting(c: Configuration) = {
unmanagedSourceDirectories in c += {
val dir = (baseDirectory in LocalProject(coreId)).value / "src" / Defaults.nameForSrc(c.name)
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, v)) if v >= 13 =>
dir / s"scala-2.13+"
case _ =>
dir / s"scala-2.13-"
}
}
}

val coreSettings = Def.settings(
commonSettings,
name := "wartremover",
fork in Test := true,
crossScalaVersions := travisScalaVersions.value,
Seq(Compile, Test).map { scope =>
unmanagedSourceDirectories in scope += {
val dir = baseDirectory.value / "src" / Defaults.nameForSrc(scope.name)
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, v)) if v >= 13 =>
dir / s"scala-2.13+"
case _ =>
dir / s"scala-2.13-"
}
}
},
libraryDependencies := {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, v)) if v >= 13 =>
Expand Down Expand Up @@ -137,17 +140,23 @@ lazy val coreCrossBinary = Project(
base = file("core-cross-binary")
).settings(
coreSettings,
crossSrcSetting(Compile),
Compile / scalaSource := (core / Compile / scalaSource).value,
Compile / resourceDirectory := (core / Compile / resourceDirectory).value,
crossScalaVersions := Seq(latestScala211.value, latestScala212.value, latestScala213.value),
crossVersion := CrossVersion.binary
).enablePlugins(TravisYaml)
)
.dependsOn(testMacros % "test->compile")
.enablePlugins(TravisYaml)


lazy val core = Project(
id = "core",
id = coreId,
base = file("core")
).settings(
coreSettings,
crossSrcSetting(Compile),
crossSrcSetting(Test),
crossScalaVersions := travisScalaVersions.value,
crossVersion := CrossVersion.full,
crossTarget := {
Expand Down
6 changes: 6 additions & 0 deletions sbt-plugin/src/sbt-test/wartremover/basic/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,9 @@ crossScalaVersions := Seq("2.11.12", "2.12.10", "2.12.11", "2.13.0", "2.13.1")
wartremoverWarnings ++= Warts.all

wartremoverWarnings += Wart.JavaConversions

commands += Command.command("changeBinary") {
"set wartremoverCrossVersion := CrossVersion.binary" ::
"""set crossScalaVersions := Seq("2.11.12", "2.12.11", "2.13.1")""" :: // set latest versions
_
}
2 changes: 2 additions & 0 deletions sbt-plugin/src/sbt-test/wartremover/basic/test
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
> + compile
> changeBinary
> + compile

0 comments on commit 7495eca

Please sign in to comment.