Removed unneeded dependencies from the MANIFEST

Improved the manifest and made getSbtInfo return a SbtInfo case class instead of a "dumb" Tuple3.
SandroGrzicic · Aug 9, 2012 · 7f69c95 · 7f69c95
1 parent 9b738ef
commit 7f69c95
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/org.scala-ide.sdt.sbtconsole/META-INF/MANIFEST.MF b/org.scala-ide.sdt.sbtconsole/META-INF/MANIFEST.MF
@@ -41,9 +41,6 @@ Require-Bundle:
  org.eclipse.pde.ui;resolution:=optional,
  org.scala-ide.scala.library,
  org.scala-ide.scala.compiler,
- org.scala-refactoring.library,
- org.scala-ide.sbt.full.library;bundle-version="[0.11.2,0.14)",
- scalariform,
  org.junit4;bundle-version="4.5.0",
  org.eclipse.ui.browser;bundle-version="3.3.0",
  org.scala-ide.sdt.core;bundle-version="[2.1.0, 2.2.0)"

diff --git a/org.scala-ide.sdt.sbtconsole/src/scala/tools/eclipse/sbtconsole/SbtUtils.scala b/org.scala-ide.sdt.sbtconsole/src/scala/tools/eclipse/sbtconsole/SbtUtils.scala
@@ -8,6 +8,8 @@ import org.eclipse.jdt.core.IClasspathEntry
 import java.io.File
 import java.io.FilenameFilter
 
+case class SbtInfo(path: String, version: String, scalaVersion: String)
+
 /** Useful SBT utility methods. */
 object SbtUtils {
 
@@ -25,12 +27,12 @@ object SbtUtils {
    * Uses empty strings in case of unknown information or exceptions.
    * Use the specific methods in order to get specific information.
    */
-  def getSbtInfo(): Tuple3[String, String, String] = {
+  def getSbtInfo(): SbtInfo = {
     val path = getSbtPath()
     val version = path map getSbtVersion getOrElse Left() fold(_ => "", identity)
     val scalaVersion = sbtToScalaVersion(version)
 
-    (path getOrElse "", version, scalaVersion)
+    SbtInfo(path getOrElse "", version, scalaVersion)
   }
 
   /** Fetch the SBT version from the manifest file of the specified sbt-launch.jar. */

diff --git a/...la-ide.sdt.sbtconsole/src/scala/tools/eclipse/sbtconsole/properties/PreferencesPage.scala b/...la-ide.sdt.sbtconsole/src/scala/tools/eclipse/sbtconsole/properties/PreferencesPage.scala
@@ -225,11 +225,11 @@ class PreferenceInitializer extends AbstractPreferenceInitializer {
   override def initializeDefaultPreferences() {
     val store = SbtConsolePlugin.plugin.getPreferenceStore
 
-    val (path, version, scalaVersion) = SbtUtils.getSbtInfo()
+    val sbtInfo = SbtUtils.getSbtInfo()
 
-    store.setDefault(P_SBT_PATH, path)
-    store.setDefault(P_SBT_VERSION, version)
-    store.setDefault(P_SBT_SCALA_VERSION, scalaVersion)
+    store.setDefault(P_SBT_PATH, sbtInfo.path)
+    store.setDefault(P_SBT_VERSION, sbtInfo.version)
+    store.setDefault(P_SBT_SCALA_VERSION, sbtInfo.scalaVersion)
     store.setDefault(P_SBT_JAVA_ARGS, "-Xmx1000M")
     store.setDefault(P_PROJECT_DIRECTORY, "")
   }