Skip to content

Commit

Permalink
Fix sbt syntax warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
Sébastien FALQUIER committed Sep 10, 2021
1 parent 2f89f5d commit c6cc103
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 17 deletions.
22 changes: 7 additions & 15 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -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"

Expand Down Expand Up @@ -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 =>
Expand Down
1 change: 1 addition & 0 deletions src/test/scala/io/arlas/data/DataFrameTester.scala
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ trait DataFrameTester {
} else {
s"'','${r1.mkString("','")}' \n '#','${r2.mkString("','")}'\n"
}
case _ => "\n"
}
.mkString("\n") + """ """
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
1 change: 0 additions & 1 deletion version.sbt

This file was deleted.

0 comments on commit c6cc103

Please sign in to comment.