Skip to content

Commit 0ad8a80

Browse files
committed
Completely removed Scala.js 1.x functionality until it can be resolved properly.
1 parent 00690fc commit 0ad8a80

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

build.sbt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
name := "reactify"
22
organization in ThisBuild := "com.outr"
3-
version in ThisBuild := "2.0.5"
3+
version in ThisBuild := "2.0.6"
44
scalaVersion in ThisBuild := "2.12.2"
55
crossScalaVersions in ThisBuild := List("2.12.2", "2.11.11", "2.13.0-M1")
66

7-
import sbtcrossproject.crossProject
7+
lazy val root = project.in(file("."))
8+
.aggregate(js, jvm)
9+
.settings(
10+
publish := {},
11+
publishLocal := {}
12+
)
813

9-
lazy val reactify = crossProject(JSPlatform, JVMPlatform).in(file("."))
14+
lazy val reactify = crossProject.in(file("."))
1015
.settings(
1116
libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.3" % "test"
1217
)
13-
1418
lazy val js = reactify.js
1519
lazy val jvm = reactify.jvm

project/plugins.sbt

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
11
resolvers += "Artima Maven Repository" at "http://repo.artima.com/releases"
22
resolvers += "Typesafe Repository" at "https://repo.typesafe.com/typesafe/releases/"
33

4-
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.18")
5-
64
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
75
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1")
8-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
6+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
97
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
10-
addSbtPlugin("com.codacy" % "sbt-codacy-coverage" % "1.3.8")
11-
12-
{
13-
if (scalaJSVersion.startsWith("0.6."))
14-
Seq(addSbtPlugin("org.scala-native" % "sbt-scalajs-crossproject" % "0.2.0"))
15-
else
16-
Nil
17-
}
8+
addSbtPlugin("com.codacy" % "sbt-codacy-coverage" % "1.3.8")

0 commit comments

Comments
 (0)