Skip to content

Commit b3d3728

Browse files
lihaoyiolafurpg
authored andcommitted
Merge pull request com-lihaoyi#27 from Jasper-M/patch-1
Broadcast scala 2.12 support
2 parents 13b6a5e + 18f80d1 commit b3d3728

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ SourceCode [![Build Status](https://travis-ci.org/lihaoyi/sourcecode.svg?branch=
22
==========
33

44
```scala
5-
"com.lihaoyi" %% "sourcecode" % "0.1.2" // Scala-JVM
6-
"com.lihaoyi" %%% "sourcecode" % "0.1.2" // Scala.js
5+
"com.lihaoyi" %% "sourcecode" % "0.1.3" // Scala-JVM
6+
"com.lihaoyi" %%% "sourcecode" % "0.1.3" // Scala.js
77
```
88

99
`sourcecode` is a small Scala library for that provides common "source code"
@@ -600,6 +600,12 @@ in its `.toString` method.
600600
Version History
601601
===============
602602

603+
0.1.3
604+
-----
605+
606+
- Add scala 2.12.x support, thanks to
607+
[Lars Hupel](https://github.com/larsrh)
608+
603609
0.1.2
604610
-----
605611

build.sbt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import sbtcrossproject.{crossProject, CrossType}
12

23
crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0")
34

@@ -12,8 +13,8 @@ def macroDependencies(version: String) =
1213
else
1314
Seq())
1415

15-
lazy val sourcecode = crossProject.settings(
16-
version := "0.1.3",
16+
lazy val sourcecode = crossProject(JSPlatform, JVMPlatform, NativePlatform).settings(
17+
version := "0.1.3-native",
1718
scalaVersion := "2.11.8",
1819
name := "sourcecode" ,
1920
organization := "com.lihaoyi",
@@ -49,5 +50,6 @@ lazy val sourcecode = crossProject.settings(
4950
</developers>
5051
)
5152

53+
lazy val native = sourcecode.native
5254
lazy val js = sourcecode.js
5355
lazy val jvm = sourcecode.jvm

project/build.sbt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
2+
addSbtPlugin("org.scala-native" % "sbt-crossproject" % "0.1.0") // (1)
3+
addSbtPlugin("org.scala-native" % "sbt-scalajs-crossproject" % "0.1.0") // (2)
4+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.1.0") // (3)

0 commit comments

Comments
 (0)