Skip to content

Commit b2e3121

Browse files
authored
Merge pull request scalacenter#2235 from bjaglin/projectmatrix0110
get rid of jvmPlatformFull thanks to projectmatrix 0.11.0
2 parents 2fc5fb5 + ede731f commit b2e3121

File tree

3 files changed

+6
-20
lines changed

3 files changed

+6
-20
lines changed

build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ lazy val rules = projectMatrix
141141
}
142142
)
143143
.defaultAxes(VirtualAxis.jvm)
144-
.jvmPlatformFull(cliScalaVersions)
144+
.jvmPlatform(CrossVersion.full, cliScalaVersions)
145145
.dependsOn(`compat-metaconfig-macros` % "provided")
146146
.dependsOn(core)
147147
.enablePlugins(BuildInfoPlugin)
@@ -218,7 +218,7 @@ lazy val cli = projectMatrix
218218
}.value
219219
)
220220
.defaultAxes(VirtualAxis.jvm)
221-
.jvmPlatformFull(cliScalaVersions)
221+
.jvmPlatform(CrossVersion.full, cliScalaVersions)
222222
.dependsOn(interfaces)
223223
.dependsOn(`compat-metaconfig-macros` % "provided")
224224
.dependsOn(reflect, rules)
@@ -234,7 +234,7 @@ lazy val testkit = projectMatrix
234234
)
235235
)
236236
.defaultAxes(VirtualAxis.jvm)
237-
.jvmPlatformFull(cliScalaVersions)
237+
.jvmPlatform(CrossVersion.full, cliScalaVersions)
238238
.dependsOn(cli)
239239

240240
lazy val shared = projectMatrix
@@ -312,7 +312,7 @@ lazy val unit = projectMatrix
312312
)
313313
)
314314
.defaultAxes(VirtualAxis.jvm)
315-
.jvmPlatformFull(cliScalaVersions)
315+
.jvmPlatform(CrossVersion.full, cliScalaVersions)
316316
.enablePlugins(BuildInfoPlugin)
317317
.dependsOn(testkit % Test)
318318

@@ -396,7 +396,7 @@ lazy val integration = projectMatrix
396396
Test / baseDirectory := (ThisBuild / baseDirectory).value
397397
)
398398
.defaultAxes(VirtualAxis.jvm)
399-
.jvmPlatformFull(cliScalaVersions)
399+
.jvmPlatform(CrossVersion.full, cliScalaVersions)
400400
.enablePlugins(BuildInfoPlugin)
401401
.dependsOn(unit % "compile->test")
402402

project/TargetAxis.scala

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -110,20 +110,6 @@ object TargetAxis {
110110

111111
implicit class TargetProjectMatrix(projectMatrix: ProjectMatrix) {
112112

113-
/** Like jvmPlatform but with the full Scala 3 version as suffix */
114-
def jvmPlatformFull(scalaVersions: Seq[String]): ProjectMatrix = {
115-
scalaVersions.foldLeft(projectMatrix) { (acc, scalaVersion) =>
116-
acc.customRow(
117-
autoScalaLibrary = true,
118-
axisValues = Seq(
119-
VirtualAxis.jvm,
120-
VirtualAxis.scalaVersionAxis(scalaVersion, scalaVersion)
121-
),
122-
process = p => p
123-
)
124-
}
125-
}
126-
127113
/**
128114
* Create one JVM project for each target, tagged and configured with the
129115
* requests of that target

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1")
55
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.7.0")
66
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.1")
77
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.2")
8-
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.1")
8+
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.11.0")

0 commit comments

Comments
 (0)