From d697c10950af977cf20ff8772972ed86130286be Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 24 Mar 2014 18:59:14 -0400
Subject: [PATCH] Hide unary_! operator from API

---
 main/src/main/scala/sbt/Plugins.scala         |  2 +-
 .../project/auto-plugins-conflict/build.sbt   |  4 --
 .../auto-plugins-conflict/project/Q.scala     | 35 -----------
 .../project/auto-plugins-conflict/test        |  1 -
 .../project/auto-plugins-conflict2/build.sbt  |  7 ---
 .../auto-plugins-conflict2/project/Q.scala    | 58 -------------------
 .../project/auto-plugins-conflict2/test       |  1 -
 .../project/auto-plugins/project/Q.scala      |  2 +-
 8 files changed, 2 insertions(+), 108 deletions(-)
 delete mode 100644 sbt/src/sbt-test/project/auto-plugins-conflict/build.sbt
 delete mode 100644 sbt/src/sbt-test/project/auto-plugins-conflict/project/Q.scala
 delete mode 100644 sbt/src/sbt-test/project/auto-plugins-conflict/test
 delete mode 100644 sbt/src/sbt-test/project/auto-plugins-conflict2/build.sbt
 delete mode 100644 sbt/src/sbt-test/project/auto-plugins-conflict2/project/Q.scala
 delete mode 100644 sbt/src/sbt-test/project/auto-plugins-conflict2/test

diff --git a/main/src/main/scala/sbt/Plugins.scala b/main/src/main/scala/sbt/Plugins.scala
index cb7bcac6e..925fb6916 100644
--- a/main/src/main/scala/sbt/Plugins.scala
+++ b/main/src/main/scala/sbt/Plugins.scala
@@ -82,7 +82,7 @@ abstract class AutoPlugin extends Plugins.Basic with PluginsFunctions
 
 	// TODO?: def commands: Seq[Command]
 
-	def unary_! : Exclude = Exclude(this)
+	private[sbt] def unary_! : Exclude = Exclude(this)
 
 
 	/** If this plugin does not have any requirements, it means it is actually a root plugin. */
