Permalink
Browse files

Updated our build to use Zinc artifacts

Updated our build to use the Zinc artifacts built and published by dbuild.  The
main advantage is that we no longer need to build and publish the Sbt artifacts
(which are exactly the same used by Zinc) that are used in the Scala IDE for
incremental compilation.
  • Loading branch information...
1 parent e8dd14f commit 6d40a3cd657cb4c5c895fd00946175198f6fcb9b @dotta dotta committed Aug 9, 2013
Showing with 28 additions and 174 deletions.
  1. +3 −16 org.scala-ide.sbt.full.library/.classpath
  2. +11 −78 org.scala-ide.sbt.full.library/pom.xml
  3. +14 −80 pom.xml
@@ -1,20 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="lib/api_2.10.3-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/classfile_2.10.3-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/classpath_2.10.3-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/compile_2.10.3-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/compiler-integration_2.10.3-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/compiler-interface_2.10.3-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/control_2.10.3-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/incremental-compiler_2.10.3-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/interface_2.10.3-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/io_2.10.3-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jline.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/logging_2.10.3-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/persist_2.10.3-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/process_2.10.3-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/relation_2.10.3-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/sbinary_2.10.3-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/compiler-interface-precompiled.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/incremental-compiler.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/sbt-interface.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
@@ -11,7 +11,7 @@
<artifactId>org.scala-ide.sbt.full.library</artifactId>
<packaging>bundle</packaging>
- <!-- extra repository containing the sbt packages -->
+ <!-- extra repository containing the sbt packages -->
<repositories>
<repository>
<id>typesafe-ide</id>
@@ -43,85 +43,19 @@
<dependencies>
<dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>classpath_${sbt.compiled.version}</artifactId>
- <optional>true</optional>
+ <groupId>com.typesafe.sbt</groupId>
+ <artifactId>sbt-interface</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>logging_${sbt.compiled.version}</artifactId>
- <optional>true</optional>
+ <groupId>com.typesafe.sbt</groupId>
+ <artifactId>compiler-interface-precompiled</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>
- <dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>compiler-interface_${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>
+ <groupId>com.typesafe.sbt</groupId>
+ <artifactId>incremental-compiler</artifactId>
+ <optional>true</optional>
</dependency>
</dependencies>
@@ -158,10 +92,9 @@
<instructions>
<Bundle-SymbolicName>org.scala-ide.sbt.full.library</Bundle-SymbolicName>
<Bundle-Name>Sbt ${sbt.version} Library for Eclipse</Bundle-Name>
- <!-- put a '-' after the sbt.version since it already has a '-scalaide-01' qualifier. Remove it the qualifier is gone. -->
<Bundle-Version>${sbt.version}-${version.suffix}-${maven.build.timestamp}</Bundle-Version>
<Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
- <_exportcontents>sbt.*;version=${sbt.version},xsbt.*;version=${sbt.version},xsbti.*;version=${sbt.version},sbinary.*;version=${sbinary.version},jline.*;version=2.10,org.apache.ivy.*;version=2.2.0</_exportcontents>
+ <_exportcontents>sbt.*;version=${sbt.version},xsbt.*;version=${sbt.version},xsbti.*;version=${sbt.version},sbinary.*;version=${sbt.version},jline.*;version=${sbt.version},org.apache.ivy.*;version=2.2.0</_exportcontents>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripVersion>true</Embed-StripVersion>
<Import-Package>!org.apache.ivy.*,!org.bouncycastle.*,!org.scalatools.testing.*,!com.craft.*,!com.jcraft.*,!sun.misc,!org.apache.commons.vfs,!org.apache.commons.vfs.impl,!org.apache.oro.text,!org.apache.oro.text
View
@@ -24,9 +24,6 @@
<repo.scala-ide.root>http://download.scala-ide.org</repo.scala-ide.root>
<!-- fixed versions -->
- <sbt.version>Select a profile</sbt.version>
- <sbinary.version>0.4.2-SNAPSHOT</sbinary.version>
- <jline.version>2.10</jline.version>
<ivy.version>2.2.0</ivy.version>
<miglayout.version>3.7.4</miglayout.version>
<log4j.version>1.2.17</log4j.version>
@@ -60,9 +57,10 @@
<scala.version>2.10.0</scala.version>
<scala.era.major.version>2.10</scala.era.major.version>
<scala.library.version>${scala.version}</scala.library.version>
- <sbt.compiled.version>${scala.version}</sbt.compiled.version>
<version.suffix>2_10</version.suffix>
<version.tag>local</version.tag>
+ <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>
@@ -79,7 +77,7 @@
<scala.version>2.10.3-SNAPSHOT</scala.version>
<scala.era.major.version>2.10</scala.era.major.version>
<version.suffix>2_10</version.suffix>
- <sbt.version>0.13.0-RC5-SNAPSHOT</sbt.version>
+ <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>
@@ -93,7 +91,8 @@
<scala.version>2.11.0-SNAPSHOT</scala.version>
<scala.era.major.version>2.11</scala.era.major.version>
<version.suffix>2_11</version.suffix>
- <sbt.version>0.13.1-SNAPSHOT</sbt.version>
+ <!-- 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>
@@ -273,84 +272,19 @@
</dependency>
<!-- toolchain, sbt -->
<dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>classpath_${sbt.compiled.version}</artifactId>
- <version>${sbt.version}</version>
+ <groupId>com.typesafe.sbt</groupId>
+ <artifactId>sbt-interface</artifactId>
+ <version>${sbt.ide.version}</version>
</dependency>
<dependency>
- <groupId>org.scala-sbt</groupId>
- <artifactId>logging_${sbt.compiled.version}</artifactId>
- <version>${sbt.version}</version>
+ <groupId>com.typesafe.sbt</groupId>
+ <artifactId>compiler-interface-precompiled</artifactId>
+ <version>${sbt.ide.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>
+ <groupId>com.typesafe.sbt</groupId>
+ <artifactId>incremental-compiler</artifactId>
+ <version>${sbt.ide.version}</version>
</dependency>
<!-- sdt.core dependencies -->
<dependency>

0 comments on commit 6d40a3c

Please sign in to comment.