Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed test dependencies from compile classpath. Removed test dependencies from compile classpath. Updated build.gradee dependencies. No longer support Scala 2.11. #48

Closed
wants to merge 2 commits into from
Closed

Removed test dependencies from compile classpath. Removed test dependencies from compile classpath. Updated build.gradee dependencies. No longer support Scala 2.11. #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
237973e
Removed test dependencies from compile classpath. Updated build.gradl…
jverbus May 29, 2024
b8c20d7
Added missed scala-version bump in ci.yml.
jverbus May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 19 additions & 21 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,30 +21,28 @@ jobs:
strategy:
matrix:
include:
- scala-version: 2.11.12
- scala-version: 2.12.19
spark-version: 2.4.3
- scala-version: 2.12.18
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.14s
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
View file
Open in desktop
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
View file
Open in desktop
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.*
Loading