Skip to content

Commit

Permalink
Exclude test config (#168)
Browse files Browse the repository at this point in the history
* Fix build

* Exclude test config in pack

Currently when project dependencies are worked out in a multi-project build, there is no check to ensure that we are only including projects with a compile dependency, i.e. those with .dependsOn(module1) or .dependsOn(module1, "compile->...")

This fixes that issue and filters out projects that don't have compile dependencies.
  • Loading branch information
jonfox authored and xerial committed Nov 7, 2019
1 parent d4fd6c9 commit 03bcaef
Show file tree
Hide file tree
Showing 12 changed files with 360 additions and 254 deletions.
13 changes: 5 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
language: scala

scala:
- 2.12.8

jdk:
- oraclejdk8
- openjdk8

sudo: false

-env: sbt_version=0.13.17
jdk: oraclejdk8
script: ./sbt "^^ ${sbt_version}" compile scripted

-env: sbt_version=1.2.8
jdk: oraclejdk8
script: ./sbt ++2.12.8 "^^ ${sbt_version}" compile scripted
script: ./sbt compile scripted
4 changes: 1 addition & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
enablePlugins(SbtTwirl)
enablePlugins(SbtPlugin)

organization := "org.xerial.sbt"
organizationName := "Xerial project"
Expand All @@ -13,7 +14,6 @@ pomIncludeRepository := { _ =>
false
}

sbtPlugin := true
crossSbtVersions := Vector("1.2.8", "0.13.17")

scalaVersion in ThisBuild := "2.12.8"
Expand All @@ -32,8 +32,6 @@ scriptedLaunchOpts ++= {
Seq("-Dplugin.version=" + version.value)
}

scriptedBufferLog := false

libraryDependencies ++= Seq(
"org.slf4j" % "slf4j-simple" % "1.7.28",
"org.apache.commons" % "commons-compress" % "1.19",
Expand Down
1 change: 0 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.6")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.3.15")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0")
Expand Down
Loading

0 comments on commit 03bcaef

Please sign in to comment.