Skip to content

Commit 13d016d

Browse files
authored
Merge pull request #20 from lolgab/master
Added support for Scala Native
2 parents 2215f64 + 0e73984 commit 13d016d

36 files changed

+49
-24
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
.idea/
2-
target/
2+
target/
3+
.js/
4+
.jvm/
5+
.native/

.travis.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
sudo: false
21
language: scala
2+
sudo: required
3+
dist: trusty
34
scala:
4-
- 2.12.1
5+
- 2.11.12
56
jdk:
67
- oraclejdk8
8+
before_script:
9+
- curl https://raw.githubusercontent.com/scala-native/scala-native/master/bin/travis_setup.sh | bash -x
710
script:
8-
- sbt clean +test
11+
- sbt clean test
912
- sbt coverage reactifyJVM/test
1013
- sbt coverageReport
1114
- sbt coverageAggregate
@@ -16,4 +19,4 @@ cache:
1619
- $HOME/.sbt/boot
1720
before_cache:
1821
- find $HOME/.ivy2 -name "ivydata-*.properties" -delete
19-
- find $HOME/.sbt -name "*.lock" -delete
22+
- find $HOME/.sbt -name "*.lock" -delete

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ to the [More AdvancedExamples](https://github.com/outr/reactify#more-advanced-ex
2626

2727
## Setup
2828

29-
reactify is published to Sonatype OSS and Maven Central currently supporting Scala and Scala.js on 2.11, 2.12, and 2.13.
29+
reactify is published to Sonatype OSS and Maven Central currently supporting Scala and Scala.js on 2.11, 2.12, and 2.13 and Scala Native on 2.11.
3030

3131
Configuring the dependency in SBT simply requires:
3232

3333
```
3434
libraryDependencies += "com.outr" %% "reactify" % "2.2.0"
3535
```
3636

37-
or for Scala.js / cross-building:
37+
or for Scala.js / Scala Native / cross-building:
3838

3939
```
4040
libraryDependencies += "com.outr" %%% "reactify" % "2.2.0"

build.sbt

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,35 @@
1-
name := "reactify"
1+
import sbtcrossproject.{crossProject, CrossType}
2+
3+
name in ThisBuild := "reactify"
24
organization in ThisBuild := "com.outr"
35
version in ThisBuild := "2.2.0"
4-
scalaVersion in ThisBuild := "2.12.3"
5-
crossScalaVersions in ThisBuild := List("2.12.3", "2.11.11", "2.13.0-M1")
6+
scalaVersion in ThisBuild := "2.12.4"
7+
crossScalaVersions in ThisBuild := List("2.12.4", "2.11.12", "2.13.0-M2")
68

7-
lazy val root = project.in(file("."))
8-
.aggregate(js, jvm)
9+
lazy val reactify = crossProject(JVMPlatform, JSPlatform, NativePlatform)
10+
.crossType(CrossType.Pure)
11+
.in(file("."))
912
.settings(
10-
publish := {},
11-
publishLocal := {}
13+
name := "reactify",
14+
publishArtifact in Test := false
15+
)
16+
.nativeSettings(
17+
scalaVersion := "2.11.12",
18+
crossScalaVersions := Seq("2.11.12")
1219
)
1320

14-
lazy val reactify = crossProject.in(file("."))
21+
lazy val reactifyJS = reactify.js
22+
lazy val reactifyJVM = reactify.jvm
23+
lazy val reactifyNative = reactify.native
24+
25+
lazy val tests = crossProject(JVMPlatform, JSPlatform).crossType(CrossType.Pure)
26+
.dependsOn(reactify)
1527
.settings(
16-
libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.3" % "test"
28+
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.4" % Test,
29+
publish := {},
30+
publishLocal := {},
31+
publishArtifact := false
1732
)
18-
lazy val js = reactify.js
19-
lazy val jvm = reactify.jvm
33+
34+
lazy val testsJVM = tests.jvm
35+
lazy val testsJS = tests.js

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.16
1+
sbt.version=1.1.0

project/plugins.sbt

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

4-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
5-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1")
6-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
7-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
8-
addSbtPlugin("com.codacy" % "sbt-codacy-coverage" % "1.3.8")
4+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.1")
5+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
6+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
7+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
8+
addSbtPlugin("com.codacy" % "sbt-codacy-coverage" % "1.3.11")
9+
addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "0.3.0")
10+
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.3.0")
11+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.6")
File renamed without changes.

0 commit comments

Comments
 (0)