Skip to content

Commit

Permalink
Drop use of xsbt-filter
Browse files Browse the repository at this point in the history
  • Loading branch information
christophercurrie committed Jan 17, 2015
1 parent 2a989a7 commit 13b1a4b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 29 deletions.
10 changes: 8 additions & 2 deletions build.sbt
Expand Up @@ -33,8 +33,14 @@ libraryDependencies ++= Seq(
"junit" % "junit" % "4.11" % "test"
)

// resource filtering
seq(filterSettings: _*)
// build.properties
resourceGenerators in Compile <+=
(resourceManaged in Compile, version, organization, name) map { (dir, v, o, n) =>
val file = dir / "com" / "fasterxml" / "jackson" / "module" / "scala" / "build.properties"
val contents = "version=%s\ngroupId=%s\nartifactId=%s\n".format(v, o, n)
IO.write(file, contents)
Seq(file)
}

// site
site.settings
Expand Down
5 changes: 1 addition & 4 deletions project/plugins.sbt
@@ -1,11 +1,8 @@
// For filtering resources
addSbtPlugin("com.github.sdb" % "xsbt-filter" % "0.4")

// For OSGI bundles
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")

// For making releases
addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.4")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5")

// For signing releases
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.2")
Expand Down
24 changes: 4 additions & 20 deletions release.sbt
Expand Up @@ -6,13 +6,14 @@ import com.typesafe.sbt.osgi.OsgiKeys
import com.typesafe.sbt.pgp.PgpKeys._

// OSGI bundles

osgiSettings

OsgiKeys.exportPackage := Seq(
"com.fasterxml.jackson.module.scala.*"
)

OsgiKeys.privatePackage := Nil

// publishing
publishMavenStyle := true

Expand Down Expand Up @@ -73,24 +74,7 @@ nextVersion := { ver => sbtrelease.Version(ver).map(_.bumpBugfix.asSnapshot.stri
// use maven style tag name
tagName <<= (name, version in ThisBuild) map { (n,v) => n + "-" + v }

// Customized release process
// sign artifacts

ReleaseKeys.releaseProcess := Seq[sbtrelease.ReleaseStep](
checkSnapshotDependencies,
inquireVersions,
runTest,
setReleaseVersion,
commitReleaseVersion,
tagRelease,
publishArtifacts.copy(action = publishSignedAction),
Build.generateAndPushDocs,
setNextVersion,
commitNextVersion,
pushChanges
)
publishArtifactsAction := PgpKeys.publishSigned.value

lazy val publishSignedAction = { st: State =>
val extracted = st.extract
val ref = extracted.get(thisProjectRef)
extracted.runAggregated(publishSigned in Global in ref, st)
}

This file was deleted.

0 comments on commit 13b1a4b

Please sign in to comment.