Skip to content

Commit

Permalink
Update to Scala 3.0.0 (#171)
Browse files Browse the repository at this point in the history
  • Loading branch information
ekrich authored May 13, 2021
1 parent fb075b7 commit 7361a71
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: CI
on:
push:
branches: [ master main ]
branches: [ main ]
pull_request:
jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Release
on:
push:
branches: [master, main]
branches: [ main ]
tags: ["*"]
jobs:
publish:
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ All available versions can be seen at the [Maven Repository](https://mvnreposito
| 2.11.x ||||
| 2.12.x ||||
| 2.13.x ||||
| 3.0.0-RC3 ||| n/a |
| 3.0.x ||| n/a |

## Usage and Help
[![Scaladoc](https://www.javadoc.io/badge/org.ekrich/sconfig_2.11.svg?label=scaladoc)](https://www.javadoc.io/doc/org.ekrich/sconfig_2.11)
Expand All @@ -60,6 +60,7 @@ For specific changes, refer to the releases below.

## Versions

Release [1.4.4](https://github.com/ekrich/sconfig/releases/tag/v1.4.4) - (2021-05-13)<br/>
Release [1.4.3](https://github.com/ekrich/sconfig/releases/tag/v1.4.3) - (2021-05-12)<br/>
Release [1.4.2](https://github.com/ekrich/sconfig/releases/tag/v1.4.2) - (2021-04-01)<br/>
Release [1.4.1](https://github.com/ekrich/sconfig/releases/tag/v1.4.1) - (2021-02-24)<br/>
Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ addCommandAlias(
).mkString(";", ";", "")
)

val prevVersion = "1.4.1"
val nextVersion = "1.4.2"
val prevVersion = "1.4.4"
val nextVersion = "1.4.5"

// stable snapshot is not great for publish local
def versionFmt(out: sbtdynver.GitDescribeOutput): String = {
Expand Down Expand Up @@ -45,10 +45,10 @@ val isScala3 = Def.setting {
val scala211 = "2.11.12"
val scala212 = "2.12.13"
val scala213 = "2.13.5"
val scala300 = "3.0.0-RC3"
val scala300 = "3.0.0"

val javaTime = "1.1.4"
val scCompat = "2.4.3"
val javaTime = "1.1.5"
val scCompat = "2.4.4"

val versionsBase = Seq(scala211, scala212, scala213)
val versionsJVM = versionsBase :+ scala300
Expand Down

0 comments on commit 7361a71

Please sign in to comment.