Skip to content

Commit

Permalink
scrooge: fix crossScalaVersion for scrooge-generator-tests
Browse files Browse the repository at this point in the history
Problem / Solution

`scrooge-generator-tests` can't cross build for 2.12 yet, but
we'd still like to run the tests. This patch removes the
`scrooge-generator-tests` dependency for the `scrooge` project
definition and compiles the tests manually via our shell script.

RB_ID=846331
  • Loading branch information
Ruben Oanta authored and jenkins committed Jun 27, 2016
1 parent 12472db commit 094ce54
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ before_script:
- ./bin/travisci
- travis_retry ./sbt ++$TRAVIS_SCALA_VERSION update

script:
script:
- travis_retry ./sbt ++$TRAVIS_SCALA_VERSION clean coverage test coverageReport
- travis_retry ./sbt ++$TRAVIS_SCALA_VERSION scrooge-generator-tests/coverage scrooge-generator-tests/test scrooge-generator-tests/coverageReport
- ./sbt ++$TRAVIS_SCALA_VERSION coverageAggregate

after_success:
after_success:
- bash <(curl -s https://codecov.io/bash)
4 changes: 2 additions & 2 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ object Scrooge extends Build {
base = file("."),
settings = Defaults.coreDefaultSettings ++
sharedSettings,
aggregate = publishedProjects :+ (scroogeGeneratorTests: sbt.ProjectReference)
aggregate = publishedProjects
)

// This target is used for publishing dependencies locally
Expand Down Expand Up @@ -254,7 +254,7 @@ object Scrooge extends Build {
),
test in assembly := {}, // Skip tests when running assembly.
publishArtifact := false
).dependsOn(scroogeGenerator)
).dependsOn(scroogeGenerator).settings(crossScalaVersions := Seq("2.11.8"))

lazy val scroogeCore = Project(
id = "scrooge-core",
Expand Down

0 comments on commit 094ce54

Please sign in to comment.