Skip to content

Commit

Permalink
Merge pull request #11 from JasonMWhite/set_sbt_version
Browse files Browse the repository at this point in the history
compile using sbt 0.13.11, scala 2.11
  • Loading branch information
JasonMWhite authored Jun 10, 2016
2 parents 179dc13 + 20c7fa7 commit ad2368f
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 6 deletions.
16 changes: 16 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
machine:
environment:
SBT_VERSION: 0.13.11
SBT_OPTS: "-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled
-XX:MaxPermSize=256M"
dependencies:
cache_directories:
- "~/.sbt"
pre:
- wget --output-document=$HOME/bin/sbt-launch.jar
https://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/"$SBT_VERSION"/sbt-launch.jar
- echo "java $SBT_OPTS -jar \`dirname \$0\`/sbt-launch.jar \"\$@\""
> $HOME/bin/sbt
- chmod u+x $HOME/bin/sbt
- which sbt
- sbt sbt-version
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

<properties>
<java.version>1.7</java.version>
<scala.version>2.10.4</scala.version>
<scala.version.prefix>2.10</scala.version.prefix>
<spark.version>1.5.0</spark.version>
<scala.version>2.11.8</scala.version>
<scala.version.prefix>2.11</scala.version.prefix>
<spark.version>1.6.1</spark.version>
<maven.release.plugin.version>2.4.1</maven.release.plugin.version>
</properties>

Expand Down Expand Up @@ -49,8 +49,8 @@
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-streaming_2.10</artifactId>
<version>1.5.1</version>
<artifactId>spark-streaming_${scala.version.prefix}</artifactId>
<version>${spark.version}</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -102,7 +102,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.1.5</version>
<version>3.2.2</version>
<executions>
<execution>
<id>scala-compile-first</id>
Expand Down
1 change: 1 addition & 0 deletions project/build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sbt.version = 0.13.11

0 comments on commit ad2368f

Please sign in to comment.