Skip to content

Commit e38728e

Browse files
authored
Move crossVersion out of ThisBuild and add in versionScheme (#316)
Also make sure CI is ran on all prs.
1 parent 6aedc83 commit e38728e

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
- '*.md'
99
branches:
1010
- master
11+
pull_requests:
1112

1213
jobs:
1314
scala:

build.sbt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ inThisBuild(
3636
},
3737
scalaVersion := bin213.head,
3838
crossScalaVersions := bin212 ++ bin213,
39-
crossVersion := CrossVersion.full,
39+
versionScheme := Some("early-semver"),
4040
Test / fork := false,
4141
Test / publishArtifact := false,
4242
Test / parallelExecution := false,
@@ -55,9 +55,11 @@ inThisBuild(
5555
)
5656

5757
lazy val root = Project("scalac-scoverage", file("."))
58-
.settings(name := "scalac-scoverage")
59-
.settings(publishArtifact := false)
60-
.settings(publishLocal := {})
58+
.settings(
59+
name := "scalac-scoverage",
60+
publishArtifact := false,
61+
publishLocal := {}
62+
)
6163
.aggregate(plugin, runtime.jvm, runtime.js)
6264

6365
lazy val runtime = CrossProject(
@@ -66,9 +68,10 @@ lazy val runtime = CrossProject(
6668
)(JVMPlatform, JSPlatform)
6769
.crossType(CrossType.Full)
6870
.withoutSuffixFor(JVMPlatform)
69-
.settings(name := "scalac-scoverage-runtime")
7071
.settings(
72+
name := "scalac-scoverage-runtime",
7173
crossTarget := target.value / s"scala-${scalaVersion.value}",
74+
crossVersion := CrossVersion.full,
7275
libraryDependencies += "org.scalatest" %%% "scalatest" % ScalatestVersion % Test
7376
)
7477
.jvmSettings(
@@ -86,9 +89,10 @@ lazy val `scalac-scoverage-runtimeJS` = runtime.js
8689
lazy val plugin =
8790
Project("scalac-scoverage-plugin", file("scalac-scoverage-plugin"))
8891
.dependsOn(`scalac-scoverage-runtimeJVM` % Test)
89-
.settings(name := "scalac-scoverage-plugin")
9092
.settings(
93+
name := "scalac-scoverage-plugin",
9194
crossTarget := target.value / s"scala-${scalaVersion.value}",
95+
crossVersion := CrossVersion.full,
9296
libraryDependencies ++= Seq(
9397
"org.scala-lang.modules" %% "scala-xml" % "1.2.0",
9498
"org.scalatest" %% "scalatest" % ScalatestVersion % Test

0 commit comments

Comments
 (0)