Scala Common Enrich: upgrade to Java 8 (closes #3212)

snowplow · May 22, 2017 · f7331db · f7331db
1 parent 09704d3
commit f7331db
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: scala
 scala:
   - 2.10.6
 jdk:
-  - oraclejdk7
+  - oraclejdk8
 before_script:
   - psql -U postgres -c "CREATE USER enricher WITH password 'supersecret1';"
   - psql -U postgres -c "CREATE DATABASE sql_enrichment_test WITH OWNER = enricher;"

diff --git a/3-enrich/scala-common-enrich/project/BuildSettings.scala b/3-enrich/scala-common-enrich/project/BuildSettings.scala
@@ -25,6 +25,7 @@ object BuildSettings {
     crossScalaVersions    :=  Seq("2.10.6", "2.11.11"),
     scalacOptions         :=  compilerOptions,
     scalacOptions in Test :=  Seq("-Yrangepos"),
+    javacOptions          :=  javaCompilerOptions,
     resolvers             ++= Dependencies.resolutionRepos
   )
 
@@ -40,8 +41,12 @@ object BuildSettings {
     "-Ywarn-dead-code",
     "-Ywarn-numeric-widen",
     "-Xfuture",
-    "-Xlint",
-    "-target:jvm-1.7"
+    "-Xlint"
+  )
+
+  lazy val javaCompilerOptions = Seq(
+    "-source", "1.8",
+    "-target", "1.8"
   )
 
   // Makes our SBT app settings available from within the ETL

diff --git a/...a/com.snowplowanalytics.snowplow.enrich/common/enrichments/registry/sqlquery/Output.scala b/...a/com.snowplowanalytics.snowplow.enrich/common/enrichments/registry/sqlquery/Output.scala
@@ -31,7 +31,6 @@ import org.json4s.jackson.JsonMethods.parseOpt
 // Joda
 import org.joda.time.DateTime
 
-
 /**
  * Container class for output preferences.
  * Describes how to transform data fetched from DB into derived contexts

diff --git a/vagrant/up.playbooks b/vagrant/up.playbooks
@@ -1,5 +1,5 @@
 oss-playbooks/ruby-rvm.yml
-oss-playbooks/java7.yml
+oss-playbooks/java8.yml
 oss-playbooks/gradle.yml
 oss-playbooks/thrift.yml
 oss-playbooks/scala.yml
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,6 @@ import org.json4s.jackson.JsonMethods.parseOpt @@
     // Joda
     import org.joda.time.DateTime
     /**
      * Container class for output preferences.
      * Describes how to transform data fetched from DB into derived contexts
@@ Expand Down @@