Skip to content

Commit

Permalink
Disabled Scala 2.11 for scala-js and scala-native build.
Browse files Browse the repository at this point in the history
  • Loading branch information
@cheeseng
cheeseng committed Jun 17, 2023
1 parent 64103f5 commit 0cf7aa1
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 31 deletions.
2 changes: 1 addition & 1 deletion project/BuildCommons.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import ScalaNativePlugin.autoImport.{nativeLinkStubs, nativeDump}

trait BuildCommons {

lazy val scalaVersionsSettings: Seq[Setting[_]] = Seq(
def scalaVersionsSettings: Seq[Setting[_]] = Seq(
crossScalaVersions := Seq("2.13.11", "2.12.18", "2.11.12"),
scalaVersion := crossScalaVersions.value.head,
)
Expand Down
31 changes: 31 additions & 0 deletions project/JsBuild.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,17 @@ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._

trait JsBuild { this: BuildCommons =>

private lazy val jsSharedSettings = Seq(
crossScalaVersions := Seq("2.13.11", "2.12.18")
)

val sjsPrefix = "_sjs1_"

lazy val deleteJsDependenciesTask = taskKey[Unit]("Delete JS_DEPENDENCIES")

lazy val scalacticMacroJS = project.in(file("js/scalactic-macro"))
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(
projectTitle := "Scalactic Macro.js",
organization := "org.scalactic",
Expand Down Expand Up @@ -51,6 +56,7 @@ trait JsBuild { this: BuildCommons =>
lazy val scalacticJS = project.in(file("js/scalactic"))
.enablePlugins(SbtOsgi)
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(scalacticDocSettings: _*)
.settings(
projectTitle := "Scalactic.js",
Expand Down Expand Up @@ -105,6 +111,7 @@ trait JsBuild { this: BuildCommons =>
lazy val scalatestAppJS = project.in(file("js/scalatest-app"))
.enablePlugins(SbtOsgi)
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(
projectTitle := "ScalaTest App",
name := "scalatest-app",
Expand Down Expand Up @@ -198,6 +205,7 @@ trait JsBuild { this: BuildCommons =>

lazy val commonTestJS = project.in(file("js/common-test"))
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(
projectTitle := "Common test classes used by scalactic.js and scalatest.js",
libraryDependencies ++= crossBuildTestLibraryDependencies.value,
Expand All @@ -215,6 +223,7 @@ trait JsBuild { this: BuildCommons =>

lazy val scalacticTestJS = project.in(file("js/scalactic-test"))
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(
projectTitle := "Scalactic Test.js",
organization := "org.scalactic",
Expand Down Expand Up @@ -265,6 +274,7 @@ trait JsBuild { this: BuildCommons =>

lazy val scalatestTestJS = project.in(file("js/scalatest-test"))
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(sharedTestSettingsJS: _*)
.settings(
projectTitle := "ScalaTest Test",
Expand Down Expand Up @@ -296,6 +306,7 @@ trait JsBuild { this: BuildCommons =>

lazy val scalatestDiagramsTestJS = project.in(file("js/diagrams-test"))
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(sharedTestSettingsJS: _*)
.settings(
projectTitle := "ScalaTest Diagrams Test",
Expand All @@ -308,6 +319,7 @@ trait JsBuild { this: BuildCommons =>

lazy val scalatestFeatureSpecTestJS = project.in(file("js/featurespec-test"))
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(sharedTestSettingsJS: _*)
.settings(
projectTitle := "ScalaTest FeatureSpec Test",
Expand All @@ -321,6 +333,7 @@ trait JsBuild { this: BuildCommons =>

lazy val scalatestFlatSpecTestJS = project.in(file("js/flatspec-test"))
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(sharedTestSettingsJS: _*)
.settings(
projectTitle := "ScalaTest FlatSpec Test",
Expand All @@ -334,6 +347,7 @@ trait JsBuild { this: BuildCommons =>

lazy val scalatestFreeSpecTestJS = project.in(file("js/freespec-test"))
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(sharedTestSettingsJS: _*)
.settings(
projectTitle := "ScalaTest FreeSpec Test",
Expand All @@ -347,6 +361,7 @@ trait JsBuild { this: BuildCommons =>

lazy val scalatestFunSpecTestJS = project.in(file("js/funspec-test"))
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(sharedTestSettingsJS: _*)
.settings(
projectTitle := "ScalaTest FunSpec Test",
Expand All @@ -360,6 +375,7 @@ trait JsBuild { this: BuildCommons =>

lazy val scalatestFunSuiteTestJS = project.in(file("js/funsuite-test"))
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(sharedTestSettingsJS: _*)
.settings(
projectTitle := "ScalaTest FunSuite Test",
Expand All @@ -373,6 +389,7 @@ trait JsBuild { this: BuildCommons =>

lazy val scalatestPropSpecTestJS = project.in(file("js/propspec-test"))
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(sharedTestSettingsJS: _*)
.settings(
projectTitle := "ScalaTest PropSpec Test",
Expand All @@ -386,6 +403,7 @@ trait JsBuild { this: BuildCommons =>

lazy val scalatestWordSpecTestJS = project.in(file("js/wordspec-test"))
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(sharedTestSettingsJS: _*)
.settings(
projectTitle := "ScalaTest WordSpec Test",
Expand Down Expand Up @@ -415,6 +433,7 @@ trait JsBuild { this: BuildCommons =>
lazy val scalatestCoreJS = project.in(file("js/core"))
.enablePlugins(SbtOsgi)
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(scalatestDocSettings: _*)
.settings(
projectTitle := "ScalaTest Core JS",
Expand Down Expand Up @@ -499,6 +518,7 @@ trait JsBuild { this: BuildCommons =>
lazy val scalatestFeatureSpecJS = project.in(file("js/featurespec"))
.enablePlugins(SbtOsgi)
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(
projectTitle := "ScalaTest FeatureSpec JS",
organization := "org.scalatest",
Expand Down Expand Up @@ -532,6 +552,7 @@ trait JsBuild { this: BuildCommons =>
lazy val scalatestFlatSpecJS = project.in(file("js/flatspec"))
.enablePlugins(SbtOsgi)
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(
projectTitle := "ScalaTest FlatSpec JS",
organization := "org.scalatest",
Expand Down Expand Up @@ -565,6 +586,7 @@ trait JsBuild { this: BuildCommons =>
lazy val scalatestFreeSpecJS = project.in(file("js/freespec"))
.enablePlugins(SbtOsgi)
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(
projectTitle := "ScalaTest FreeSpec JS",
organization := "org.scalatest",
Expand Down Expand Up @@ -598,6 +620,7 @@ trait JsBuild { this: BuildCommons =>
lazy val scalatestFunSuiteJS = project.in(file("js/funsuite"))
.enablePlugins(SbtOsgi)
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(
projectTitle := "ScalaTest FunSuite JS",
organization := "org.scalatest",
Expand Down Expand Up @@ -631,6 +654,7 @@ trait JsBuild { this: BuildCommons =>
lazy val scalatestFunSpecJS = project.in(file("js/funspec"))
.enablePlugins(SbtOsgi)
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(
projectTitle := "ScalaTest FunSpec JS",
organization := "org.scalatest",
Expand Down Expand Up @@ -664,6 +688,7 @@ trait JsBuild { this: BuildCommons =>
lazy val scalatestPropSpecJS = project.in(file("js/propspec"))
.enablePlugins(SbtOsgi)
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(
projectTitle := "ScalaTest PropSpec JS",
organization := "org.scalatest",
Expand Down Expand Up @@ -697,6 +722,7 @@ trait JsBuild { this: BuildCommons =>
lazy val scalatestWordSpecJS = project.in(file("js/wordspec"))
.enablePlugins(SbtOsgi)
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(
projectTitle := "ScalaTest WordSpec JS",
organization := "org.scalatest",
Expand Down Expand Up @@ -730,6 +756,7 @@ trait JsBuild { this: BuildCommons =>
lazy val scalatestDiagramsJS = project.in(file("js/diagrams"))
.enablePlugins(SbtOsgi)
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(
projectTitle := "ScalaTest Diagrams JS",
organization := "org.scalatest",
Expand Down Expand Up @@ -762,6 +789,7 @@ trait JsBuild { this: BuildCommons =>
lazy val scalatestMatchersCoreJS = project.in(file("js/matchers-core"))
.enablePlugins(SbtOsgi)
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(
projectTitle := "ScalaTest Matchers Core JS",
organization := "org.scalatest",
Expand Down Expand Up @@ -796,6 +824,7 @@ trait JsBuild { this: BuildCommons =>
lazy val scalatestShouldMatchersJS = project.in(file("js/shouldmatchers"))
.enablePlugins(SbtOsgi)
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(
projectTitle := "ScalaTest Should Matchers JS",
organization := "org.scalatest",
Expand Down Expand Up @@ -828,6 +857,7 @@ trait JsBuild { this: BuildCommons =>
lazy val scalatestMustMatchersJS = project.in(file("js/mustmatchers"))
.enablePlugins(SbtOsgi)
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(
projectTitle := "ScalaTest Must Matchers JS",
organization := "org.scalatest",
Expand Down Expand Up @@ -860,6 +890,7 @@ trait JsBuild { this: BuildCommons =>
lazy val scalatestJS = project.in(file("js/scalatest"))
.enablePlugins(SbtOsgi)
.settings(sharedSettings: _*)
.settings(jsSharedSettings: _*)
.settings(
projectTitle := "ScalaTest JS",
organization := "org.scalatest",
Expand Down
Loading

0 comments on commit 0cf7aa1

Please sign in to comment.