From 97ddc1ffb79540de8ecf4b3b761b18c442dd8abd Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Thu, 5 Oct 2017 10:08:13 +0100
Subject: [PATCH] Copy the non-runtime parts of project/unified to
 SlashSyntaxTest

---
 .../src/test/scala/sbt/SlashSyntaxTest.scala  | 41 +++++++++++++++++++
 sbt/src/main/scala/package.scala              | 10 -----
 sbt/src/sbt-test/project/unified/build.sbt    |  3 +-
 .../unified/project/Dependencies.scala        |  5 ---
 4 files changed, 43 insertions(+), 16 deletions(-)
 create mode 100644 main-settings/src/test/scala/sbt/SlashSyntaxTest.scala
 delete mode 100644 sbt/src/sbt-test/project/unified/project/Dependencies.scala

diff --git a/main-settings/src/test/scala/sbt/SlashSyntaxTest.scala b/main-settings/src/test/scala/sbt/SlashSyntaxTest.scala
new file mode 100644
index 000000000..f7a1ae065
--- /dev/null
+++ b/main-settings/src/test/scala/sbt/SlashSyntaxTest.scala
@@ -0,0 +1,41 @@
+/*
+ * sbt
+ * Copyright 2011 - 2017, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under BSD-3-Clause license (see LICENSE)
+ */
+
+package sbt.test
+
+import sbt.Def.{ Setting, settingKey, taskKey }
+import sbt.Scope.Global
+import sbt.librarymanagement.ModuleID
+import sbt.librarymanagement.syntax._
+import sbt.{ LocalProject, ProjectReference, ThisBuild, Zero }
+
+object SlashSyntaxTest extends sbt.SlashSyntax {
+  final case class Proj(id: String)
+  implicit def projToRef(p: Proj): ProjectReference = LocalProject(p.id)
+
+  val projA = Proj("a")
+
+  val cancelable = settingKey[Boolean]("")
+  val console = taskKey[Unit]("")
+  val libraryDependencies = settingKey[Seq[ModuleID]]("")
+  val name = settingKey[String]("")
+  val scalaVersion = settingKey[String]("")
+  val scalacOptions = taskKey[Seq[String]]("")
+
+  val uTest = "com.lihaoyi" %% "utest" % "0.5.3"
+
+  Seq[Setting[_]](
+    Global / cancelable := true,
+    ThisBuild / scalaVersion := "2.12.3",
+    console / scalacOptions += "-deprecation",
+    Compile / console / scalacOptions += "-Ywarn-numeric-widen",
+    projA / Compile / console / scalacOptions += "-feature",
+    Zero / Zero / name := "foo",
+    Zero / Zero / Zero / name := "foo",
+    libraryDependencies += uTest % Test,
+  )
+}
diff --git a/sbt/src/main/scala/package.scala b/sbt/src/main/scala/package.scala
index 671f23892..3e067e0de 100644
--- a/sbt/src/main/scala/package.scala
+++ b/sbt/src/main/scala/package.scala
@@ -43,16 +43,6 @@ package object sbt
   final val Global = Scope.Global
   final val GlobalScope = Scope.GlobalScope
 
-  // import sbt.{ Configurations => C }
-  // final val Compile = C.Compile
-  // final val Test = C.Test
-  // final val Runtime = C.Runtime
-  // final val IntegrationTest = C.IntegrationTest
-  // final val Default = C.Default
-  // final val Provided = C.Provided
-  // java.lang.System is more important, so don't alias this one
-  //  final val System = C.System
-  // final val Optional = C.Optional
   def config(name: String): Configuration =
     macro sbt.librarymanagement.ConfigurationMacro.configMacroImpl
 }
diff --git a/sbt/src/sbt-test/project/unified/build.sbt b/sbt/src/sbt-test/project/unified/build.sbt
index 7f9835fea..91f772197 100644
--- a/sbt/src/sbt-test/project/unified/build.sbt
+++ b/sbt/src/sbt-test/project/unified/build.sbt
@@ -1,7 +1,8 @@
-import Dependencies._
 import sbt.internal.CommandStrings.{ inspectBrief, inspectDetailed }
 import sbt.internal.Inspect
 
+val uTest = "com.lihaoyi" %% "utest" % "0.5.3"
+
 lazy val root = (project in file("."))
   .settings(
     Global / cancelable := true,
diff --git a/sbt/src/sbt-test/project/unified/project/Dependencies.scala b/sbt/src/sbt-test/project/unified/project/Dependencies.scala
deleted file mode 100644
index 0d84ec7d4..000000000
--- a/sbt/src/sbt-test/project/unified/project/Dependencies.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-import sbt._
-
-object Dependencies {
-  val uTest = "com.lihaoyi" %% "utest" % "0.5.3"
-}