Skip to content

Commit

Permalink
fixing build issues for scala 2.12
Browse files Browse the repository at this point in the history
  • Loading branch information
riomus committed Apr 2, 2019
1 parent 670a6fd commit f050200
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 13 deletions.
8 changes: 8 additions & 0 deletions .sbtopts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
-J-Dfile.encoding=UTF8
-J-Xss8m
-J-Xms1G
-J-Xmx2G
-J-XX:ReservedCodeCacheSize=256M
-J-XX:MaxMetaspaceSize=2G
-J-server
-Dsbt.log.format=true
1 change: 0 additions & 1 deletion loaders/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import ml.sparkling.graph.{Dependencies}

Dependencies.graphx
Dependencies.sparkCSV
Dependencies.sparkXML
Dependencies.test
1 change: 0 additions & 1 deletion operators/build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import ml.sparkling.graph.{Dependencies}
Dependencies.graphx
Dependencies.sparkCSV
Dependencies.test
Dependencies.fastUtils
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import org.scalatest._
/**
* Created by Roman Bartusiak (roman.bartusiak@pwr.edu.pl http://riomus.github.io).
*/
abstract class MeasureTest(implicit sc:SparkContext) extends FlatSpec with BeforeAndAfterAll with GivenWhenThen with Matchers with BeforeAndAfterEach{
abstract class MeasureTest(implicit sc:SparkContext) extends FlatSpec with BeforeAndAfterAll with GivenWhenThen with Matchers{
def time[T](str: String)(thunk: => T): (T,Long) = {
logger.info(s"$str...")
val t1 = System.currentTimeMillis
Expand All @@ -27,13 +27,6 @@ abstract class MeasureTest(implicit sc:SparkContext) extends FlatSpec with Befo
out.edges.setName(s"Graph edges ${file}")
out.triplets.setName(s"Graph triplets ${file}")
out
out
}


override def beforeEach(testData: TestData) = {
logger.info(s"${Console.GREEN} Running test ${testData.name} ${Console.RESET} ")
}


}
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ object Dependencies {
val graphx = l ++= Seq(Provided.sparkCore.value, Provided.sparkGraphx.value)
val sparkSQL = l ++= Seq(Provided.sparkSQL.value)
val sparkMLLib = l ++= Seq(Provided.sparkMLLib.value)
val sparkCSV = l ++= Seq(Compile.sparkCSV, Provided.sparkSQL.value)
// val sparkCSV = l ++= Seq(Compile.sparkCSV, Provided.sparkSQL.value)
val sparkXML = l ++= Seq(Compile.sparkXML, Provided.sparkSQL.value)
val test = l ++= Seq(Compile.Test.scalatest.value,Compile.Test.mockito.value)
val fastUtils = l ++= Seq(Compile.fastUtils)

object Compile {
val fastUtils = "it.unimi.dsi" % "fastutil" % "8.1.0"

val sparkCSV = "com.databricks" %% "spark-csv" % "1.2.0"
val sparkXML = "com.databricks" %% "spark-xml" % "0.4.0"
// val sparkCSV = "com.databricks" %% "spark-csv" % "1.2.0"
val sparkXML = "com.databricks" %% "spark-xml" % "0.5.0"

object Test {
val scalatest = Def.setting {
Expand Down

0 comments on commit f050200

Please sign in to comment.