From c6cc10337f035e2f93b7df0159bcf36a30d922c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20FALQUIER?= <sebastien.falquier@gisaia.com>
Date: Fri, 10 Sep 2021 17:12:03 +0200
Subject: [PATCH] Fix sbt syntax warnings

---
 build.sbt                                     | 22 ++++++-------------
 .../scala/io/arlas/data/DataFrameTester.scala |  1 +
 .../timeseries/WithStateIdFromStateTest.scala |  1 -
 version.sbt                                   |  1 -
 4 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 version.sbt

diff --git a/build.sbt b/build.sbt
index 7692af0f..5a449f0d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / version      := (version in ThisBuild).value
+ThisBuild / version      := "0.6.1-SNAPSHOT"
 ThisBuild / scalaVersion := "2.12.10"
 ThisBuild / organization := "io.arlas"
 
@@ -55,20 +55,12 @@ ThisBuild / publishTo := { Some("Cloudsmith API" at "https://maven.cloudsmith.io
 ThisBuild / pomIncludeRepository := { x => false }
 ThisBuild / credentials += Credentials("Cloudsmith API", "maven.cloudsmith.io", sys.env.getOrElse("CLOUDSMITH_USER", ""), sys.env.getOrElse("CLOUDSMITH_API_KEY", ""))
 
-//publish also assembly jar
-test in assembly := {}
-lazy val arlasProcAssembly = project
-  .dependsOn(arlasProc)
-  .settings(
-      publishArtifact in (Compile, packageBin) := false,
-      publishArtifact in (Compile, packageDoc) := false,
-      publishArtifact in (Compile, packageSrc) := false,
-      name := "arlas-proc-assembly",
-      artifact in (Compile, assembly) ~= { art =>
-          art.withClassifier(Some("assembly"))
-      },
-      addArtifact(artifact in (Compile, assembly), assembly)
-      )
+//publish assembly jar
+assembly / artifact := {
+  val art = (assembly / artifact).value
+  art.withClassifier(Some("assembly"))
+}
+addArtifact(assembly / artifact, assembly)
 ThisBuild / assemblyMergeStrategy := {
   case "module-info.class" => MergeStrategy.discard
   case x =>
diff --git a/src/test/scala/io/arlas/data/DataFrameTester.scala b/src/test/scala/io/arlas/data/DataFrameTester.scala
index 5597b2ed..012db41d 100644
--- a/src/test/scala/io/arlas/data/DataFrameTester.scala
+++ b/src/test/scala/io/arlas/data/DataFrameTester.scala
@@ -76,6 +76,7 @@ trait DataFrameTester {
           } else {
             s"'','${r1.mkString("','")}' \n '#','${r2.mkString("','")}'\n"
           }
+        case _ => "\n"
       }
       .mkString("\n") + """  """
   }
diff --git a/src/test/scala/io/arlas/data/transform/timeseries/WithStateIdFromStateTest.scala b/src/test/scala/io/arlas/data/transform/timeseries/WithStateIdFromStateTest.scala
index 0e9f57ca..ca90170e 100644
--- a/src/test/scala/io/arlas/data/transform/timeseries/WithStateIdFromStateTest.scala
+++ b/src/test/scala/io/arlas/data/transform/timeseries/WithStateIdFromStateTest.scala
@@ -23,7 +23,6 @@ import io.arlas.data.model.DataModel
 import io.arlas.data.sql._
 import io.arlas.data.transform.ArlasTest
 import io.arlas.data.transform.ArlasTestHelper._
-import io.arlas.data.transform.timeseries.WithStateIdFromState
 import org.apache.spark.sql.functions._
 import org.apache.spark.sql.types.{IntegerType, StringType}
 
diff --git a/version.sbt b/version.sbt
deleted file mode 100644
index f608fd1d..00000000
--- a/version.sbt
+++ /dev/null
@@ -1 +0,0 @@
-version in ThisBuild := "0.6.1-SNAPSHOT"