Skip to content

Commit

Permalink
sbt bump, scala 2.12.19
Browse files Browse the repository at this point in the history
  • Loading branch information
ghik committed Feb 21, 2024
1 parent 305ca3e commit d612b87
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 10 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/ci.yml
Expand Up @@ -35,6 +35,7 @@ jobs:
- 2.13.4
- 2.13.3
- 2.13.2
- 2.12.19
- 2.12.18
- 2.12.17
- 2.12.16
Expand Down Expand Up @@ -229,6 +230,16 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.12.19)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-2.12.19-${{ matrix.java }}

- name: Inflate target directories (2.12.19)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.12.18)
uses: actions/download-artifact@v2
with:
Expand Down
18 changes: 9 additions & 9 deletions build.sbt
Expand Up @@ -21,7 +21,7 @@ inThisBuild(Seq(
organization := "com.github.ghik",
scalaVersion := crossScalaVersions.value.head,
crossScalaVersions := Seq("2.13.12", "2.13.11", "2.13.10", "2.13.9", "2.13.8", "2.13.7", "2.13.6", "2.13.5", "2.13.4", "2.13.3", "2.13.2",
"2.12.18", "2.12.17", "2.12.16", "2.12.15", "2.12.14", "2.12.13", "2.11.12"),
"2.12.19", "2.12.18", "2.12.17", "2.12.16", "2.12.15", "2.12.14", "2.12.13", "2.11.12"),

githubWorkflowTargetTags ++= Seq("v*"),
githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17")),
Expand Down Expand Up @@ -72,14 +72,14 @@ val subprojectSettings = Def.settings(
)

lazy val silencer = (project in file(".")).aggregate(`silencer-lib`, `silencer-plugin`)
.settings(commonSettings: _*)
.settings(commonSettings*)
.settings(
publishArtifact := false,
PgpKeys.publishSigned := {}
)

lazy val `silencer-lib` = project
.settings(subprojectSettings: _*)
.settings(subprojectSettings*)
.settings(
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-reflect" % scalaVersion.value % Test,
Expand All @@ -88,17 +88,17 @@ lazy val `silencer-lib` = project
)

lazy val `silencer-plugin` = project.dependsOn(`silencer-lib`)
.settings(subprojectSettings: _*)
.settings(subprojectSettings*)
.settings(
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-compiler" % scalaVersion.value,
"org.scalatest" %% "scalatest-funsuite" % "3.2.0" % Test
),
resourceGenerators in Test += Def.task {
val result = (resourceManaged in Test).value / "embeddedcp"
IO.write(result, (fullClasspath in `silencer-lib` in Test).value.map(_.data.getAbsolutePath).mkString("\n"))
Test / resourceGenerators += Def.task {
val result = (Test / resourceManaged).value / "embeddedcp"
IO.write(result, (`silencer-lib` / Test / fullClasspath).value.map(_.data.getAbsolutePath).mkString("\n"))
Seq(result)
}.taskValue,
fork in Test := true,
baseDirectory in Test := (baseDirectory in ThisBuild).value,
Test / fork := true,
Test / baseDirectory := (ThisBuild / baseDirectory).value,
)
2 changes: 1 addition & 1 deletion project/build.properties
@@ -1,2 +1,2 @@
# suppress inspection "UnusedProperty"
sbt.version=1.8.3
sbt.version=1.9.7

0 comments on commit d612b87

Please sign in to comment.