Skip to content
Browse files

Revert "Two new profiles for supporting legacy and new sbt dependencies"

This reverts commit 633e0fe.
  • Loading branch information...
1 parent 6e125b6 commit 5aca7c3bb47bfe8c22a352ae5337e2cb426035dc @dotta dotta committed
View
2 build-all.sh
@@ -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
View
36 org.scala-ide.sbt.compiler.interface.source/pom.xml
@@ -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>
View
30 org.scala-ide.sbt.compiler.interface/pom.xml
@@ -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>
View
150 org.scala-ide.sbt.full.library.source/pom.xml
@@ -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>
View
111 org.scala-ide.sbt.full.library/pom.xml
@@ -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>
View
147 pom.xml
@@ -67,7 +67,8 @@
<scala.library.version>${scala.version}</scala.library.version>
<version.suffix>2_10</version.suffix>
<version.tag>local</version.tag>
- <sbt.version>Select a profile!</sbt.version>
+ <sbt.version>0.13.0</sbt.version>
+ <sbt.ide.version>${sbt.version}-on-${scala.version}-for-IDE-SNAPSHOT</sbt.ide.version>
<!-- the repos containing the Scala dependencies -->
<repo.scala-refactoring>Select a profile</repo.scala-refactoring>
@@ -89,6 +90,7 @@
<properties>
<scala.version>2.10.3-SNAPSHOT</scala.version>
<version.suffix>2_10</version.suffix>
+ <sbt.version>0.13.0</sbt.version>
<repo.scala-refactoring>${repo.scala-ide.root}/scala-refactoring-210x</repo.scala-refactoring>
<repo.scalariform>${repo.scala-ide.root}/scalariform-210x</repo.scalariform>
@@ -102,6 +104,8 @@
<scala.version>2.11.0-SNAPSHOT</scala.version>
<scala.binary.version>2.11.0-M4</scala.binary.version>
<version.suffix>2_11</version.suffix>
+ <!-- version here should be 0.13.1, but Zinc artfacts for 0.13.1 haven't been published yet. -->
+ <sbt.version>0.13.0</sbt.version>
<repo.scala-refactoring>${repo.scala-ide.root}/scala-refactoring-211x</repo.scala-refactoring>
<repo.scalariform>${repo.scala-ide.root}/scalariform-211x</repo.scalariform>
@@ -135,129 +139,6 @@
</profile>
<profile>
- <id>sbt-new</id>
- <properties>
- <sbt.version>0.13.0</sbt.version>
- <sbt.ide.version>${sbt.version}-on-${scala.version}-for-IDE-SNAPSHOT</sbt.ide.version>
- </properties>
- <dependencyManagement>
- <dependencies>
- <!-- new sbt toolchain -->
- <dependency>
- <groupId>com.typesafe.sbt</groupId>
- <artifactId>sbt-interface</artifactId>
- <version>${sbt.ide.version}</version>
- </dependency>
- <dependency>
- <groupId>com.typesafe.sbt</groupId>
- <artifactId>compiler-interface-precompiled</artifactId>
- <version>${sbt.ide.version}</version>
- </dependency>
- <dependency>
- <groupId>com.typesafe.sbt</groupId>
- <artifactId>incremental-compiler</artifactId>
- <version>${sbt.ide.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
-
- <profile>
- <id>sbt-legacy</id>
- <properties>
- <sbinary.version>0.4.2-SNAPSHOT</sbinary.version>
- <sbt.version>0.13.0</sbt.version>
- <jline.version>2.10</jline.version>
- <sbt.compiled.version>${scala.version}</sbt.compiled.version>
- </properties>
- <dependencyManagement>
- <dependencies>
- <!-- old sbt toolchain -->
- <dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>classpath_${sbt.compiled.version}</artifactId>
- <version>${sbt.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>logging_${sbt.compiled.version}</artifactId>
- <version>${sbt.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>io_${sbt.compiled.version}</artifactId>
- <version>${sbt.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>control_${sbt.compiled.version}</artifactId>
- <version>${sbt.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>classfile_${sbt.compiled.version}</artifactId>
- <version>${sbt.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>process_${sbt.compiled.version}</artifactId>
- <version>${sbt.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>relation_${sbt.compiled.version}</artifactId>
- <version>${sbt.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>interface_${sbt.compiled.version}</artifactId>
- <version>${sbt.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>persist_${sbt.compiled.version}</artifactId>
- <version>${sbt.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>api_${sbt.compiled.version}</artifactId>
- <version>${sbt.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>compiler-integration_${sbt.compiled.version}</artifactId>
- <version>${sbt.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>incremental-compiler_${sbt.compiled.version}</artifactId>
- <version>${sbt.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>compile_${sbt.compiled.version}</artifactId>
- <version>${sbt.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>compiler-interface_${sbt.compiled.version}</artifactId>
- <version>${sbt.version}</version>
- </dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>${jline.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-tools.sbinary</groupId>
- <artifactId>sbinary_${sbt.compiled.version}</artifactId>
- <version>${sbinary.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
-
- <profile>
<!-- some extra configuration for running tests with tycho on Mac OS -->
<id>macOs</id>
<activation>
@@ -402,6 +283,22 @@
<artifactId>continuations</artifactId>
<version>${scala.version}</version>
</dependency>
+ <!-- toolchain, sbt -->
+ <dependency>
+ <groupId>com.typesafe.sbt</groupId>
+ <artifactId>sbt-interface</artifactId>
+ <version>${sbt.ide.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.typesafe.sbt</groupId>
+ <artifactId>compiler-interface-precompiled</artifactId>
+ <version>${sbt.ide.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.typesafe.sbt</groupId>
+ <artifactId>incremental-compiler</artifactId>
+ <version>${sbt.ide.version}</version>
+ </dependency>
<!-- sdt.core dependencies -->
<dependency>
<groupId>com.miglayout</groupId>
@@ -552,6 +449,4 @@
</plugins>
</pluginManagement>
</build>
-
-
</project>

0 comments on commit 5aca7c3

Please sign in to comment.
Something went wrong with that request. Please try again.