Skip to content

Commit

Permalink
Merge pull request #130 from scala-steward/update/fs2-data-csv-1.8.0
Browse files Browse the repository at this point in the history
Update fs2-data-csv, fs2-data-csv-generic to 1.8.0
  • Loading branch information
ybasket authored Jul 24, 2023
2 parents b6f9d35 + 961cf45 commit e32deda
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 64 deletions.
94 changes: 36 additions & 58 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,49 +23,38 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.10, 3.3.0]
java: [temurin@11]
scala: [2.13.11, 3.3.0]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Setup Java (temurin@11)
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v2
- name: Setup Java (temurin@8)
if: matrix.java == 'temurin@8'
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11

- name: Cache sbt
uses: actions/cache@v2
with:
path: |
~/.sbt
~/.ivy2/cache
~/.coursier/cache/v1
~/.cache/coursier/v1
~/AppData/Local/Coursier/Cache/v1
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
java-version: 8
cache: sbt

- name: Check that workflows are up to date
run: sbt ++${{ matrix.scala }} githubWorkflowCheck
run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck

- name: Build project
run: sbt ++${{ matrix.scala }} test
run: sbt '++ ${{ matrix.scala }}' test

- name: Compile Documentation
if: matrix.scala == '2.13.10'
run: sbt ++${{ matrix.scala }} site/mdoc
if: matrix.scala == '2.13.11'
run: sbt '++ ${{ matrix.scala }}' site/mdoc

- name: Compress target directories
run: tar cf targets.tar target rules/syntax/target rules/target core/target project/target

- name: Upload target directories
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }}
path: targets.tar
Expand All @@ -77,46 +66,35 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.10]
java: [temurin@11]
scala: [2.13.11]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Setup Java (temurin@11)
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v2
- name: Setup Java (temurin@8)
if: matrix.java == 'temurin@8'
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 8
cache: sbt

- name: Cache sbt
uses: actions/cache@v2
with:
path: |
~/.sbt
~/.ivy2/cache
~/.coursier/cache/v1
~/.cache/coursier/v1
~/AppData/Local/Coursier/Cache/v1
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Download target directories (2.13.10)
uses: actions/download-artifact@v2
- name: Download target directories (2.13.11)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-2.13.10-${{ matrix.java }}
name: target-${{ matrix.os }}-2.13.11-${{ matrix.java }}

- name: Inflate target directories (2.13.10)
- name: Inflate target directories (2.13.11)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.3.0)
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-3.3.0-${{ matrix.java }}

Expand All @@ -130,7 +108,7 @@ jobs:
PGP_SECRET: ${{ secrets.PGP_SECRET }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
run: sbt ++${{ matrix.scala }} ci-release
run: sbt ci-release

site:
name: Deploy site
Expand All @@ -139,22 +117,22 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.10]
java: [temurin@11]
scala: [2.13.11]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
- name: Download target directories (2.13.10)
uses: actions/download-artifact@v2
- name: Download target directories (2.13.11)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-2.13.10-${{ matrix.java }}
name: target-${{ matrix.os }}-2.13.11-${{ matrix.java }}

- name: Inflate target directories (2.13.10)
- name: Inflate target directories (2.13.11)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.3.0)
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-3.3.0-${{ matrix.java }}

Expand All @@ -164,8 +142,8 @@ jobs:
rm targets.tar
- name: Compile Website
if: matrix.scala == '2.13.10'
run: sbt ++${{ matrix.scala }} site/makeMicrosite
if: matrix.scala == '2.13.11'
run: sbt site/makeMicrosite

- name: Deploy site
uses: peaceiris/actions-gh-pages@v3
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ val noPublish = List(
)

// === CI/CD settings ===
val scala213 = "2.13.10"
val scala213 = "2.13.11"
val scala3 = "3.3.0"

ThisBuild / scalaVersion := scala213
Expand Down
1 change: 0 additions & 1 deletion core/src/main/scala-3/com/mobimeo/gtfs/model/CsvEnum.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.mobimeo.gtfs.model

import cats.syntax.all._
import fs2.data.csv.{CellDecoder, CellEncoder, DecoderError}

import scala.util.Try
Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import sbt._

object Versions {
val fs2 = "3.7.0"
val fs2Data = "1.7.1"
val enumeratum = "1.7.2"
val fs2Data = "1.8.0"
val enumeratum = "1.7.3"
val weaver = "0.8.3"
val circe = "0.14.5"
val log4cats = "2.6.0"
val catsParse = "0.3.9"
val catsParse = "0.3.10"
val literally = "1.1.0"
}

Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "5.1.0")
// check and add missing license headers
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
// manage github actions from build definition
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2")
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.15.0")
// manage the documentation website
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.3")
// generate unified documentation
Expand Down

0 comments on commit e32deda

Please sign in to comment.