Skip to content

Commit b7dee81

Browse files
cross build to 2.13
1 parent 43e7d43 commit b7dee81

File tree

4 files changed

+21
-29
lines changed

4 files changed

+21
-29
lines changed

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ script:
33
- sbt ++$TRAVIS_SCALA_VERSION sourcecodeJVM/test:run sourcecodeJS/test:run
44
scala:
55
- 2.10.6
6-
- 2.11.8
7-
- 2.12.0
6+
- 2.11.11
7+
- 2.12.2
8+
- 2.13.0-M1
89
jdk:
910
- openjdk7
1011
- oraclejdk8
1112
matrix:
1213
exclude:
13-
- scala: 2.12.0
14+
- scala: 2.12.2
1415
jdk: openjdk7
1516
sudo: false

build.sbt

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0")
2+
crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.2", "2.13.0-M1")
33

44
def macroDependencies(version: String) =
55
Seq(
@@ -13,40 +13,31 @@ def macroDependencies(version: String) =
1313
Seq())
1414

1515
lazy val sourcecode = crossProject.settings(
16-
version := "0.1.3",
17-
scalaVersion := "2.11.8",
16+
version := "0.1.4",
17+
scalaVersion := "2.11.11",
1818
name := "sourcecode" ,
1919
organization := "com.lihaoyi",
2020
libraryDependencies ++= macroDependencies(scalaVersion.value),
2121
unmanagedSourceDirectories in Compile ++= {
2222
CrossVersion.partialVersion(scalaVersion.value) match {
2323
case Some((2, n)) if n >= 12 =>
24-
Seq(baseDirectory.value / ".."/"shared"/"src"/ "main" / "scala-2.11")
24+
Seq(baseDirectory.value / ".." / "shared" / "src" / "main" / "scala-2.11")
2525
case _ =>
2626
Seq()
2727
}
2828
},
2929
publishTo := Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2"),
30-
31-
pomExtra :=
32-
<url>https://github.com/lihaoyi/sourcecode</url>
33-
<licenses>
34-
<license>
35-
<name>MIT license</name>
36-
<url>http://www.opensource.org/licenses/mit-license.php</url>
37-
</license>
38-
</licenses>
39-
<scm>
40-
<url>git://github.com/lihaoyi/sourcecode.git</url>
41-
<connection>scm:git://github.com/lihaoyi/sourcecode.git</connection>
42-
</scm>
43-
<developers>
44-
<developer>
45-
<id>lihaoyi</id>
46-
<name>Li Haoyi</name>
47-
<url>https://github.com/lihaoyi</url>
48-
</developer>
49-
</developers>
30+
scmInfo := Some(ScmInfo(
31+
browseUrl = url("https://github.com/lihaoyi/sourcecode"),
32+
connection = "scm:git:[email protected]:lihaoyi/sourcecode.git"
33+
)),
34+
licenses := Seq("MIT" -> url("http://www.opensource.org/licenses/mit-license.html")),
35+
developers += Developer(
36+
email = "[email protected]",
37+
id = "lihaoyi",
38+
name = "Li Haoyi",
39+
url = url("https://github.com/lihaoyi")
40+
)
5041
)
5142

5243
lazy val js = sourcecode.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.13
1+
sbt.version=0.13.15

project/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
1+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.16")

0 commit comments

Comments
 (0)