Skip to content

Commit

Permalink
Drop support for Scala 2.11 (#740)
Browse files Browse the repository at this point in the history
  • Loading branch information
fthomas authored Feb 25, 2020
1 parent c261ec9 commit 8f67fa3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 22 deletions.
9 changes: 0 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,6 @@ jobs:
script:
- bash -c 'shopt -s globstar; shellcheck **/*.sh'

- scala: 2.11.12 # Remember to update this in build.sbt, too.
sudo: required
before_install:
- curl https://raw.githubusercontent.com/scala-native/scala-native/master/scripts/travis_setup.sh | bash -x
script:
- sbt ++$TRAVIS_SCALA_VERSION validateJVM &&
sbt ++$TRAVIS_SCALA_VERSION validateJS &&
sbt ++$TRAVIS_SCALA_VERSION validateNative

- scala: 2.12.10 # Remember to update this in build.sbt, too.
install:
- pip install --user codecov
Expand Down
15 changes: 4 additions & 11 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ val gitPubUrl = s"https://github.com/$gitHubOwner/$projectName.git"
val gitDevUrl = s"git@github.com:$gitHubOwner/$projectName.git"

// Remember to update these in .travis.yml, too.
val Scala211 = "2.11.12"
val Scala212 = "2.12.10"
val Scala213 = "2.13.1"

Expand Down Expand Up @@ -44,22 +43,20 @@ val scalaCheckDep =

val moduleCrossPlatformMatrix: Map[String, List[Platform]] = Map(
"cats" -> List(JVMPlatform, JSPlatform),
"core" -> List(JVMPlatform, JSPlatform, NativePlatform),
"core" -> List(JVMPlatform, JSPlatform),
"eval" -> List(JVMPlatform),
"jsonpath" -> List(JVMPlatform),
"pureconfig" -> List(JVMPlatform),
"scalacheck" -> List(JVMPlatform, JSPlatform),
"scalaz" -> List(JVMPlatform, JSPlatform, NativePlatform),
"scalaz" -> List(JVMPlatform, JSPlatform),
"scodec" -> List(JVMPlatform, JSPlatform),
"scopt" -> List(JVMPlatform, JSPlatform),
"shapeless" -> List(JVMPlatform, JSPlatform, NativePlatform)
"shapeless" -> List(JVMPlatform, JSPlatform)
)

val moduleCrossScalaVersionsMatrix: (String, Platform) => List[String] = {
case (_, NativePlatform) =>
List(Scala211)
case _ =>
List(Scala211, Scala212, Scala213)
List(Scala212, Scala213)
}

def allSubprojectsOf(
Expand Down Expand Up @@ -139,7 +136,6 @@ lazy val core = myCrossProject("core")

lazy val coreJVM = core.jvm
lazy val coreJS = core.js
lazy val coreNative = core.native

lazy val docs = project
.configure(moduleConfig("docs"))
Expand Down Expand Up @@ -210,7 +206,6 @@ lazy val scalaz = myCrossProject("scalaz")

lazy val scalazJVM = scalaz.jvm
lazy val scalazJS = scalaz.js
lazy val scalazNative = scalaz.native

lazy val scodec = myCrossProject("scodec")
.dependsOn(core % "compile->compile;test->test")
Expand Down Expand Up @@ -251,7 +246,6 @@ lazy val shapeless = myCrossProject("shapeless")

lazy val shapelessJVM = shapeless.jvm
lazy val shapelessJS = shapeless.js
lazy val shapelessNative = shapeless.native

/// settings

Expand Down Expand Up @@ -336,7 +330,6 @@ def moduleJsSettings(name: String): Seq[Def.Setting[_]] = Def.settings(
)

def moduleNativeSettings(name: String): Seq[Def.Setting[_]] = Def.settings(
scalaVersion := Scala211,
crossScalaVersions := moduleCrossScalaVersionsMatrix(name, NativePlatform),
// Disable Scaladoc generation because of:
// [error] dropping dependency on node with no phase object: mixin
Expand Down
2 changes: 0 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.32")

addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.9")

addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")

addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
Expand Down

0 comments on commit 8f67fa3

Please sign in to comment.