From 38d242c8f82a763322aa23fa3a5c988721995b7a Mon Sep 17 00:00:00 2001 From: Ian Streeter Date: Wed, 15 Dec 2021 22:02:15 +0000 Subject: [PATCH] Bump scala version to 2.12.15 (close #532) --- .../adapters/registry/GoogleAnalyticsAdapterSpec.scala | 2 +- project/BuildSettings.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/common/src/test/scala/com.snowplowanalytics.snowplow.enrich.common/adapters/registry/GoogleAnalyticsAdapterSpec.scala b/modules/common/src/test/scala/com.snowplowanalytics.snowplow.enrich.common/adapters/registry/GoogleAnalyticsAdapterSpec.scala index fd48ec349..8c068e3a0 100644 --- a/modules/common/src/test/scala/com.snowplowanalytics.snowplow.enrich.common/adapters/registry/GoogleAnalyticsAdapterSpec.scala +++ b/modules/common/src/test/scala/com.snowplowanalytics.snowplow.enrich.common/adapters/registry/GoogleAnalyticsAdapterSpec.scala @@ -401,7 +401,7 @@ class GoogleAnalyticsAdapterSpec extends Specification with DataTables with Vali |"data":{"promotionAction":"action"} |},{ |"schema":"iglu:com.google.analytics.measurement-protocol/promotion/jsonschema/1-0-0", - |"data":{"index":12,"id":"id"} + |"data":{"id":"id","index":12} |}] |}""".stripMargin.replaceAll("[\n\r]", "") val expectedParams = static ++ Map("ue_pr" -> expectedUE, "co" -> expectedCO).toOpt diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala index d5381dfa5..2163108bc 100644 --- a/project/BuildSettings.scala +++ b/project/BuildSettings.scala @@ -34,7 +34,7 @@ object BuildSettings { /** Common base settings */ lazy val basicSettings = Seq( organization := "com.snowplowanalytics", - scalaVersion := "2.12.11", + scalaVersion := "2.12.15", javacOptions := Seq("-source", "11", "-target", "11"), resolvers ++= Dependencies.resolutionRepos, licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0.html")),