Permalink
Browse files

Reviewer comments:

- added Scala compiler sources
- added xml and combinator versions only in the 2.11 profile
- removed useless dependency on HasLogger
- removed exported dependencies from sdt.core project files
- removed superfluous version numbers in dependencies
- fixed runtime library for build-tools to always be 2.10
  • Loading branch information...
dragos committed Oct 16, 2013
1 parent 85809fc commit f938a3ee21b7db2b0627448f7b7ba1cfeb46c7cb
@@ -51,7 +51,7 @@
<enabled>false</enabled>
</snapshots>
</repository>
- <repository>
+ <repository>
<id>scala-refactoring</id>
<name>Scala Refactoring p2 repository</name>
<layout>p2</layout>
@@ -76,22 +76,18 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-actors</artifactId>
- <version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
- <version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
- <version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.scala-ide</groupId>
@@ -3,7 +3,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"/>
- <classpathentry exported="true" kind="lib" path="target/lib/miglayout-3.7.4.jar"/>
- <classpathentry exported="true" kind="lib" path="target/lib/log4j-1.2.17.jar"/>
+ <classpathentry kind="lib" path="target/lib/miglayout-3.7.4.jar"/>
+ <classpathentry kind="lib" path="target/lib/log4j-1.2.17.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -162,10 +162,10 @@
</artifactItem>
<artifactItem>
<groupId>org.scala-lang</groupId>
- <artifactId>scala-swing</artifactId>
+ <artifactId>scala-compiler</artifactId>
<classifier>sources</classifier>
<type>jar</type>
- <destFileName>scala-swing-src.jar</destFileName>
+ <destFileName>scala-compiler-src.jar</destFileName>
<outputDirectory>${project.build.directory}/src</outputDirectory>
</artifactItem>
</artifactItems>
@@ -8,14 +8,12 @@ package scala.tools.eclipse.util
import java.io.IOException
import java.net.URL
-import scala.tools.eclipse.logging.HasLogger
-
import org.eclipse.core.runtime.FileLocator
import org.eclipse.core.runtime.IPath
import org.eclipse.core.runtime.Path
import org.osgi.framework.Bundle
-object OSGiUtils extends HasLogger {
+object OSGiUtils {
private def urlToPath(url: URL): IPath = Path.fromOSString(FileLocator.toFileURL(url).getPath)
def pathInBundle(bundle: Bundle, path: String): Option[IPath] = {
View
36 pom.xml
@@ -61,9 +61,6 @@
<!-- default values, can be overwritten by profiles -->
<scala.version>2.10.0</scala.version>
- <scala.binary.version>2.10</scala.binary.version>
- <scala.xml.version>1.0.0-RC5</scala.xml.version>
- <scala.parser-combinators.version>1.0.0-RC3</scala.parser-combinators.version>
<scala.library.version>${scala.version}</scala.library.version>
<version.suffix>2_10</version.suffix>
<version.tag>local</version.tag>
@@ -102,12 +99,29 @@
<properties>
<scala.version>2.11.0-SNAPSHOT</scala.version>
<scala.binary.version>2.11.0-M5</scala.binary.version>
+ <scala.xml.version>1.0.0-RC5</scala.xml.version>
+ <scala.parser-combinators.version>1.0.0-RC3</scala.parser-combinators.version>
<version.suffix>2_11</version.suffix>
<repo.scala-refactoring>${repo.scala-ide.root}/scala-refactoring-211x</repo.scala-refactoring>
<repo.scalariform>${repo.scala-ide.root}/scalariform-211x</repo.scalariform>
<repo.typesafe>http://private-repo.typesafe.com/typesafe/ide-2.11</repo.typesafe>
</properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-xml_${scala.binary.version}</artifactId>
+ <version>${scala.xml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-parser-combinators_${scala.binary.version}</artifactId>
+ <version>${scala.parser-combinators.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</profile>
<profile>
@@ -175,6 +189,12 @@
<artifactId>build-tools_2.10</artifactId>
<version>0.4.0</version>
</dependency>
+ <!-- We need the 2.10 Scala library, instead of whatever cross-version we happen to build -->
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.10.0</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -273,16 +293,6 @@
<artifactId>scala-library</artifactId>
<version>${scala.library.version}</version>
</dependency>
- <dependency>
- <groupId>org.scala-lang.modules</groupId>
- <artifactId>scala-xml_${scala.binary.version}</artifactId>
- <version>${scala.xml.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-lang.modules</groupId>
- <artifactId>scala-parser-combinators_${scala.binary.version}</artifactId>
- <version>${scala.parser-combinators.version}</version>
- </dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-swing</artifactId>

0 comments on commit f938a3e

Please sign in to comment.