Skip to content

Commit ad2368f

Browse files
author
Jason White
authored
Merge pull request #11 from JasonMWhite/set_sbt_version
compile using sbt 0.13.11, scala 2.11
2 parents 179dc13 + 20c7fa7 commit ad2368f

File tree

3 files changed

+23
-6
lines changed

3 files changed

+23
-6
lines changed

circle.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
machine:
2+
environment:
3+
SBT_VERSION: 0.13.11
4+
SBT_OPTS: "-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled
5+
-XX:MaxPermSize=256M"
6+
dependencies:
7+
cache_directories:
8+
- "~/.sbt"
9+
pre:
10+
- wget --output-document=$HOME/bin/sbt-launch.jar
11+
https://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/"$SBT_VERSION"/sbt-launch.jar
12+
- echo "java $SBT_OPTS -jar \`dirname \$0\`/sbt-launch.jar \"\$@\""
13+
> $HOME/bin/sbt
14+
- chmod u+x $HOME/bin/sbt
15+
- which sbt
16+
- sbt sbt-version

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
<properties>
1212
<java.version>1.7</java.version>
13-
<scala.version>2.10.4</scala.version>
14-
<scala.version.prefix>2.10</scala.version.prefix>
15-
<spark.version>1.5.0</spark.version>
13+
<scala.version>2.11.8</scala.version>
14+
<scala.version.prefix>2.11</scala.version.prefix>
15+
<spark.version>1.6.1</spark.version>
1616
<maven.release.plugin.version>2.4.1</maven.release.plugin.version>
1717
</properties>
1818

@@ -49,8 +49,8 @@
4949
</dependency>
5050
<dependency>
5151
<groupId>org.apache.spark</groupId>
52-
<artifactId>spark-streaming_2.10</artifactId>
53-
<version>1.5.1</version>
52+
<artifactId>spark-streaming_${scala.version.prefix}</artifactId>
53+
<version>${spark.version}</version>
5454
</dependency>
5555
</dependencies>
5656

@@ -102,7 +102,7 @@
102102
<plugin>
103103
<groupId>net.alchim31.maven</groupId>
104104
<artifactId>scala-maven-plugin</artifactId>
105-
<version>3.1.5</version>
105+
<version>3.2.2</version>
106106
<executions>
107107
<execution>
108108
<id>scala-compile-first</id>

project/build.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sbt.version = 0.13.11

0 commit comments

Comments
 (0)