Skip to content

Commit 99cafcf

Browse files
committed
split travis jobs in to JVM, JS and unidoc
1 parent 3836573 commit 99cafcf

File tree

2 files changed

+35
-24
lines changed

2 files changed

+35
-24
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ env:
1616
- REDIS_HOME=$PWD/redis-$REDIS_VERSION/src
1717

1818
script:
19-
- sbt ++$TRAVIS_SCALA_VERSION test commons/unidoc
19+
- sbt ++$TRAVIS_SCALA_VERSION commons-jvm/test
20+
- sbt ++$TRAVIS_SCALA_VERSION commons-js/test
21+
- sbt ++$TRAVIS_SCALA_VERSION commons/unidoc
2022

2123
sudo: false
2224

build.sbt

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -132,25 +132,19 @@ val noPublishSettings = Seq(
132132
mimaPreviousArtifacts := Set.empty,
133133
)
134134

135+
val aggregateProjectSettings =
136+
commonSettings ++ noPublishSettings ++ Seq(
137+
ideSkipProject := true,
138+
ideExcludedDirectories := Seq(baseDirectory.value)
139+
)
140+
135141
val CompileAndTest = "compile->compile;test->test"
136142

137143
lazy val commons = project.in(file("."))
138144
.enablePlugins(ScalaUnidocPlugin)
139145
.aggregate(
140-
`commons-analyzer`,
141-
`commons-macros`,
142-
`commons-annotations`,
143-
`commons-annotations-js`,
144-
`commons-core`,
145-
`commons-core-js`,
146-
`commons-jetty`,
147-
`commons-mongo`,
148-
`commons-spring`,
149-
`commons-redis`,
150-
`commons-akka`,
151-
`commons-kafka`,
152-
`commons-benchmark`,
153-
`commons-benchmark-js`,
146+
`commons-jvm`,
147+
`commons-js`,
154148
)
155149
.settings(
156150
commonSettings,
@@ -170,6 +164,30 @@ lazy val commons = project.in(file("."))
170164
),
171165
)
172166

167+
lazy val `commons-jvm` = project.in(file(".jvm"))
168+
.aggregate(
169+
`commons-analyzer`,
170+
`commons-macros`,
171+
`commons-annotations`,
172+
`commons-core`,
173+
`commons-jetty`,
174+
`commons-mongo`,
175+
`commons-spring`,
176+
`commons-redis`,
177+
`commons-akka`,
178+
`commons-kafka`,
179+
`commons-benchmark`,
180+
)
181+
.settings(aggregateProjectSettings)
182+
183+
lazy val `commons-js` = project.in(file(".js"))
184+
.aggregate(
185+
`commons-annotations-js`,
186+
`commons-core-js`,
187+
`commons-benchmark-js`,
188+
)
189+
.settings(aggregateProjectSettings)
190+
173191
def mkSourceDirs(base: File, scalaBinary: String, conf: String): Seq[File] = Seq(
174192
base / "src" / conf / "scala",
175193
base / "src" / conf / s"scala-$scalaBinary",
@@ -211,7 +229,6 @@ lazy val `commons-core` = project
211229
"com.google.code.findbugs" % "jsr305" % jsr305Version % Optional,
212230
"com.google.guava" % "guava" % guavaVersion % Optional,
213231
),
214-
ideExcludedDirectories := Seq(baseDirectory.value / "agg"),
215232
)
216233

217234
lazy val `commons-core-js` = project.in(`commons-core`.base / "js")
@@ -224,14 +241,6 @@ lazy val `commons-core-js` = project.in(`commons-core`.base / "js")
224241
sourceDirsSettings(_.getParentFile),
225242
)
226243

227-
lazy val `commons-core-agg` = project.in(`commons-core`.base / "agg")
228-
.aggregate(`commons-core`, `commons-core-js`)
229-
.settings(
230-
commonSettings,
231-
noPublishSettings,
232-
ideSkipProject := true
233-
)
234-
235244
lazy val `commons-analyzer` = project
236245
.dependsOn(`commons-core` % Test)
237246
.settings(

0 commit comments

Comments
 (0)