added Spark version parameter to build (#7)

* added Spark version parameter to build * added version comparison as suggested * removed unused gradle plugin
linkedin · Jan 23, 2020 · 08f1013 · 08f1013
1 parent 3c18641
commit 08f1013
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,5 @@ spark-warehouse
 *.ipr
 *.iml
 *.iws
+
+isolation-forest/bin
diff --git a/isolation-forest/build.gradle b/isolation-forest/build.gradle
@@ -1,14 +1,24 @@
+import org.gradle.util.VersionNumber
+
 plugins {
     // Apply the scala plugin to add support for Scala
     id 'scala'
 }
 
+def sparkVersion = findProperty("sparkVersion") ?: "2.3.0"
+
+println "Spark version: " + sparkVersion
+
 dependencies {
     compile("com.chuusai:shapeless_2.11:2.3.2")
-    compile("com.databricks:spark-avro_2.11:4.0.0")
-    compile("org.apache.spark:spark-core_2.11:2.3.0")
-    compile("org.apache.spark:spark-mllib_2.11:2.3.0")
-    compile("org.apache.spark:spark-sql_2.11:2.3.0")
+    if(VersionNumber.parse(sparkVersion) >= VersionNumber.parse("2.4.0")) {
+        compile("org.apache.spark:spark-avro_2.11:2.4.0")
+    } else { 
+        compile("com.databricks:spark-avro_2.11:4.0.0")
+    }
+    compile("org.apache.spark:spark-core_2.11:" + sparkVersion)
+    compile("org.apache.spark:spark-mllib_2.11:" + sparkVersion)
+    compile("org.apache.spark:spark-sql_2.11:" + sparkVersion)
     compile("org.scalatest:scalatest_2.11:2.2.6")
     compile("org.testng:testng:6.8.8")
 }
@@ -17,4 +27,4 @@ test {
     useTestNG()
 }
 
-archivesBaseName = "${project.name}_2.11"
+archivesBaseName = "${project.name}_2.11"
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,5 @@ spark-warehouse @@
     *.ipr
     *.iml
     *.iws
+    isolation-forest/bin