Cleaned build, switched to scala-2.11.5, shapeless-2.1.0-RC1

README.md

@@ -83,8 +83,7 @@ Then in your sources:
       */
 ```
 
-Only for scala 2.11 for now, a (possibly lighter) version for scala 2.10 is being prepared. Depends on the current 
-snapshot version of shapeless (2.1.0-SNAPSHOT).
+Only for scala 2.11 for now, a (possibly lighter) version for scala 2.10 is being prepared. Depends on shapeless 2.1.0-RC1.
 
 
 ## Internals

build.sbt

@@ -1,56 +1,37 @@
 import SonatypeKeys._
 
-import _root_.sbtbuildinfo.Plugin.BuildInfoKey
-
-import com.typesafe.sbt.SbtGit.GitKeys._
+organization := "com.github.alexarchambault"
 
 name := "shapeless-refined-std"
 
-organization := "com.github.alexarchambault"
+version := "0.1.0-SNAPSHOT"
 
-scalaVersion := "2.11.2"
+scalaVersion := "2.11.5"
 
 scalacOptions ++= Seq("-feature", "-deprecation")
 
-resolvers ++= Seq(
-  Resolver.sonatypeRepo("releases")
-, Resolver.sonatypeRepo("snapshots")
-)
+resolvers += Resolver.sonatypeRepo("releases")
 
 libraryDependencies ++= Seq(
-  "com.chuusai"    %% "shapeless" % "2.1.0-SNAPSHOT" changing()
-, "org.scalatest"  %% "scalatest" % "2.2.0" % "test"
+  "org.scalatest"  %% "scalatest" % "2.2.0" % "test"
 )
 
+libraryDependencies ++= {
+  if (scalaVersion.value startsWith "2.10.")
+    Seq(
+      "com.chuusai" %% "shapeless" % "2.1.0-RC1" cross CrossVersion.full,
+      compilerPlugin("org.scalamacros" % "paradise" % "2.0.1" cross CrossVersion.full)
+    )
+  else
+    Seq(
+      "com.chuusai" %% "shapeless" % "2.1.0-RC1"
+    )
+}
+
 Boilerplate.settings
 
 Boilerplate.boilerplateSpecialToken in Boilerplate.boilerplateGenerate := "$"
 
-typelevelDefaultSettings
-
-TypelevelKeys.githubProject := ("alexarchambault", name.value)
-
-net.virtualvoid.sbt.graph.Plugin.graphSettings
-
-buildInfoSettings
-
-sourceGenerators in Compile <+= buildInfo
-
-buildInfoKeys := Seq[BuildInfoKey](
-  name
-, version
-, scalaVersion
-, sbtVersion
-, gitHeadCommit
-, BuildInfoKey.action("buildTime") {
-    System.currentTimeMillis
-  }
-)
-
-buildInfoPackage := "shapeless.refinedstd"
-
-profileName := "alexandre.archambault"
-
 xerial.sbt.Sonatype.sonatypeSettings
 
 publishMavenStyle := true

project/plugins.sbt

@@ -1,5 +1,7 @@
 addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.0-SNAPSHOT")
 
-addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.3.1")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.1")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.6.2")
+addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
+
+addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.6.2")

src/main/scala/shapeless/refinedstd/ops/traversablelike/PartitionAs.scala

@@ -17,7 +17,7 @@
 package shapeless.refinedstd.ops.traversablelike
 
 import language.higherKinds
-import shapeless._, record._
+import shapeless._, labelled._
 import scala.collection.{ TraversableLike, mutable }
 import shapeless.refinedstd.ops.BuiltOutOf
 import shapeless.refinedstd.util.BuildFrom

src/main/scala/shapeless/refinedstd/ops/traversablelike/PartitionWith.scala

@@ -17,7 +17,7 @@
 package shapeless.refinedstd.ops.traversablelike
 
 import language.higherKinds
-import shapeless._, record._
+import shapeless._, labelled._
 import scala.collection.{ TraversableLike, mutable }
 import shapeless.refinedstd.ops.BuiltOutOf
 import shapeless.refinedstd.util.BuildFrom