Skip to content

Commit

Permalink
Revert "Two new profiles for supporting legacy and new sbt dependencies"
Browse files Browse the repository at this point in the history 
This reverts commit 633e0fe.
  • Loading branch information
@dotta
dotta committed Sep 23, 2013
1 parent 6e125b6 commit 5aca7c3
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 409 deletions.
2 changes: 1 addition & 1 deletion build-all.sh
View file
Expand Up @@ -10,7 +10,7 @@ ROOT_DIR=${PWD}

if [ -z "$*" ]
then
ARGS="-Pscala-2.10.x -Peclipse-juno -Psbt-new clean install"
ARGS="-Pscala-2.10.x -Peclipse-juno clean install"
else
ARGS="$*"
fi
Expand Down
36 changes: 9 additions & 27 deletions org.scala-ide.sbt.compiler.interface.source/pom.xml
View file
Expand Up @@ -11,33 +11,15 @@
<artifactId>org.scala-ide.sbt.compiler.interface.source</artifactId>
<packaging>bundle</packaging>

<profiles>
<profile>
<id>sbt-new</id>
<dependencies>
<dependency>
<groupId>com.typesafe.sbt</groupId>
<artifactId>compiler-interface-precompiled</artifactId>
<version>${sbt.ide.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
</dependencies>
</profile>

<profile>
<id>sbt-legacy</id>
<dependencies>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>compiler-interface_${sbt.compiled.version}</artifactId>
<version>${sbt.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
</dependencies>
</profile>
</profiles>
<dependencies>
<dependency>
<groupId>com.typesafe.sbt</groupId>
<artifactId>compiler-interface-precompiled</artifactId>
<version>${sbt.ide.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
</dependencies>

<build>
<plugins>
Expand Down
30 changes: 7 additions & 23 deletions org.scala-ide.sbt.compiler.interface/pom.xml
View file
Expand Up @@ -11,29 +11,13 @@
<artifactId>org.scala-ide.sbt.compiler.interface</artifactId>
<packaging>bundle</packaging>

<profiles>
<profile>
<id>sbt-new</id>
<dependencies>
<dependency>
<groupId>com.typesafe.sbt</groupId>
<artifactId>compiler-interface-precompiled</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</profile>

<profile>
<id>sbt-legacy</id>
<dependencies>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>compiler-interface_${sbt.compiled.version}</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</profile>
</profiles>
<dependencies>
<dependency>
<groupId>com.typesafe.sbt</groupId>
<artifactId>compiler-interface-precompiled</artifactId>
<optional>true</optional>
</dependency>
</dependencies>

<build>
<plugins>
Expand Down
150 changes: 16 additions & 134 deletions org.scala-ide.sbt.full.library.source/pom.xml
View file
Expand Up @@ -11,140 +11,22 @@
<artifactId>org.scala-ide.sbt.full.library.source</artifactId>
<packaging>bundle</packaging>

<profiles>
<profile>
<id>sbt-new</id>
<dependencies>
<dependency>
<groupId>com.typesafe.sbt</groupId>
<artifactId>sbt-interface</artifactId>
<version>${sbt.ide.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.typesafe.sbt</groupId>
<artifactId>incremental-compiler</artifactId>
<version>${sbt.ide.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
</dependencies>
</profile>

<profile>
<id>sbt-legacy</id>
<dependencies>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>classpath_${sbt.compiled.version}</artifactId>
<version>${sbt.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>logging_${sbt.compiled.version}</artifactId>
<version>${sbt.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>io_${sbt.compiled.version}</artifactId>
<version>${sbt.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>control_${sbt.compiled.version}</artifactId>
<version>${sbt.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>classfile_${sbt.compiled.version}</artifactId>
<version>${sbt.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>process_${sbt.compiled.version}</artifactId>
<version>${sbt.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>relation_${sbt.compiled.version}</artifactId>
<version>${sbt.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>interface_${sbt.compiled.version}</artifactId>
<version>${sbt.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>persist_${sbt.compiled.version}</artifactId>
<version>${sbt.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>api_${sbt.compiled.version}</artifactId>
<version>${sbt.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>compiler-integration_${sbt.compiled.version}</artifactId>
<version>${sbt.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>incremental-compiler_${sbt.compiled.version}</artifactId>
<version>${sbt.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>compile_${sbt.compiled.version}</artifactId>
<version>${sbt.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<!-- all the dependencies necessary for running like sbinary, jline -->
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<version>${jline.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<!-- No published sources for sbinary, yet -->
<!-- <dependency>
<groupId>org.scala-tools.sbinary</groupId>
<artifactId>sbinary_${sbt.compiled.version}</artifactId>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
-->
</dependencies>
</profile>
</profiles>
<dependencies>
<dependency>
<groupId>com.typesafe.sbt</groupId>
<artifactId>sbt-interface</artifactId>
<version>${sbt.ide.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.typesafe.sbt</groupId>
<artifactId>incremental-compiler</artifactId>
<version>${sbt.ide.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
</dependencies>

<build>
<plugins>
Expand Down
111 changes: 13 additions & 98 deletions org.scala-ide.sbt.full.library/pom.xml
View file
Expand Up @@ -30,106 +30,21 @@
</dependency>
</dependencies>
</profile>

<profile>
<id>sbt-new</id>
<dependencies>
<dependency>
<groupId>com.typesafe.sbt</groupId>
<artifactId>sbt-interface</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.typesafe.sbt</groupId>
<artifactId>incremental-compiler</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</profile>

<profile>
<id>sbt-legacy</id>
<dependencies>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>classpath_${sbt.compiled.version}</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>logging_${sbt.compiled.version}</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>io_${sbt.compiled.version}</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>control_${sbt.compiled.version}</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>classfile_${sbt.compiled.version}</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>process_${sbt.compiled.version}</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>relation_${sbt.compiled.version}</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>interface_${sbt.compiled.version}</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>persist_${sbt.compiled.version}</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>api_${sbt.compiled.version}</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>compiler-integration_${sbt.compiled.version}</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>incremental-compiler_${sbt.compiled.version}</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>compile_${sbt.compiled.version}</artifactId>
<optional>true</optional>
</dependency>
<!-- all the dependencies necessary for running like sbinary, jline -->
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.scala-tools.sbinary</groupId>
<artifactId>sbinary_${sbt.compiled.version}</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</profile>
</profiles>

<dependencies>
<dependency>
<groupId>com.typesafe.sbt</groupId>
<artifactId>sbt-interface</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.typesafe.sbt</groupId>
<artifactId>incremental-compiler</artifactId>
<optional>true</optional>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down

0 comments on commit 5aca7c3

Please sign in to comment.