sbt 1

tek · Apr 27, 2018 · 93117c6 · 93117c6
1 parent d38dca7
commit 93117c6
Show file tree

Hide file tree

Showing 51 changed files with 67 additions and 107 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ additional info for implicit resolution errors.
 # Usage
 
 ```sbt
-addCompilerPlugin("io.tryp" % "splain" % "0.2.9" cross CrossVersion.patch)
+addCompilerPlugin("io.tryp" % "splain" % "0.3.0" cross CrossVersion.patch)
 ```
 
 # Configuration

diff --git a/build.sbt b/build.sbt
@@ -0,0 +1,44 @@
+scalaVersion := "2.12.5"
+crossScalaVersions ++= List("2.10.6", "2.11.11", "2.11.12", "2.12.1", "2.12.2", "2.12.3", "2.12.4")
+crossVersion := CrossVersion.full
+organization := "io.tryp"
+name := "splain"
+fork := true
+libraryDependencies ++= List(
+  scalaOrganization.value % "scala-compiler" % scalaVersion.value % "provided",
+  "org.specs2" %% "specs2-core" % "3.8.6" % "test",
+  "com.chuusai" %% "shapeless" % "2.3.2" % "test",
+)
+
+addSourceDir { case (2, minor, _) if minor >= 11 => "2.11+" }
+addSourceDir { case (2, 12, patch) if patch >= 4 => "2.12.4+" case _ => "2.12.3-" }
+javaOptions in Test ++= {
+  val jar = (Keys.`package` in Compile).value.getAbsolutePath
+    val tests = baseDirectory.value / "tests"
+    List(s"-Dsplain.jar=$jar", s"-Dsplain.tests=$tests")
+}
+
+publishMavenStyle := true
+publishTo := Some(
+  if (isSnapshot.value) Opts.resolver.sonatypeSnapshots
+  else Resolver.url("sonatype staging", url("https://oss.sonatype.org/service/local/staging/deploy/maven2"))
+)
+licenses := List("MIT" -> url("http://opensource.org/licenses/MIT"))
+homepage := Some(url(repo))
+scmInfo := Some(ScmInfo(url(repo), "scm:git@github.com:tek/splain"))
+developers := List(Developer(id="tryp", name="Torsten Schmits", email="torstenschmits@gmail.com", url=url(github)))
+
+import ReleaseTransformations._
+releaseCrossBuild := true
+releaseProcess := Seq[ReleaseStep](
+  checkSnapshotDependencies,
+  inquireVersions,
+  runClean,
+  setReleaseVersion,
+  releaseStepCommandAndRemaining("+publishSigned"),
+  releaseStepCommand("sonatypeReleaseAll"),
+  commitReleaseVersion,
+  tagRelease,
+  setNextVersion,
+  commitNextVersion
+)
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.16
+sbt.version=1.1.1
diff --git a/project/build.scala b/project/build.scala
@@ -2,90 +2,27 @@ package tryp
 
 import sbt._, Keys._
 
