Skip to content

Commit

Permalink
Removed test dependencies from compile classpath. Updated build.gradl…
Browse files Browse the repository at this point in the history
…e dependencies. No longer support Scala 2.11. (#50)

* Removed test dependencies from compile classpath. Updated build.gradle dependencies.

* Added missed scala-version bump in ci.yml.

* Removed typo from ci.yml.
  • Loading branch information
jverbus authored May 29, 2024
1 parent 54353a5 commit 56f126b
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 35 deletions.
38 changes: 19 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,28 @@ jobs:
strategy:
matrix:
include:
- scala-version: 2.12.18
- scala-version: 2.12.19
spark-version: 2.4.3
- scala-version: 2.12.18
spark-version: 3.0.0
- scala-version: 2.12.18
spark-version: 3.1.1
- scala-version: 2.12.18
- scala-version: 2.12.19
spark-version: 3.0.3
- scala-version: 2.12.19
spark-version: 3.1.3
- scala-version: 2.12.19
spark-version: 3.2.4
- scala-version: 2.13.11
- scala-version: 2.13.14
spark-version: 3.2.4
- scala-version: 2.12.18
spark-version: 3.3.3
- scala-version: 2.13.12
spark-version: 3.3.3
- scala-version: 2.12.18
spark-version: 3.4.2
- scala-version: 2.13.12
spark-version: 3.4.2
- scala-version: 2.12.18
spark-version: 3.5.0
- scala-version: 2.13.12
spark-version: 3.5.0
- scala-version: 2.12.19
spark-version: 3.3.4
- scala-version: 2.13.14
spark-version: 3.3.4
- scala-version: 2.12.19
spark-version: 3.4.3
- scala-version: 2.13.14
spark-version: 3.4.3
- scala-version: 2.12.19
spark-version: 3.5.1
- scala-version: 2.13.14
spark-version: 3.5.1
if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
steps:
- name: Check out code
Expand Down
26 changes: 11 additions & 15 deletions isolation-forest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,23 @@ plugins {
id 'scala'
}

def scalaVersion = findProperty("scalaVersion") ?: "2.13.12"
def scalaVersion = findProperty("scalaVersion") ?: "2.13.14"
println "Scala version: " + scalaVersion
// If scalaVersion == "2.11.8", then scalaVersionShort == "2.11".
// If scalaVersion == "X.Y.Z", then scalaVersionShort == "X.Y".
def scalaVersionShort = VersionNumber.parse(scalaVersion).getMajor() + "." + VersionNumber.parse(scalaVersion).getMinor()

def sparkVersion = findProperty("sparkVersion") ?: "3.4.1"
def sparkVersion = findProperty("sparkVersion") ?: "3.5.1"
println "Spark version: " + sparkVersion

dependencies {
compile("com.chuusai:shapeless_" + scalaVersionShort + ":2.3.10")
if(VersionNumber.parse(sparkVersion) >= VersionNumber.parse("2.4.0")) {
compile("org.apache.spark:spark-avro_" + scalaVersionShort + ":" + sparkVersion)
} else {
compile("com.databricks:spark-avro_" + scalaVersionShort + ":4.0.0")
}
compile("org.apache.spark:spark-core_" + scalaVersionShort + ":" + sparkVersion)
compile("org.apache.spark:spark-mllib_" + scalaVersionShort + ":" + sparkVersion)
compile("org.apache.spark:spark-sql_" + scalaVersionShort + ":" + sparkVersion)
compile("org.scala-lang:scala-library:" + scalaVersion)
compile("org.scalatest:scalatest_" + scalaVersionShort + ":3.1.0")
compile("org.testng:testng:6.8.8")
implementation("com.chuusai:shapeless_" + scalaVersionShort + ":2.3.12")
implementation("org.apache.spark:spark-avro_" + scalaVersionShort + ":" + sparkVersion)
implementation("org.apache.spark:spark-core_" + scalaVersionShort + ":" + sparkVersion)
implementation("org.apache.spark:spark-mllib_" + scalaVersionShort + ":" + sparkVersion)
implementation("org.apache.spark:spark-sql_" + scalaVersionShort + ":" + sparkVersion)
implementation("org.scala-lang:scala-library:" + scalaVersion)
testImplementation("org.scalatest:scalatest_" + scalaVersionShort + ":3.2.18")
testImplementation("org.testng:testng:7.5.1")
}

test {
Expand Down
2 changes: 1 addition & 1 deletion version.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Version of the produced binaries.
# The version is inferred by shipkit-auto-version Gradle plugin (https://github.com/shipkit/shipkit-auto-version).
version=3.0.*
version=3.1.*

0 comments on commit 56f126b

Please sign in to comment.