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.

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

Updated Apache POI to 5.2.5 and Spark to 3.5.1 #40

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 17 additions & 9 deletions .github/workflows/spark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,40 +7,48 @@ on:
types: [ opened, reopened ]
workflow_dispatch:


jobs:
build:
strategy:
matrix:
sparkVersion: [ 3.0.1, 3.0.2, 3.0.3, 3.1.2, 3.2.1, 3.2.4, 3.3.0, 3.3.1, 3.3.2, 3.3.3, 3.4.0, 3.4.1, 3.5.0 ]
sparkVersion: [ 3.0.1, 3.0.2, 3.0.3, 3.1.2, 3.2.1, 3.2.4, 3.3.0, 3.3.1, 3.3.2, 3.3.3, 3.4.0, 3.4.1, 3.5.0, 3.5.1 ]

runs-on: ubuntu-latest

steps:

- name: Checkout with LFS
uses: actions/checkout@v3.5.2
uses: actions/checkout@v4.1.7
with:
lfs: true

- name: Set up JDK 8
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v4.2.1
with:
java-version: '8'
distribution: 'adopt'

- name: Cache SBT dependencies
uses: actions/[email protected]
with:
path: |
~/.ivy2/cache
~/.sbt
~/.coursier
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt') }}-${{ matrix.sparkVersion }}
restore-keys: |
${{ runner.os }}-sbt-${{ matrix.sparkVersion }}

- name: Run tests and produce coverage
run: sbt -DsparkVersion="${{matrix.sparkVersion}}" clean coverageOn test coverageReport

- name: Upload coverage to CodeCov
uses: codecov/codecov-action@v3.1.4
uses: codecov/codecov-action@v4.5.0
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./target/spark-${{ matrix.sparkVersion }}/scala-2.12/coverage-report/cobertura.xml
env_vars: ${{ matrix.sparkVersion }}
fail_ci_if_error: true
name: spark-excel
# path_to_write_report: ./target/spark-${{ matrix.sparkVersion }}/scala-2.12/coverage-report/codecov_report.txt
verbose: true

- name: Create assembly
Expand All @@ -51,5 +59,5 @@ jobs:
if: ${{ github.event_name != 'pull_request' }}
uses: actions/[email protected]
with:
path: ./target/spark-${{ matrix.sparkVersion }}/scala-2.12/spark-excel*.jar
if-no-files-found: warn
path: ./target/scala-2.12/spark-excel*.jar
josecsotomorales marked this conversation as resolved.
Show resolved Hide resolved
if-no-files-found: warn
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ libraryDependencies ++= Seq(
"org.apache.poi" % "poi" % poiVersion.value % Compile,
"org.apache.poi" % "poi-ooxml" % poiVersion.value % Compile,
"org.apache.poi" % "poi-ooxml-lite" % poiVersion.value % Compile,
"org.apache.commons" % "commons-compress" % "1.21" % Compile,
"org.apache.commons" % "commons-compress" % "1.26.1" % Compile,
"org.apache.commons" % "commons-collections4" % "4.4" % Compile,
"commons-io" % "commons-io" % "2.11.0" % Compile,
"commons-io" % "commons-io" % "2.16.1" % Compile,
"org.apache.logging.log4j" % "log4j-core" % log4JVersion.value % Compile,
"org.apache.logging.log4j" % "log4j-api" % log4JVersion.value % Compile
)
Expand Down Expand Up @@ -120,8 +120,8 @@ addArtifact(Compile / assembly / artifact, assembly)

// Define common settings for the library
val commonSettings = Seq(
sparkVersion := System.getProperty("sparkVersion", "3.5.0"),
sparkExcelVersion := "0.1.12",
sparkVersion := System.getProperty("sparkVersion", "3.5.1"),
sparkExcelVersion := "0.1.13",
version := s"${sparkVersion.value}_${sparkExcelVersion.value}",
scalaVersion := {
if (sparkVersion.value < "3.2.0") {
Expand All @@ -132,8 +132,8 @@ val commonSettings = Seq(
"2.12.15"
}
},
scalaTestVersion := "3.2.16",
poiVersion := "5.2.3",
scalaTestVersion := "3.2.18",
poiVersion := "5.2.5",
log4JVersion := "2.20.0",
crossVersion := CrossVersion.disabled
)