Scala 2.12 support (closes #153)

Author: shuttie

.travis.yml

@@ -1,8 +1,7 @@
 language: scala
 before_script: "cd java-scala"
 scala:
-   - 2.9.1
+   - 2.12.4
 jdk:
-  - oraclejdk7
-  - openjdk6
-  - openjdk7
+  - oraclejdk8
+  - openjdk8

java-scala/.gitignore

@@ -10,3 +10,5 @@ lib_managed/
 src_managed/
 project/boot/
 project/plugins/project/
+project/project
+project/target

java-scala/build.sbt

@@ -0,0 +1,23 @@
+name          := "referer-parser"
+organization  := "com.snowplowanalytics"
+version       := "0.3.0"
+description   := "Library for extracting marketing attribution data from referer URLs"
+scalaVersion  := "2.12.4"
+crossScalaVersions := Seq("2.11.11", "2.12.4")
+scalacOptions := Seq("-deprecation", "-encoding", "utf8")
+
+libraryDependencies ++= Seq(
+  "org.yaml"                  %  "snakeyaml"      % "1.19",
+  "org.apache.httpcomponents" %  "httpclient"     % "4.5.3",
+  "org.specs2"                %% "specs2"         % specsVersion(scalaVersion.value) % "test",
+  "junit"                     %  "junit"          % "4.12"     % "test",
+  "org.json"                  %  "json"           % "20170516" % "test",
+  "org.json4s"                %% "json4s-jackson" % "3.5.3"    % "test",
+  "org.json4s"                %% "json4s-scalaz"  % "3.5.3"    % "test"
+)
+
+
+def specsVersion(scalaVer: String) = scalaVer match {
+  case "2.11.11" => "3.7"
+  case "2.12.4" => "2.5"
+}

java-scala/project/BuildSettings.scala

@@ -1 +1 @@
-sbt.version=0.13.2
+sbt.version=1.0.2

java-scala/project/Dependencies.scala

@@ -40,19 +40,17 @@ class JsonParseTest extends Specification {
 
   val internalDomains = List("www.subdomain1.snowplowanalytics.com", "www.subdomain2.snowplowanalytics.com")
 
-  def getString(node: JValue, name: String): String = 
+  def getString(node: JValue, name: String): String =
     (node \ name) match {
       case JString(s) => s
       case _ => throw new Exception("The value of field '%s' in referer-tests.json is not a string - this should never happen".format(name))
   }
 
   "parse" should {
+    "extract the expected details from referer with spec" in {
+      for (test <- testJson) yield {
 
-    for (test <- testJson) {
-
-      "extract the expected details from referer with spec '%s'".format(getString(test, "spec")) in {
-
-        Parser.parse(getString(test, "uri"), pageHost, internalDomains) must_== 
+        Parser.parse(getString(test, "uri"), pageHost, internalDomains) shouldEqual
           Some(Referer(
             Medium.withName(getString(test, "medium")),
             (test \ "source") match {

java-scala/project/RefererParserBuild.scala

@@ -31,5 +31,5 @@ class ParseFuzzTest extends Specification with ScalaCheck {
     "The parse function should work for any pair of referer and page Strings" ! e1
 
   def e1 =
-    check { (refererUri: String, pageUri: String) => Parser.parse(refererUri, pageUri) must beAnInstanceOf[Parser.MaybeReferer] }
+    prop { (refererUri: String, pageUri: String) => Parser.parse(refererUri, pageUri) must beAnInstanceOf[Parser.MaybeReferer] }
 }