-import sbtrelease.ReleasePlugin.autoImport.{ReleaseTransformations, releaseProcess, ReleaseStep}
-import ReleaseTransformations._
-
-object SplainLibs
-extends Libs
+object P
+extends AutoPlugin
 {
-  val splain = ids(
-    scalaOrganization.value % "scala-compiler" % scalaVersion.value % "provided",
-    "org.specs2" %% "specs2-core" % "3.8.6" % "test",
-    "com.chuusai" %% "shapeless" % "2.3.2" % "test"
-  )
-}
-
-object Build
-extends MultiBuild("splain")
-{
-  override def defaultBuilder =
-    super.defaultBuilder(_)
-      .settingsV(
-        scalaVersion := "2.12.5",
-        crossScalaVersions ++= List("2.10.6", "2.11.11", "2.11.12", "2.12.1", "2.12.2", "2.12.3", "2.12.4"),
-        crossVersion := CrossVersion.full,
-        TrypBuildKeys.libs := SplainLibs
-      )
-
-  val versionRex = raw"(\d+)\.(\d+).(\d+).*".r
-
-  def addSourceDir(f: PartialFunction[(Int, Int, Int), String]) =
-    (unmanagedSourceDirectories in Compile) ++= {
-      val add = for {
-        a <- scalaVersion.value match {
-          case versionRex(ma, mi, pa) => Some(ma.toInt, mi.toInt, pa.toInt)
-          case _ => None
-        }
-        (ma, mi, pa) = a
-        b <- f.lift(ma, mi, pa)
-      } yield List(baseDirectory.value / s"src-$b")
-      add.getOrElse(Nil)
-    }
-
-  lazy val splain = "splain"
-    .bintray
-    .settings(publishSettings)
-    .settings(releaseSettings)
-    .settingsV(
-      organization := "io.tryp",
-      name := "splain",
-      addSourceDir { case (2, minor, _) if minor >= 11 => "2.11+" },
-      addSourceDir { case (2, 12, patch) if patch >= 4 => "2.12.4+" case _ => "2.12.3-" },
-      fork := true,
-      javaOptions in Test ++= {
-        val jar = (Keys.`package` in Compile).value.getAbsolutePath
-        val tests = baseDirectory.value / "tests"
-        List(s"-Dsplain.jar=$jar", s"-Dsplain.tests=$tests")
+  object autoImport
+  {
+    val versionRex = raw"(\d+)\.(\d+).(\d+).*".r
+
+    def addSourceDir(f: PartialFunction[(Int, Int, Int), String]) =
+      (unmanagedSourceDirectories in Compile) ++= {
+        val add = for {
+          a <- scalaVersion.value match {
+            case versionRex(ma, mi, pa) => Some(ma.toInt, mi.toInt, pa.toInt)
+            case _ => None
+          }
+          (ma, mi, pa) = a
+          b <- f.lift(ma, mi, pa)
+        } yield List(sourceDirectory.value / "main" / s"scala-$b")
+        add.getOrElse(Nil)
       }
-  )
-
-  val github = "https://github.com/tek"
-  val repo = s"$github/splain"
-
-  def publishSettings = List(
-    publishMavenStyle := true,
-    publishTo := Some(
-      if (isSnapshot.value) Opts.resolver.sonatypeSnapshots
-      else Resolver.url("sonatype staging", url("https://oss.sonatype.org/service/local/staging/deploy/maven2"))
-    ),
-    licenses := List("MIT" -> url("http://opensource.org/licenses/MIT")),
-    homepage := Some(url(repo)),
-    scmInfo := Some(ScmInfo(url(repo), "scm:git@github.com:tek/splain")),
-    developers := List(Developer(id="tryp", name="Torsten Schmits", email="torstenschmits@gmail.com", url=url(github)))
-  )
 
-  def releaseSettings = List(
-    releaseProcess := Seq[ReleaseStep](
-      checkSnapshotDependencies,
-      inquireVersions,
-      runClean,
-      setReleaseVersion,
-      ReleaseStep(action = Command.process("publishSigned", _), enableCrossBuild = true),
-      commitReleaseVersion,
-      tagRelease,
-      setNextVersion,
-      commitNextVersion,
-      ReleaseStep(action = Command.process("sonatypeReleaseAll", _), enableCrossBuild = true)
-    )
-  )
+    val github = "https://github.com/tek"
+    val repo = s"$github/splain"
+  }
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,3 @@
-addSbtPlugin("net.virtual-void" % "sbt-optimizer" % "0.1.2")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.8")
diff --git a/project/project/project/build.scala b/project/project/project/build.scala
diff --git a/project/project/tryp.sbt b/project/project/tryp.sbt
diff --git a/project/project/trypVersion.sbt b/project/project/trypVersion.sbt
diff --git a/project/tryp.sbt b/project/tryp.sbt
diff --git a/project/trypVersion.sbt b/project/trypVersion.sbt
diff --git a/splain/version.sbt b/splain/version.sbt
diff --git a/splain/resources/scalac-plugin.xml → src/main/resources/scalac-plugin.xml b/splain/resources/scalac-plugin.xml → src/main/resources/scalac-plugin.xml
diff --git a/splain/src-2.10/compat.scala → src/main/scala-2.10/splain/compat.scala b/splain/src-2.10/compat.scala → src/main/scala-2.10/splain/compat.scala
diff --git a/splain/src-2.11+/compat.scala → src/main/scala-2.11+/splain/compat.scala b/splain/src-2.11+/compat.scala → src/main/scala-2.11+/splain/compat.scala
diff --git a/splain/src-2.12.3-/implicits_compat.scala → ...ala-2.12.3-/splain/implicits_compat.scala b/splain/src-2.12.3-/implicits_compat.scala → ...ala-2.12.3-/splain/implicits_compat.scala
diff --git a/splain/src-2.12.4+/implicits_compat.scala → ...ala-2.12.4+/splain/implicits_compat.scala b/splain/src-2.12.4+/implicits_compat.scala → ...ala-2.12.4+/splain/implicits_compat.scala
diff --git a/splain/src/format/color.scala → src/main/scala/splain/format/color.scala b/splain/src/format/color.scala → src/main/scala/splain/format/color.scala
diff --git a/splain/src/format/data.scala → src/main/scala/splain/format/data.scala b/splain/src/format/data.scala → src/main/scala/splain/format/data.scala
diff --git a/splain/src/format/main.scala → src/main/scala/splain/format/main.scala b/splain/src/format/main.scala → src/main/scala/splain/format/main.scala
diff --git a/splain/src/implicits.scala → src/main/scala/splain/implicits.scala b/splain/src/implicits.scala → src/main/scala/splain/implicits.scala
diff --git a/splain/src/plugin.scala → src/main/scala/splain/plugin.scala b/splain/src/plugin.scala → src/main/scala/splain/plugin.scala
diff --git a/splain/src/util.scala → src/main/scala/splain/util.scala b/splain/src/util.scala → src/main/scala/splain/util.scala
diff --git a/splain/test-src/errors.scala → src/test/scala/splain/test-src/errors.scala b/splain/test-src/errors.scala → src/test/scala/splain/test-src/errors.scala
diff --git a/splain/tests/ambiguous/code.scala → tests/ambiguous/code.scala b/splain/tests/ambiguous/code.scala → tests/ambiguous/code.scala
diff --git a/splain/tests/ambiguous/error → tests/ambiguous/error b/splain/tests/ambiguous/error → tests/ambiguous/error
diff --git a/splain/tests/aux/code.scala → tests/aux/code.scala b/splain/tests/aux/code.scala → tests/aux/code.scala
diff --git a/splain/tests/aux/error → tests/aux/error b/splain/tests/aux/error → tests/aux/error
diff --git a/splain/tests/bounds/code.scala → tests/bounds/code.scala b/splain/tests/bounds/code.scala → tests/bounds/code.scala
diff --git a/splain/tests/bounds/error → tests/bounds/error b/splain/tests/bounds/error → tests/bounds/error
diff --git a/splain/tests/break/code.scala → tests/break/code.scala b/splain/tests/break/code.scala → tests/break/code.scala
diff --git a/splain/tests/break/error → tests/break/error b/splain/tests/break/error → tests/break/error
diff --git a/splain/tests/chain/code.scala → tests/chain/code.scala b/splain/tests/chain/code.scala → tests/chain/code.scala
diff --git a/splain/tests/chain/error → tests/chain/error b/splain/tests/chain/error → tests/chain/error
diff --git a/splain/tests/deephole/code.scala → tests/deephole/code.scala b/splain/tests/deephole/code.scala → tests/deephole/code.scala
diff --git a/splain/tests/deephole/error → tests/deephole/error b/splain/tests/deephole/error → tests/deephole/error
diff --git a/splain/tests/diverging/code.scala → tests/diverging/code.scala b/splain/tests/diverging/code.scala → tests/diverging/code.scala
diff --git a/splain/tests/diverging/error → tests/diverging/error b/splain/tests/diverging/error → tests/diverging/error
diff --git a/splain/tests/foundreq/code.scala → tests/foundreq/code.scala b/splain/tests/foundreq/code.scala → tests/foundreq/code.scala
diff --git a/splain/tests/foundreq/error → tests/foundreq/error b/splain/tests/foundreq/error → tests/foundreq/error
diff --git a/splain/tests/lazy/code.scala → tests/lazy/code.scala b/splain/tests/lazy/code.scala → tests/lazy/code.scala
diff --git a/splain/tests/lazy/error → tests/lazy/error b/splain/tests/lazy/error → tests/lazy/error
diff --git a/splain/tests/member/code.scala → tests/member/code.scala b/splain/tests/member/code.scala → tests/member/code.scala
diff --git a/splain/tests/member/error → tests/member/error b/splain/tests/member/error → tests/member/error
diff --git a/splain/tests/record/code.scala → tests/record/code.scala b/splain/tests/record/code.scala → tests/record/code.scala
diff --git a/splain/tests/record/error → tests/record/error b/splain/tests/record/error → tests/record/error
diff --git a/splain/tests/refinediff/code.scala → tests/refinediff/code.scala b/splain/tests/refinediff/code.scala → tests/refinediff/code.scala
diff --git a/splain/tests/refinediff/error → tests/refinediff/error b/splain/tests/refinediff/error → tests/refinediff/error
diff --git a/splain/tests/tree/code.scala → tests/tree/code.scala b/splain/tests/tree/code.scala → tests/tree/code.scala
diff --git a/splain/tests/tree/error → tests/tree/error b/splain/tests/tree/error → tests/tree/error
diff --git a/splain/tests/tree/errorCompact → tests/tree/errorCompact b/splain/tests/tree/errorCompact → tests/tree/errorCompact
diff --git a/version.sbt b/version.sbt
@@ -0,0 +1 @@
+version in ThisBuild := "0.3.0-SNAPSHOT"