Skip to content

Commit

Permalink
Use Tycho 0.16 and updated scala versions in POM
Browse files Browse the repository at this point in the history 
* Updated the README build example to use the ``scala-ide-stable``
  profile. Why? Because this is going to make it easier for people to
  start hacking as it is the stable update-site. As a consequence,
  ``eclipse-indigo`` is now used (that the Eclipse version that is
  currently  supported by the 3.0.0 IDE release).

* Removed scala-2.9.x profile because Play 2.1 only supports Scala 2.10
  • Loading branch information
@dotta
dotta committed Mar 27, 2013
1 parent 8f1e3f7 commit 87f4784
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 76 deletions.
16 changes: 7 additions & 9 deletions README.md
View file
@@ -1,6 +1,6 @@
# Scala IDE plugin for Play 2.x
# Scala IDE plugin for Play 2.1

This is an extension to Scala IDE to support Play 2.x routes and template files.
This is an extension to Scala IDE to support Play 2.1 routes and template files.

For user documentation, check the [wiki](https://github.com/scala-ide/scala-ide-play2/wiki).

Expand All @@ -18,19 +18,17 @@ The projects can be imported inside Scala IDE. And they are fully configured to

## Building

The maven build is configured using a combination of 3 profiles:
The maven build is configured using a combination of 2 profiles:

* An Eclipse platform profile:
* `eclipse-indigo`
* `eclipse-juno`
* A Scala version profile:
* `scala-2.9.x`
* `scala-2.10.x`

* A Scala IDE version profile:
* `scala-ide-nightly`
* `scala-ide-stable`
* `scala-ide-dev`
* `scala-ide-stable` (not available yet)
* `scala-ide-nightly`

After choosing the flavor you wish to build, maven is run using:

mvn -Peclipse-juno -Pscala-2.10.x -Pscala-ide-dev clean package
mvn -Peclipse-indigo -Pscala-ide-stable clean package
91 changes: 24 additions & 67 deletions pom.xml
View file
Expand Up @@ -29,7 +29,7 @@
<repo.scala-ide.root>http://download.scala-ide.org</repo.scala-ide.root>

<!-- fixed versions -->
<tycho.version>0.15.0</tycho.version>
<tycho.version>0.16.0</tycho.version>
<scala.plugin.version>3.1.0</scala.plugin.version>
<junit.version>4.10</junit.version>

Expand All @@ -45,24 +45,25 @@
<repo.eclipse>Select an Eclipse profile !</repo.eclipse>
<repo.ajdt>Select an Eclipse profile !</repo.ajdt>
<weaving.hook.plugin.version>Select an Eclipse profile !</weaving.hook.plugin.version>
<ecosystem-eclipse-version>Select an Eclipse profile !</ecosystem-eclipse-version>

<!-- linked to Scala version -->
<scala.version>Select a Scala profile !</scala.version>
<version.suffix>Select a Scala profile !</version.suffix>
<scala.version.short>Select a Scala profile !</scala.version.short>
<!-- play version depend on Scala version. 2.9.x -> 2.0.x, 2.10.x -> 2.1.x !-->
<play.artifactId>Select a Scala profile !</play.artifactId>
<play.version>Select a Scala profile !</play.version>
<templates.artifactId>Select a Scala profile !</templates.artifactId>
<templates.version>Select a Scala profile !</templates.version>
<scala.io.core.artifactId>Select a Scala profile !</scala.io.core.artifactId>
<scala.io.core.version>Select a Scala profile !</scala.io.core.version>
<scala.io.file.artifactId>Select a Scala profile !</scala.io.file.artifactId>
<scala.io.file.version>Select a Scala profile !</scala.io.file.version>
<scala.arm.groupId>Select a Scala profile !</scala.arm.groupId>
<scala.arm.artifactId>Select a Scala profile !</scala.arm.artifactId>
<scala.arm.version>Select a Scala profile !</scala.arm.version>
<scala.version>2.10.1</scala.version>
<version.suffix>2_10</version.suffix>
<scala.version.short>2.10</scala.version.short>
<ecosystem-scala-version>210</ecosystem-scala-version>

<!-- play version depend on Scala version. 2.9.x -> 2.0.x, 2.10.x -> 2.1.x !-->
<play.artifactId>play_2.10</play.artifactId>
<play.version>2.1.0</play.version>
<templates.artifactId>templates_2.10</templates.artifactId>
<templates.version>2.1.0</templates.version>
<scala.io.core.artifactId>scala-io-core_2.10</scala.io.core.artifactId>
<scala.io.core.version>0.4.2</scala.io.core.version>
<scala.io.file.artifactId>scala-io-file_2.10</scala.io.file.artifactId>
<scala.io.file.version>0.4.2</scala.io.file.version>
<scala.arm.groupId>com.jsuereth</scala.arm.groupId>
<scala.arm.artifactId>scala-arm_2.10</scala.arm.artifactId>
<scala.arm.version>1.3</scala.arm.version>

<!-- linked to Scala IDE version -->
<repo.scala-ide>Select a Scala IDE profile !</repo.scala-ide>
Expand Down Expand Up @@ -96,50 +97,6 @@
</properties>
</profile>

<profile>
<id>scala-2.9.x</id>
<properties>
<scala.version>2.9.3-RC2</scala.version>
<version.suffix>2_09</version.suffix>
<scala.version.short>2.9</scala.version.short>
<ecosystem-scala-version>29</ecosystem-scala-version>

<play.artifactId>play_2.9.2</play.artifactId>
<play.version>2.1-09142012</play.version>
<templates.artifactId>templates_2.9.2</templates.artifactId>
<templates.version>2.1-09142012</templates.version>
<scala.io.core.artifactId>scala-io-core_2.9.2</scala.io.core.artifactId>
<scala.io.core.version>0.4.1</scala.io.core.version>
<scala.io.file.artifactId>scala-io-file_2.9.2</scala.io.file.artifactId>
<scala.io.file.version>0.4.1</scala.io.file.version>
<scala.arm.groupId>com.github.jsuereth.scala-arm</scala.arm.groupId>
<scala.arm.artifactId>scala-arm_2.9.1</scala.arm.artifactId>
<scala.arm.version>1.1</scala.arm.version>
</properties>
</profile>

<profile>
<id>scala-2.10.x</id>
<properties>
<scala.version>2.10.1-RC2</scala.version>
<version.suffix>2_10</version.suffix>
<scala.version.short>2.10</scala.version.short>
<ecosystem-scala-version>210</ecosystem-scala-version>

<play.artifactId>play_2.10</play.artifactId>
<play.version>2.1.0</play.version>
<templates.artifactId>templates_2.10</templates.artifactId>
<templates.version>2.1.0</templates.version>
<scala.io.core.artifactId>scala-io-core_2.10</scala.io.core.artifactId>
<scala.io.core.version>0.4.2</scala.io.core.version>
<scala.io.file.artifactId>scala-io-file_2.10</scala.io.file.artifactId>
<scala.io.file.version>0.4.2</scala.io.file.version>
<scala.arm.groupId>com.jsuereth</scala.arm.groupId>
<scala.arm.artifactId>scala-arm_2.10</scala.arm.artifactId>
<scala.arm.version>1.3</scala.arm.version>
</properties>
</profile>

<profile>
<id>scala-ide-nightly</id>
<properties>
Expand All @@ -155,7 +112,7 @@
</profile>

<profile>
<id>scala-ide-stable (not available yet)</id>
<id>scala-ide-stable</id>
<properties>
<repo.scala-ide>${repo.scala-ide.root}/sdk/${ecosystem-eclipse-version}/scala${ecosystem-scala-version}/stable/site</repo.scala-ide>
</properties>
Expand Down Expand Up @@ -215,7 +172,7 @@
</execution>
</executions>
<configuration>
<alias>typesafe</alias>
<alias>typesafe</alias>
</configuration>
</plugin>
</plugins>
Expand All @@ -224,9 +181,9 @@
</profiles>

<!-- scm configuration is require to extract the github hash-->
<scm>
<connection>scm:git://github.com/skyluc/plugin.git</connection>
<url>https://github.com/skyluc/plugin</url>
<scm>
<connection>scm:git://github.com/skyluc/plugin.git</connection>
<url>https://github.com/skyluc/plugin</url>
</scm>

<dependencyManagement>
Expand Down Expand Up @@ -318,7 +275,7 @@
<configuration>
<useUIHarness>false</useUIHarness>
<useUIThread>false</useUIThread>

<!-- Enable JDT weaving -->
<systemProperties combine.children="append">
<aj.weaving.verbose>true</aj.weaving.verbose>
Expand Down

0 comments on commit 87f4784

Please sign in to comment.