From 5ceb247c0aafa0ddb6498fae7d4eb360932bc637 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Tue, 9 Sep 2014 10:44:32 -0400
Subject: [PATCH 1/2] Remove automated conscript generation and only generate
 on release.

Fixes #1558.

Note: This may mean conscript is updated less frequently, but
is better than the alternative.
---
 project/Sbt.scala | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/project/Sbt.scala b/project/Sbt.scala
index 5b2453dfb..79a54af84 100644
--- a/project/Sbt.scala
+++ b/project/Sbt.scala
@@ -65,10 +65,11 @@ object Sbt extends Build {
     commands += Command.command("release-sbt") { state =>
       // TODO - Any sort of validation
       "checkCredentials" ::
-        "publishSigned" ::
-        "publishLauncher" ::
-        "release-libs-211" ::
-        state
+      "conscript-configs" ::
+      "publishSigned" ::
+      "publishLauncher" ::
+      "release-libs-211" ::
+      state
     }
   )
 
@@ -315,7 +316,7 @@ object Sbt extends Build {
     autoScalaLibrary := false,
     description := "sbt application launcher",
     publishLauncher <<= Release.deployLauncher,
-    packageBin in Compile <<= (proguard in Proguard, Transform.conscriptConfigs).map((x, y) => x)
+    packageBin in Compile <<= proguard in Proguard
   )
 
   def interfaceSettings = javaOnly ++ Seq(

From d9ebceebdd09482debfcced0fea6f83b4a822467 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Tue, 9 Sep 2014 10:46:28 -0400
Subject: [PATCH 2/2] Scalariform refactoring.

---
 project/Sbt.scala | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/Sbt.scala b/project/Sbt.scala
index 79a54af84..ac80f2a83 100644
--- a/project/Sbt.scala
+++ b/project/Sbt.scala
@@ -65,11 +65,11 @@ object Sbt extends Build {
     commands += Command.command("release-sbt") { state =>
       // TODO - Any sort of validation
       "checkCredentials" ::
-      "conscript-configs" ::
-      "publishSigned" ::
-      "publishLauncher" ::
-      "release-libs-211" ::
-      state
+        "conscript-configs" ::
+        "publishSigned" ::
+        "publishLauncher" ::
+        "release-libs-211" ::
+        state
     }
   )