cross build to 2.13

Author: MasseGuillaume

.travis.yml

@@ -1,15 +1,32 @@
 language: scala
-script:
-  - sbt ++$TRAVIS_SCALA_VERSION sourcecodeJVM/test:run sourcecodeJS/test:run
-scala:
-  - 2.10.6
-  - 2.11.8
-  - 2.12.0
+
+sudo: required
+
+dist: trusty
+
 jdk:
-  - openjdk7
   - oraclejdk8
+scala:
+  - 2.10.6
+  - 2.11.11
+  - 2.12.2
+  - 2.13.0-M1
 matrix:
-  exclude:
-    - scala: 2.12.0
+  include:
+    - scala: 2.10.6
       jdk: openjdk7
-sudo: false
+
+# Taken from https://github.com/typelevel/cats/blob/master/.travis.yml
+cache:
+  directories:
+  - $HOME/.sbt/0.13/dependency
+  - $HOME/.sbt/boot/scala*
+  - $HOME/.sbt/launchers
+  - $HOME/.ivy2/cache
+  - $HOME/.nvm
+
+before_cache:
+  - du -h -d 1 $HOME/.ivy2/cache
+  - du -h -d 2 $HOME/.sbt/
+  - find $HOME/.sbt -name "*.lock" -type f -delete
+  - find $HOME/.ivy2/cache -name "ivydata-*.properties" -type f -delete

build.sbt

@@ -1,6 +1,26 @@
 import OsgiKeys._
 
-crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0")
+val baseSettings = Seq(
+  organization := "com.lihaoyi",
+  name := "sourcecode",
+  version := "0.1.4",
+  scalaVersion := "2.11.11",
+  crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.2", "2.13.0-M1"),
+  scmInfo := Some(ScmInfo(
+    browseUrl = url("https://github.com/lihaoyi/sourcecode"),
+    connection = "scm:git:git@github.com:lihaoyi/sourcecode.git"
+  )),
+  homepage := Some(url("https://github.com/lihaoyi/sourcecode")),
+  licenses := Seq("MIT" -> url("http://www.opensource.org/licenses/mit-license.html")),
+  developers += Developer(
+    email = "haoyi.sg@gmail.com",
+    id = "lihaoyi",
+    name = "Li Haoyi",
+    url = url("https://github.com/lihaoyi")
+  )
+)
+
+baseSettings
 
 def macroDependencies(version: String) =
   Seq(
@@ -13,46 +33,27 @@ def macroDependencies(version: String) =
     else
       Seq())
 
-lazy val sourcecode = crossProject.settings(
-  version := "0.1.4",
-  scalaVersion := "2.11.8",
-  name := "sourcecode"  ,
-  organization := "com.lihaoyi",
-  libraryDependencies ++= macroDependencies(scalaVersion.value),
-  unmanagedSourceDirectories in Compile ++= {
-    CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, n)) if n >= 12 =>
-        Seq(baseDirectory.value / ".."/"shared"/"src"/ "main" / "scala-2.11")
-      case _ =>
-        Seq()
-    }
-  },
-  publishTo := Some("releases"  at "https://oss.sonatype.org/service/local/staging/deploy/maven2"),
-
-  pomExtra :=
-    <url>https://github.com/lihaoyi/sourcecode</url>
-    <licenses>
-      <license>
-        <name>MIT license</name>
-        <url>http://www.opensource.org/licenses/mit-license.php</url>
-      </license>
-    </licenses>
-    <scm>
-      <url>git://github.com/lihaoyi/sourcecode.git</url>
-      <connection>scm:git://github.com/lihaoyi/sourcecode.git</connection>
-    </scm>
-    <developers>
-      <developer>
-        <id>lihaoyi</id>
-        <name>Li Haoyi</name>
-        <url>https://github.com/lihaoyi</url>
-      </developer>
-    </developers>
-).enablePlugins(SbtOsgi).settings(osgiSettings).settings(
-  exportPackage := Seq("sourcecode.*"),
-  privatePackage := Seq(),
-  dynamicImportPackage := Seq("*")
-)
+lazy val sourcecode = crossProject
+  .settings(baseSettings)
+  .settings(
+    libraryDependencies ++= macroDependencies(scalaVersion.value),
+    unmanagedSourceDirectories in Compile ++= {
+      CrossVersion.partialVersion(scalaVersion.value) match {
+        case Some((2, n)) if n >= 12 =>
+          Seq(baseDirectory.value / ".." / "shared" / "src" / "main" / "scala-2.11")
+        case _ =>
+          Seq()
+      }
+    },
+    publishTo := Some("releases"  at "https://oss.sonatype.org/service/local/staging/deploy/maven2")
+  )
+  .enablePlugins(SbtOsgi)
+  .settings(
+    osgiSettings,
+    exportPackage := Seq("sourcecode.*"),
+    privatePackage := Seq(),
+    dynamicImportPackage := Seq("*")
+  )
 
 lazy val js = sourcecode.js
 lazy val jvm = sourcecode.jvm

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.13
+sbt.version=0.13.15

project/build.sbt

@@ -1,2 +1,2 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.16")
 addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.8.0")