From c3e90352a3f7bb41b9cbed399eef9c4e136446a2 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 10 Sep 2012 02:05:04 +0200 Subject: [PATCH 1/2] #2472 - making the akka-sbt-plugin publish via Ivy, and removed redundant OSGi settings from AkkaBuild --- project/AkkaBuild.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index db819d68d8..185bbbebf2 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -77,8 +77,6 @@ object AkkaBuild extends Build { base = file("akka-actor"), settings = defaultSettings ++ OSGi.actor ++ Seq( autoCompilerPlugins := true, - packagedArtifact in (Compile, packageBin) <<= (artifact in (Compile, packageBin), OsgiKeys.bundle).identityMap, - artifact in (Compile, packageBin) ~= (_.copy(`type` = "bundle")), // to fix scaladoc generation fullClasspath in doc in Compile <<= fullClasspath in Compile, libraryDependencies ++= Dependencies.actor, @@ -275,6 +273,7 @@ object AkkaBuild extends Build { base = file("akka-sbt-plugin"), settings = defaultSettings ++ Seq( sbtPlugin := true, + publishMavenStyle := false, // SBT Plugins should be published as Ivy scalacOptions in Compile := Seq("-encoding", "UTF-8", "-deprecation", "-unchecked"), scalaVersion := "2.9.1", scalaBinaryVersion <<= scalaVersion From 3e6097e89ac5f0420b22a025f28ceff07fbb76bf Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Tue, 11 Sep 2012 21:23:31 +0200 Subject: [PATCH 2/2] Also changing the publishTo target for the plugin as per Josh Suereth's suggestion --- project/AkkaBuild.scala | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 185bbbebf2..673e36b3f4 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -274,6 +274,12 @@ object AkkaBuild extends Build { settings = defaultSettings ++ Seq( sbtPlugin := true, publishMavenStyle := false, // SBT Plugins should be published as Ivy + publishTo <<= (version) { version: String => + val scalasbt = "http://scalasbt.artifactoryonline.com/scalasbt/" + val (name, u) = if (version.contains("-SNAPSHOT")) ("sbt-plugin-snapshots", scalasbt+"sbt-plugin-snapshots") + else ("sbt-plugin-releases", scalasbt+"sbt-plugin-releases") + Some(Resolver.url(name, url(u))(Resolver.ivyStylePatterns)) + }, scalacOptions in Compile := Seq("-encoding", "UTF-8", "-deprecation", "-unchecked"), scalaVersion := "2.9.1", scalaBinaryVersion <<= scalaVersion