Skip to content

Commit

Permalink
Drop Scala 2.11 support (#369)
Browse files Browse the repository at this point in the history
* Drop Scala 2.11 support

* Remove Scala 2.11 from CI

* Restore ActionHelper for Scala 2.12

* Cleanup ci script

* Reformat with ScalaFmt

* Update to Scala 2.12.18 and 2.13.11

* Await logner for test values in Slick test

* Remove Scala 2.11 mentions from readme
  • Loading branch information
limansky authored Jul 16, 2023
1 parent f9b528a commit 74a7b36
Show file tree
Hide file tree
Showing 9 changed files with 53 additions and 203 deletions.
24 changes: 9 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ jobs:
matrix:
include:
- java: 11
scala: 2.11.12
scala: 2.12.18
- java: 11
scala: 2.12.17
- java: 11
scala: 2.13.10
scala: 2.13.11
- java: 11
scala: 3.2.1
runs-on: ubuntu-latest
Expand All @@ -27,23 +25,19 @@ jobs:
SBT_OPTS: -Denumeratum.useLocalVersion
steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v3
- name: Setup
uses: olafurpg/setup-scala@v10
uses: olafurpg/setup-scala@v14
with:
java-version: "adopt@1.${{ matrix.java }}"
- name: Coursier cache
uses: coursier/cache-action@v5
uses: coursier/cache-action@v6
- name: Build and test
shell: bash
run: |
case ${{ matrix.scala }} in
2.11.12)
sbt -v ++${{ matrix.scala }} scalafmtCheck scalafmtSbtCheck scala_2_11/test:compile scala_2_11/test:doc
sbt -v ++${{ matrix.scala }} scala_2_11/test
;;
2.12.17)
sbt -v ++${{ matrix.scala }} test:compile test:doc
2.12.18)
sbt -v ++${{ matrix.scala }} scalafmtCheck scalafmtSbtCheck test:compile test:doc
sbt -v ++${{ matrix.scala }} coverage test coverageReport
sbt -v ++${{ matrix.scala }} coverageAggregate
;;
Expand All @@ -58,7 +52,7 @@ jobs:
find $HOME/.cache/coursier/v1 -name "ivydata-*.properties" -delete || true
find $HOME/.sbt -name "*.lock" -delete || true
- name: Upload coverage to Codecov
if: ${{ matrix.scala == '2.12.17' }}
uses: codecov/codecov-action@v2
if: ${{ matrix.scala == '2.12.18' }}
uses: codecov/codecov-action@v3
with:
fail_ci_if_error: true
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Enumeratum has the following niceties:
- All magic happens at compile-time so you know right away when things go awry
- Comprehensive automated testing to make sure everything is in tip-top shape

Enumeratum is published for Scala 2.11.x, 2.12.x, 2.13.x, 3.x as well as ScalaJS and ScalaNative.
Enumeratum is published for Scala 2.12.x, 2.13.x, 3.x as well as ScalaJS and ScalaNative.

Note that there are a couple of limitations for 3.x:
* All "immediate" parent types of enum entries need to be `sealed` (reasoning [here](https://github.com/lloydmeta/enumeratum/pull/349#discussion_r1034715979))
Expand Down Expand Up @@ -358,7 +358,6 @@ libraryDependencies ++= Seq(
```

#### Dependencies and compatibility notes
- As of version 1.4.0, `enumeratum-play` for Scala 2.11 is compatible with Play 2.5 - 2.7
- As of version 1.6.1, `enumeratum-play` for Scala 2.12 requires Play >= 2.8

### Usage
Expand Down Expand Up @@ -500,8 +499,6 @@ libraryDependencies ++= Seq(
)
```

Note that as of version 1.4.0, `enumeratum-play-json` for Scala 2.11 is compatible with Play 2.5 - 2.7

### Usage

#### PlayJsonEnum
Expand Down
Loading

0 comments on commit 74a7b36

Please sign in to comment.