Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content
This repository was archived by the owner on Apr 18, 2019. It is now read-only.

Commit 0b827c9

Browse files
committed
Upgrade Scala and module versions.
Upgrade Scala to 2.11.0 final and update modules to 1.0.1 version which the latest at the time when this commit is made. Update the README.md file, project files for sbt and Maven. Fixes #1
1 parent 6d8fb71 commit 0b827c9

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

README.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ This sample demonstrates how to conditionally depend on all modules. If use only
1313
```scala
1414
// add scala-xml dependency when needed (for Scala 2.11 and newer) in a robust way
1515
// this mechanism supports cross-version publishing
16+
// taken from: http://github.com/scala/scala-module-dependency-sample
1617
libraryDependencies := {
1718
CrossVersion.partialVersion(scalaVersion.value) match {
1819
// if scala 2.11+ is used, add dependency on scala-xml module
1920
case Some((2, scalaMajor)) if scalaMajor >= 11 =>
2021
libraryDependencies.value ++ Seq(
21-
"org.scala-lang.modules" %% "scala-xml" % "1.0.0",
22-
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.0",
23-
"org.scala-lang.modules" %% "scala-swing" % "1.0.0")
22+
"org.scala-lang.modules" %% "scala-xml" % "1.0.1",
23+
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.1",
24+
"org.scala-lang.modules" %% "scala-swing" % "1.0.1")
2425
case _ =>
2526
// or just libraryDependencies.value if you don't depend on scala-swing
2627
libraryDependencies.value :+ "org.scala-lang" % "scala-swing" % scalaVersion.value
@@ -30,23 +31,24 @@ libraryDependencies := {
3031

3132
## Maven sample
3233

33-
This to depend on scala-xml module with assumption that you have `scalaBinaryVersion` property defined in your pom.xml file. The `scalaBinaryVersion` should be set to `2.11.0-RC1` for Scala 2.11.0-RC1 but should be truncated to `2.11` once Scala 2.11.0 final is out. If you are just looking for copy&paste snippet for your `pom.xml` file, here it is:
34+
This to depend on scala-xml module with assumption that you have `scalaBinaryVersion` property defined in your pom.xml file. The `scalaBinaryVersion` should be set to `2.11` for Scala 2.11.0. If you are just looking for copy&paste snippet for your `pom.xml` file, here it is:
3435

3536
```xml
37+
<!-- taken from: http://github.com/scala/scala-module-dependency-sample -->
3638
<dependency>
3739
<groupId>org.scala-lang.modules</groupId>
3840
<artifactId>scala-xml_${scalaBinaryVersion}</artifactId>
39-
<version>1.0.0</version>
41+
<version>1.0.1</version>
4042
</dependency>
4143
<dependency>
4244
<groupId>org.scala-lang.modules</groupId>
4345
<artifactId>scala-parser-combinators_${scalaBinaryVersion}</artifactId>
44-
<version>1.0.0</version>
46+
<version>1.0.1</version>
4547
</dependency>
4648
<dependency>
4749
<groupId>org.scala-lang.modules</groupId>
4850
<artifactId>scala-swing_${scalaBinaryVersion}</artifactId>
49-
<version>1.0.0</version>
51+
<version>1.0.1</version>
5052
</dependency>
5153
```
5254

maven-sample/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<activeByDefault>true</activeByDefault>
1414
</activation>
1515
<properties>
16-
<scalaVersion>2.11.0-RC1</scalaVersion>
16+
<scalaVersion>2.11.0</scalaVersion>
1717
<!-- change to "2.11" once Scala 2.11.0 final is out -->
18-
<scalaBinaryVersion>2.11.0-RC1</scalaBinaryVersion>
18+
<scalaBinaryVersion>2.11</scalaBinaryVersion>
1919
</properties>
2020
<dependencies>
2121
<dependency>
@@ -26,17 +26,17 @@
2626
<dependency>
2727
<groupId>org.scala-lang.modules</groupId>
2828
<artifactId>scala-xml_${scalaBinaryVersion}</artifactId>
29-
<version>1.0.0</version>
29+
<version>1.0.1</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>org.scala-lang.modules</groupId>
3333
<artifactId>scala-parser-combinators_${scalaBinaryVersion}</artifactId>
34-
<version>1.0.0</version>
34+
<version>1.0.1</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>org.scala-lang.modules</groupId>
3838
<artifactId>scala-swing_${scalaBinaryVersion}</artifactId>
39-
<version>1.0.0</version>
39+
<version>1.0.1</version>
4040
</dependency>
4141
</dependencies>
4242
</profile>

sbt-sample/build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ organization := "sample"
44

55
version := "1.0"
66

7-
crossScalaVersions := Seq("2.11.0-RC1", "2.10.3")
7+
crossScalaVersions := Seq("2.11.0", "2.10.3")
88

9-
scalaVersion := "2.11.0-RC1"
9+
scalaVersion := "2.11.0"
1010

1111
// add scala-xml dependency when needed (for Scala 2.11 and newer) in a robust way
1212
// this mechanism supports cross-version publishing
@@ -15,9 +15,9 @@ libraryDependencies := {
1515
// if scala 2.11+ is used, add dependency on scala-xml module
1616
case Some((2, scalaMajor)) if scalaMajor >= 11 =>
1717
libraryDependencies.value ++ Seq(
18-
"org.scala-lang.modules" %% "scala-xml" % "1.0.0",
19-
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.0",
20-
"org.scala-lang.modules" %% "scala-swing" % "1.0.0")
18+
"org.scala-lang.modules" %% "scala-xml" % "1.0.1",
19+
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.1",
20+
"org.scala-lang.modules" %% "scala-swing" % "1.0.1")
2121
case _ =>
2222
// or just libraryDependencies.value if you don't depend on scala-swing
2323
libraryDependencies.value :+ "org.scala-lang" % "scala-swing" % scalaVersion.value

0 commit comments

Comments
 (0)