Skip to content

Remove dead code setting scalaJSBinaryVersion. #23

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Dec 12, 2019
Merged

Remove dead code setting scalaJSBinaryVersion. #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 0 additions & 16 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,12 @@ val scalaJSVersion =
val scalaJSScalaVersions =
settingKey[Seq[String]]("All the minor versions of Scala for which to build the CLI")

// Computed settings
val scalaJSBinaryVersion =
settingKey[String]("Binary version of Scala.js")

// Custom tasks
val cliLibJars =
taskKey[Seq[File]]("All the .jars that must go to the lib/ directory of the CLI")
val cliPack =
taskKey[File]("Pack the CLI for the current configuration")

// Duplicated from the Scala.js sbt plugin
def binaryScalaJSVersion(full: String): String = {
val ReleaseVersion = raw"""(\d+)\.(\d+)\.(\d+)""".r
val MinorSnapshotVersion = raw"""(\d+)\.(\d+)\.([1-9]\d*)-SNAPSHOT""".r
full match {
case ReleaseVersion(major, _, _) => major
case MinorSnapshotVersion(major, _, _) => major
case _ => full
}
}

inThisBuild(Def.settings(
version := "1.0.0-SNAPSHOT",
organization := "org.scala-js",
Expand All @@ -34,7 +19,6 @@ inThisBuild(Def.settings(
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),

scalaJSVersion := "1.0.0-RC2",
scalaJSBinaryVersion := binaryScalaJSVersion(scalaJSVersion.value),

scalaJSScalaVersions := Seq(
"2.11.12",
Expand Down