Skip to content

Commit e0308fc

Browse files
committed
Avoid accidentally cross building with Scala 2.12
1 parent ec16c08 commit e0308fc

File tree

3 files changed

+11
-18
lines changed

3 files changed

+11
-18
lines changed

build.sbt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,25 @@ lazy val artifactProducingProjectSettings = Seq(
1010
libraryDependencies ++= Seq(madgagCompress % Test, scalatest % Test)
1111
)
1212

13-
lazy val `scala-git` = project.settings(artifactProducingProjectSettings *).dependsOn(`scala-git-test` % Test)
13+
lazy val `scala-git` = project.settings(artifactProducingProjectSettings *).dependsOn(`scala-git-test` % Test).settings(
14+
libraryDependencies ++= Seq(
15+
jgit,
16+
"com.madgag" %% "scala-collection-plus" % "0.11",
17+
scalatest % Test
18+
)
19+
)
1420

15-
lazy val `scala-git-test` = project.in(file("scala-git-test")).settings(artifactProducingProjectSettings *)
21+
lazy val `scala-git-test` = project.in(file("scala-git-test")).settings(artifactProducingProjectSettings *).settings(
22+
libraryDependencies ++= guava :+ madgagCompress :+ jgit
23+
)
1624

1725
ThisBuild / Test / testOptions +=
1826
Tests.Argument(TestFrameworks.ScalaTest, "-u", s"test-results/scala-${scalaVersion.value}", "-o")
1927

2028
lazy val root = (project in file(".")).aggregate(`scala-git`, `scala-git-test`).settings(
2129
publish / skip := true,
2230
// releaseVersion := ReleaseVersion.fromAggregatedAssessedCompatibilityWithLatestRelease().value,
23-
releaseCrossBuild := true, // true if you cross-build the project for multiple Scala versions
31+
// releaseCrossBuild := true, // true if you cross-build the project for multiple Scala versions
2432
releaseProcess := Seq[ReleaseStep](
2533
checkSnapshotDependencies,
2634
inquireVersions,

scala-git-test/build.sbt

Lines changed: 0 additions & 6 deletions
This file was deleted.

scala-git/build.sbt

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)