diff --git a/sbt/src/sbt-test/project/auto-plugins-conflict/build.sbt b/sbt/src/sbt-test/project/auto-plugins-conflict/build.sbt
deleted file mode 100644
index aede25923..000000000
--- a/sbt/src/sbt-test/project/auto-plugins-conflict/build.sbt
+++ /dev/null
@@ -1,4 +0,0 @@
-// with S selected, Q is loaded automatically, which in turn selects R
-lazy val projA = project.addPlugins(S)
-
-check := ()
diff --git a/sbt/src/sbt-test/project/auto-plugins-conflict/project/Q.scala b/sbt/src/sbt-test/project/auto-plugins-conflict/project/Q.scala
deleted file mode 100644
index 405900f11..000000000
--- a/sbt/src/sbt-test/project/auto-plugins-conflict/project/Q.scala
+++ /dev/null
@@ -1,35 +0,0 @@
-	import sbt._
-
-object AI extends AutoImport
-{
-	trait EmptyAutoPlugin extends AutoPlugin {
-		def requires = empty
-		def trigger = noTrigger
-	}
-	object A extends EmptyAutoPlugin
-	object B extends EmptyAutoPlugin
-
-	lazy val check = settingKey[Unit]("Verifies settings are as they should be.")
-}
-
-	import AI._
-
-object Q extends AutoPlugin
-{
-	def requires: Plugins = A && B
-	def trigger = allRequirements
-}
-
-object R extends AutoPlugin
-{
-	def requires = Q
-	def trigger = allRequirements
-}
-
-// This is an opt-in plugin with a requirement
-// Unless explicitly loaded by the build user, this will not be activated.
-object S extends AutoPlugin
-{
-	def requires = Q && !R
-	def trigger = noTrigger
-}
diff --git a/sbt/src/sbt-test/project/auto-plugins-conflict/test b/sbt/src/sbt-test/project/auto-plugins-conflict/test
deleted file mode 100644
index 3c2c89325..000000000
--- a/sbt/src/sbt-test/project/auto-plugins-conflict/test
+++ /dev/null
@@ -1 +0,0 @@
--> check
diff --git a/sbt/src/sbt-test/project/auto-plugins-conflict2/build.sbt b/sbt/src/sbt-test/project/auto-plugins-conflict2/build.sbt
deleted file mode 100644
index 36b8bc100..000000000
--- a/sbt/src/sbt-test/project/auto-plugins-conflict2/build.sbt
+++ /dev/null
@@ -1,7 +0,0 @@
-// with S selected, Q is loaded automatically, which in turn selects R
-lazy val projA = project.addPlugins(S)
-
-// S and T have direct conflicts of dependent plugins.
-lazy val projB = project.addPlugins(S, T)
-
-check := ()
diff --git a/sbt/src/sbt-test/project/auto-plugins-conflict2/project/Q.scala b/sbt/src/sbt-test/project/auto-plugins-conflict2/project/Q.scala
deleted file mode 100644
index 91f29c00d..000000000
--- a/sbt/src/sbt-test/project/auto-plugins-conflict2/project/Q.scala
+++ /dev/null
@@ -1,58 +0,0 @@
-	import sbt._
-
-object AI extends AutoImport
-{
-	trait EmptyAutoPlugin extends AutoPlugin {
-		def requires = empty
-		def trigger = noTrigger
-	}
-	object A extends EmptyAutoPlugin {
-	  val a = settingKey[String]("")
-	  override def projectSettings = Seq(a := "a")
-	}
-	object B extends EmptyAutoPlugin {
-	  val b = settingKey[String]("")
-	  override def projectSettings = Seq(b := "b")
-	}
-
-	lazy val check = settingKey[Unit]("Verifies settings are as they should be.")
-}
-
-	import AI._
-
-object Q extends AutoPlugin
-{
-	def requires: Plugins = A && B
-	def trigger = allRequirements
-	val q = settingKey[String]("")
-	override def projectSettings = Seq(q := "q")
-}
-
-object R extends AutoPlugin
-{
-	def requires = Q
-	def trigger = allRequirements
-	val r = settingKey[String]("")
-	override def projectSettings = Seq(r := "r")
-}
-
-// This is an opt-in plugin with a requirement
-// Unless explicitly loaded by the build user, this will not be activated.
-object S extends AutoPlugin
-{
-	def requires = Q && !R
-	def trigger = noTrigger
-	val s = settingKey[String]("")
-	override def projectSettings = Seq(s := "s")
-}
-
-// This is an opt-in plugin with a requirement
-// Unless explicitly loaded by the build user, this will not be activated.
-object T extends AutoPlugin
-{
-	def requires = A && !Q
-	def trigger = noTrigger
-
-	val t = settingKey[String]("")
-	override def projectSettings = Seq(t := "T")
-}
diff --git a/sbt/src/sbt-test/project/auto-plugins-conflict2/test b/sbt/src/sbt-test/project/auto-plugins-conflict2/test
deleted file mode 100644
index 3c2c89325..000000000
--- a/sbt/src/sbt-test/project/auto-plugins-conflict2/test
+++ /dev/null
@@ -1 +0,0 @@
--> check
diff --git a/sbt/src/sbt-test/project/auto-plugins/project/Q.scala b/sbt/src/sbt-test/project/auto-plugins/project/Q.scala
index 84cef307f..74d8b5f6d 100644
--- a/sbt/src/sbt-test/project/auto-plugins/project/Q.scala
+++ b/sbt/src/sbt-test/project/auto-plugins/project/Q.scala
@@ -59,7 +59,7 @@ object Q extends AutoPlugin
 object R extends AutoPlugin
 {
 	// NOTE - Only plugins themselves support exclusions...
-	def requires = Q && !D
+	def requires = Q
 	def trigger = allRequirements
 
 	override def projectSettings = Seq(