|
William Benton |
e3a44e3 |
diff --git a/project/build.properties b/project/build.properties
|
|
William Benton |
e3a44e3 |
index 66ad72c..18297d2 100644
|
|
William Benton |
e3a44e3 |
--- a/project/build.properties
|
|
William Benton |
e3a44e3 |
+++ b/project/build.properties
|
|
William Benton |
e3a44e3 |
@@ -1,1 +1,1 @@
|
|
William Benton |
e3a44e3 |
-sbt.version=0.12.2
|
|
William Benton |
e3a44e3 |
+sbt.version=0.13.1
|
|
William Benton |
e3a44e3 |
diff --git a/project/build.scala b/project/build.scala
|
|
William Benton |
e3a44e3 |
index 493f34a..df88528 100644
|
|
William Benton |
e3a44e3 |
--- a/project/build.scala
|
|
William Benton |
e3a44e3 |
+++ b/project/build.scala
|
|
William Benton |
e3a44e3 |
@@ -8,45 +8,14 @@ import java.awt.Desktop
|
|
William Benton |
e3a44e3 |
|
|
William Benton |
e3a44e3 |
import scala.collection.immutable.IndexedSeq
|
|
William Benton |
e3a44e3 |
|
|
William Benton |
e3a44e3 |
-import sbtrelease._
|
|
William Benton |
e3a44e3 |
-import sbtrelease.ReleasePlugin._
|
|
William Benton |
e3a44e3 |
-import sbtrelease.ReleasePlugin.ReleaseKeys._
|
|
William Benton |
e3a44e3 |
-import sbtrelease.ReleaseStateTransformations._
|
|
William Benton |
e3a44e3 |
-import sbtrelease.Utilities._
|
|
William Benton |
e3a44e3 |
-
|
|
William Benton |
e3a44e3 |
-import com.typesafe.sbt.pgp.PgpKeys._
|
|
William Benton |
e3a44e3 |
-
|
|
William Benton |
e3a44e3 |
-import com.typesafe.sbtosgi.OsgiPlugin._
|
|
William Benton |
e3a44e3 |
-
|
|
William Benton |
e3a44e3 |
-import sbtbuildinfo.Plugin._
|
|
William Benton |
e3a44e3 |
-
|
|
William Benton |
e3a44e3 |
-import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings
|
|
William Benton |
e3a44e3 |
-import com.typesafe.tools.mima.plugin.MimaKeys.previousArtifact
|
|
William Benton |
e3a44e3 |
-
|
|
William Benton |
e3a44e3 |
object build extends Build {
|
|
William Benton |
e3a44e3 |
type Sett = Project.Setting[_]
|
|
William Benton |
e3a44e3 |
|
|
William Benton |
e3a44e3 |
- lazy val publishSignedArtifacts = ReleaseStep(
|
|
William Benton |
e3a44e3 |
- action = st => {
|
|
William Benton |
e3a44e3 |
- val extracted = st.extract
|
|
William Benton |
e3a44e3 |
- val ref = extracted.get(thisProjectRef)
|
|
William Benton |
e3a44e3 |
- extracted.runAggregated(publishSigned in Global in ref, st)
|
|
William Benton |
e3a44e3 |
- },
|
|
William Benton |
e3a44e3 |
- check = st => {
|
|
William Benton |
e3a44e3 |
- // getPublishTo fails if no publish repository is set up.
|
|
William Benton |
e3a44e3 |
- val ex = st.extract
|
|
William Benton |
e3a44e3 |
- val ref = ex.get(thisProjectRef)
|
|
William Benton |
e3a44e3 |
- Classpaths.getPublishTo(ex.get(publishTo in Global in ref))
|
|
William Benton |
e3a44e3 |
- st
|
|
William Benton |
e3a44e3 |
- },
|
|
William Benton |
e3a44e3 |
- enableCrossBuild = true
|
|
William Benton |
e3a44e3 |
- )
|
|
William Benton |
e3a44e3 |
-
|
|
William Benton |
e3a44e3 |
- lazy val standardSettings: Seq[Sett] = Defaults.defaultSettings ++ sbtrelease.ReleasePlugin.releaseSettings ++ Seq[Sett](
|
|
William Benton |
e3a44e3 |
+ lazy val standardSettings: Seq[Sett] = Defaults.defaultSettings ++ Seq[Sett](
|
|
William Benton |
e3a44e3 |
organization := "org.scalaz",
|
|
William Benton |
e3a44e3 |
|
|
William Benton |
e3a44e3 |
- scalaVersion := "2.9.2",
|
|
William Benton |
e3a44e3 |
- crossScalaVersions := Seq("2.9.2", "2.9.3", "2.10.0"),
|
|
William Benton |
e3a44e3 |
+ scalaVersion := "2.10.3",
|
|
William Benton |
e3a44e3 |
+ crossScalaVersions := Seq(),
|
|
William Benton |
e3a44e3 |
resolvers += Resolver.sonatypeRepo("releases"),
|
|
William Benton |
e3a44e3 |
|
|
William Benton |
e3a44e3 |
scalacOptions <++= (scalaVersion) map { sv =>
|
|
William Benton |
e3a44e3 |
@@ -99,21 +68,6 @@ object build extends Build {
|
|
William Benton |
e3a44e3 |
publishSetting,
|
|
William Benton |
e3a44e3 |
publishArtifact in Test := false,
|
|
William Benton |
e3a44e3 |
|
|
William Benton |
e3a44e3 |
- // adapted from sbt-release defaults
|
|
William Benton |
e3a44e3 |
- // (performs `publish-signed` instead of `publish`)
|
|
William Benton |
e3a44e3 |
- releaseProcess := Seq[ReleaseStep](
|
|
William Benton |
e3a44e3 |
- checkSnapshotDependencies,
|
|
William Benton |
e3a44e3 |
- inquireVersions,
|
|
William Benton |
e3a44e3 |
- runTest,
|
|
William Benton |
e3a44e3 |
- setReleaseVersion,
|
|
William Benton |
e3a44e3 |
- commitReleaseVersion,
|
|
William Benton |
e3a44e3 |
- tagRelease,
|
|
William Benton |
e3a44e3 |
- publishSignedArtifacts,
|
|
William Benton |
e3a44e3 |
- setNextVersion,
|
|
William Benton |
e3a44e3 |
- commitNextVersion,
|
|
William Benton |
e3a44e3 |
- pushChanges
|
|
William Benton |
e3a44e3 |
- ),
|
|
William Benton |
e3a44e3 |
-
|
|
William Benton |
e3a44e3 |
pomIncludeRepository := {
|
|
William Benton |
e3a44e3 |
x => false
|
|
William Benton |
e3a44e3 |
},
|
|
William Benton |
e3a44e3 |
@@ -154,10 +108,6 @@ object build extends Build {
|
|
William Benton |
e3a44e3 |
}
|
|
William Benton |
e3a44e3 |
</developers>
|
|
William Benton |
e3a44e3 |
)
|
|
William Benton |
e3a44e3 |
- ) ++ osgiSettings ++ Seq[Sett](
|
|
William Benton |
e3a44e3 |
- OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-Package")
|
|
William Benton |
e3a44e3 |
- ) ++ mimaDefaultSettings ++ Seq[Sett](
|
|
William Benton |
e3a44e3 |
- previousArtifact <<= (organization, name, scalaBinaryVersion) { (o, n, sbv) => Some(o % (n + "_" + sbv) % "7.0.0-RC2") }
|
|
William Benton |
e3a44e3 |
)
|
|
William Benton |
e3a44e3 |
|
|
William Benton |
e3a44e3 |
lazy val scalaz = Project(
|
|
William Benton |
e3a44e3 |
@@ -166,7 +116,6 @@ object build extends Build {
|
|
William Benton |
e3a44e3 |
settings = standardSettings ++ Unidoc.settings ++ Seq[Sett](
|
|
William Benton |
e3a44e3 |
// <https://github.com/scalaz/scalaz/issues/261>
|
|
William Benton |
e3a44e3 |
Unidoc.unidocExclude += "typelevel",
|
|
William Benton |
e3a44e3 |
- previousArtifact := None,
|
|
William Benton |
e3a44e3 |
publishArtifact := false
|
|
William Benton |
e3a44e3 |
),
|
|
William Benton |
e3a44e3 |
aggregate = Seq(core, concurrent, effect, example, iterv, iteratee, scalacheckBinding, tests, typelevel, xml)
|
|
William Benton |
e3a44e3 |
@@ -175,17 +124,12 @@ object build extends Build {
|
|
William Benton |
e3a44e3 |
lazy val core = Project(
|
|
William Benton |
e3a44e3 |
id = "core",
|
|
William Benton |
e3a44e3 |
base = file("core"),
|
|
William Benton |
e3a44e3 |
- settings = standardSettings ++ buildInfoSettings ++ Seq[Sett](
|
|
William Benton |
e3a44e3 |
+ settings = standardSettings ++ Seq[Sett](
|
|
William Benton |
e3a44e3 |
name := "scalaz-core",
|
|
William Benton |
e3a44e3 |
typeClasses := TypeClass.core,
|
|
William Benton |
e3a44e3 |
sourceGenerators in Compile <+= (sourceManaged in Compile) map {
|
|
William Benton |
e3a44e3 |
dir => Seq(generateTupleW(dir))
|
|
William Benton |
e3a44e3 |
- },
|
|
William Benton |
e3a44e3 |
- sourceGenerators in Compile <+= buildInfo,
|
|
William Benton |
e3a44e3 |
- buildInfoKeys := Seq[BuildInfoKey](version, scalaVersion),
|
|
William Benton |
e3a44e3 |
- buildInfoPackage := "scalaz",
|
|
William Benton |
e3a44e3 |
- osgiExport("scalaz"),
|
|
William Benton |
e3a44e3 |
- OsgiKeys.importPackage := Seq("javax.swing;resolution:=optional", "*")
|
|
William Benton |
e3a44e3 |
+ }
|
|
William Benton |
e3a44e3 |
)
|
|
William Benton |
e3a44e3 |
)
|
|
William Benton |
e3a44e3 |
|
|
William Benton |
e3a44e3 |
@@ -194,9 +138,7 @@ object build extends Build {
|
|
William Benton |
e3a44e3 |
base = file("concurrent"),
|
|
William Benton |
e3a44e3 |
settings = standardSettings ++ Seq[Sett](
|
|
William Benton |
e3a44e3 |
name := "scalaz-concurrent",
|
|
William Benton |
e3a44e3 |
- typeClasses := TypeClass.concurrent,
|
|
William Benton |
e3a44e3 |
- osgiExport("scalaz.concurrent"),
|
|
William Benton |
e3a44e3 |
- OsgiKeys.importPackage := Seq("javax.swing;resolution:=optional", "*")
|
|
William Benton |
e3a44e3 |
+ typeClasses := TypeClass.concurrent
|
|
William Benton |
e3a44e3 |
),
|
|
William Benton |
e3a44e3 |
dependencies = Seq(core, effect)
|
|
William Benton |
e3a44e3 |
)
|
|
William Benton |
e3a44e3 |
@@ -206,8 +148,7 @@ object build extends Build {
|
|
William Benton |
e3a44e3 |
base = file("effect"),
|
|
William Benton |
e3a44e3 |
settings = standardSettings ++ Seq[Sett](
|
|
William Benton |
e3a44e3 |
name := "scalaz-effect",
|
|
William Benton |
e3a44e3 |
- typeClasses := TypeClass.effect,
|
|
William Benton |
e3a44e3 |
- osgiExport("scalaz.effect", "scalaz.std.effect", "scalaz.syntax.effect")
|
|
William Benton |
e3a44e3 |
+ typeClasses := TypeClass.effect
|
|
William Benton |
e3a44e3 |
),
|
|
William Benton |
e3a44e3 |
dependencies = Seq(core)
|
|
William Benton |
e3a44e3 |
)
|
|
William Benton |
e3a44e3 |
@@ -216,8 +157,7 @@ object build extends Build {
|
|
William Benton |
e3a44e3 |
id = "iteratee",
|
|
William Benton |
e3a44e3 |
base = file("iteratee"),
|
|
William Benton |
e3a44e3 |
settings = standardSettings ++ Seq[Sett](
|
|
William Benton |
e3a44e3 |
- name := "scalaz-iteratee",
|
|
William Benton |
e3a44e3 |
- osgiExport("scalaz.iteratee")
|
|
William Benton |
e3a44e3 |
+ name := "scalaz-iteratee"
|
|
William Benton |
e3a44e3 |
),
|
|
William Benton |
e3a44e3 |
dependencies = Seq(effect)
|
|
William Benton |
e3a44e3 |
)
|
|
William Benton |
e3a44e3 |
@@ -226,9 +166,7 @@ object build extends Build {
|
|
William Benton |
e3a44e3 |
id = "iterv",
|
|
William Benton |
e3a44e3 |
base = file("iterv"),
|
|
William Benton |
e3a44e3 |
settings = standardSettings ++ Seq[Sett](
|
|
William Benton |
e3a44e3 |
- name := "scalaz-iterv",
|
|
William Benton |
e3a44e3 |
- OsgiKeys.fragmentHost := Some("org.scalaz.core"),
|
|
William Benton |
e3a44e3 |
- OsgiKeys.exportPackage := Seq("scalaz;version=${Bundle-Version};-split-package:=first")
|
|
William Benton |
e3a44e3 |
+ name := "scalaz-iterv"
|
|
William Benton |
e3a44e3 |
),
|
|
William Benton |
e3a44e3 |
dependencies = Seq(effect)
|
|
William Benton |
e3a44e3 |
)
|
|
William Benton |
e3a44e3 |
@@ -237,8 +175,7 @@ object build extends Build {
|
|
William Benton |
e3a44e3 |
id = "typelevel",
|
|
William Benton |
e3a44e3 |
base = file("typelevel"),
|
|
William Benton |
e3a44e3 |
settings = standardSettings ++ Seq[Sett](
|
|
William Benton |
e3a44e3 |
- name := "scalaz-typelevel",
|
|
William Benton |
e3a44e3 |
- osgiExport("scalaz.typelevel", "scalaz.syntax.typelevel")
|
|
William Benton |
e3a44e3 |
+ name := "scalaz-typelevel"
|
|
William Benton |
e3a44e3 |
),
|
|
William Benton |
e3a44e3 |
dependencies = Seq(core)
|
|
William Benton |
e3a44e3 |
)
|
|
William Benton |
e3a44e3 |
@@ -248,8 +185,7 @@ object build extends Build {
|
|
William Benton |
e3a44e3 |
base = file("xml"),
|
|
William Benton |
e3a44e3 |
settings = standardSettings ++ Seq[Sett](
|
|
William Benton |
e3a44e3 |
name := "scalaz-xml",
|
|
William Benton |
e3a44e3 |
- typeClasses := TypeClass.xml,
|
|
William Benton |
e3a44e3 |
- osgiExport("scalaz.xml")
|
|
William Benton |
e3a44e3 |
+ typeClasses := TypeClass.xml
|
|
William Benton |
e3a44e3 |
),
|
|
William Benton |
e3a44e3 |
dependencies = Seq(core)
|
|
William Benton |
e3a44e3 |
)
|
|
William Benton |
e3a44e3 |
@@ -260,7 +196,6 @@ object build extends Build {
|
|
William Benton |
e3a44e3 |
dependencies = Seq(core, iteratee, concurrent, typelevel, xml),
|
|
William Benton |
e3a44e3 |
settings = standardSettings ++ Seq[Sett](
|
|
William Benton |
e3a44e3 |
name := "scalaz-example",
|
|
William Benton |
e3a44e3 |
- previousArtifact := None,
|
|
William Benton |
e3a44e3 |
publishArtifact := false
|
|
William Benton |
e3a44e3 |
)
|
|
William Benton |
e3a44e3 |
)
|
|
William Benton |
e3a44e3 |
@@ -271,8 +206,7 @@ object build extends Build {
|
|
William Benton |
e3a44e3 |
dependencies = Seq(core, concurrent, typelevel, xml),
|
|
William Benton |
e3a44e3 |
settings = standardSettings ++ Seq[Sett](
|
|
William Benton |
e3a44e3 |
name := "scalaz-scalacheck-binding",
|
|
William Benton |
e3a44e3 |
- libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.10.0",
|
|
William Benton |
e3a44e3 |
- osgiExport("scalaz.scalacheck")
|
|
William Benton |
e3a44e3 |
+ libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.10.0"
|
|
William Benton |
e3a44e3 |
)
|
|
William Benton |
e3a44e3 |
)
|
|
William Benton |
e3a44e3 |
|
|
William Benton |
e3a44e3 |
@@ -283,7 +217,6 @@ object build extends Build {
|
|
William Benton |
e3a44e3 |
settings = standardSettings ++Seq[Sett](
|
|
William Benton |
e3a44e3 |
name := "scalaz-tests",
|
|
William Benton |
e3a44e3 |
publishArtifact := false,
|
|
William Benton |
e3a44e3 |
- previousArtifact := None,
|
|
William Benton |
e3a44e3 |
libraryDependencies <++= (scalaVersion) { sv => Seq(
|
|
William Benton |
e3a44e3 |
"org.specs2" %% "specs2" % Dependencies.specs2(sv) % "test",
|
|
William Benton |
e3a44e3 |
"org.scalacheck" %% "scalacheck" % "1.10.0" % "test"
|
|
William Benton |
e3a44e3 |
@@ -392,7 +325,6 @@ object build extends Build {
|
|
William Benton |
e3a44e3 |
writeFileScalazPackage("TupleOps.scala", source)
|
|
William Benton |
e3a44e3 |
}
|
|
William Benton |
e3a44e3 |
|
|
William Benton |
e3a44e3 |
- def osgiExport(packs: String*) = OsgiKeys.exportPackage := packs.map(_ + ".*;version=${Bundle-Version}")
|
|
William Benton |
e3a44e3 |
}
|
|
William Benton |
e3a44e3 |
|
|
William Benton |
e3a44e3 |
// vim: expandtab:ts=2:sw=2
|
|
William Benton |
e3a44e3 |
diff --git a/project/plugins.sbt b/project/plugins.sbt
|
|
William Benton |
e3a44e3 |
index e83215b..8901d19 100644
|
|
William Benton |
e3a44e3 |
--- a/project/plugins.sbt
|
|
William Benton |
e3a44e3 |
+++ b/project/plugins.sbt
|
|
William Benton |
e3a44e3 |
@@ -1,11 +1,11 @@
|
|
William Benton |
e3a44e3 |
-resolvers += Resolver.url("scalasbt", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns)
|
|
William Benton |
e3a44e3 |
+// resolvers += Resolver.url("scalasbt", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns)
|
|
William Benton |
e3a44e3 |
|
|
William Benton |
e3a44e3 |
-addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8")
|
|
William Benton |
e3a44e3 |
+// addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8")
|
|
William Benton |
e3a44e3 |
|
|
William Benton |
e3a44e3 |
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.7")
|
|
William Benton |
e3a44e3 |
+// addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.7")
|
|
William Benton |
e3a44e3 |
|
|
William Benton |
e3a44e3 |
-addSbtPlugin("com.typesafe.sbtosgi" % "sbtosgi" % "0.3.0")
|
|
William Benton |
e3a44e3 |
+// addSbtPlugin("com.typesafe.sbtosgi" % "sbtosgi" % "0.3.0")
|
|
William Benton |
e3a44e3 |
|
|
William Benton |
e3a44e3 |
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.2.2")
|
|
William Benton |
e3a44e3 |
+// addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.2.2")
|
|
William Benton |
e3a44e3 |
|
|
William Benton |
e3a44e3 |
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.4")
|
|
William Benton |
e3a44e3 |
+// addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.4")
|