Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove old scala version build settings #630

Merged
merged 1 commit into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,12 @@ lazy val commonSettings = Seq(
lazy val root = (project in file("."))
.aggregate(app, integration, scalaxbPlugin)
.settings(nocomma {
scalaVersion := scala211
scalaVersion := scala212
publish / skip := true
crossScalaVersions := Nil
commands += Command.command("release") { state =>
"clean" ::
"+app/publishSigned" ::
"++2.10.7!;scalaxbPlugin/publishSigned" ::
"++2.12.12!;scalaxbPlugin/publishSigned" ::
state
}
Expand All @@ -54,7 +53,7 @@ lazy val app = (project in file("cli"))
.settings(codegenSettings)
.settings(nocomma {
name := "scalaxb"
crossScalaVersions := Seq(scala3, scala213, scala212, scala211, scala210)
crossScalaVersions := Seq(scala3, scala213, scala212)
scalaVersion := scala212
resolvers += sbtResolver.value
libraryDependencies ++= appDependencies(scalaVersion.value)
Expand Down Expand Up @@ -94,7 +93,6 @@ lazy val scalaxbPlugin = (project in file("sbt-scalaxb"))
description := """sbt plugin to run scalaxb"""
pluginCrossBuild / sbtVersion := {
scalaBinaryVersion.value match {
case "2.10" => "0.13.18"
case "2.12" => "1.2.8" // set minimum sbt version
}
}
Expand Down
9 changes: 0 additions & 9 deletions project/dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ object Dependencies {
val scala3 = "3.3.1"
val scala213 = "2.13.12"
val scala212 = "2.12.18"
val scala211 = "2.11.12"
val scala210 = "2.10.7"

val jaxb = "javax.xml.bind" % "jaxb-api" % "2.3.1"
def scopt(sv: String) = {
Expand All @@ -30,7 +28,6 @@ object Dependencies {
val defaultGigahorseBackend = "okhttp"
val gigahorse = "com.eed3si9n" %% s"gigahorse-$defaultGigahorseBackend" % defaultGigahorseVersion
val launcherInterface = "org.scala-sbt" % "launcher-interface" % "0.12.0"
val scalaXml1 = "org.scala-lang.modules" %% "scala-xml" % "1.3.0"
val scalaXml2 = "org.scala-lang.modules" %% "scala-xml" % "2.1.0"
val scalaParserCombinators1 = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2"
val scalaParserCombinators2 = "org.scala-lang.modules" %% "scala-parser-combinators" % "2.1.1"
Expand Down Expand Up @@ -58,11 +55,7 @@ object Dependencies {

def scalaCompiler(sv: String) = "org.scala-lang" % "scala-compiler" % sv

val specs2Version = "2.4.11"
def specs2(sv: String) = CrossVersion partialVersion sv match {
case Some((2, 9)) => "org.specs2" %% "specs2" % "1.12.3"
case Some((2, 10)) => "org.specs2" %% "specs2" % "2.1.1"
case Some((2, 11)) => "org.specs2" %% "specs2" % "2.3.13"
case Some((2, 12)) => "org.specs2" %% "specs2" % "2.4.17"
case Some((2, 13)) => "org.specs2" %% "specs2-matcher-extra" % "4.6.0"
case x => sys error s"Unexpected Scala version [$sv], with partial version $x"
Expand All @@ -74,8 +67,6 @@ object Dependencies {
scopt(sv),
log4j
) ++ (sv match {
case x if sv.startsWith("2.10.") => Nil
case x if sv.startsWith("2.11.") => Seq(scalaXml1, scalaParserCombinators1)
case x if sv.startsWith("2.12.") => Seq(scalaXml2, scalaParserCombinators1)
case x => Seq(scalaXml2, scalaParserCombinators2)
})
Expand Down

This file was deleted.