diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1f1a3f1..be187c7c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ name: CI on: push: - branches: [ master main ] + branches: [ main ] pull_request: jobs: build: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1e453fd5..391e3ce4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,7 @@ name: Release on: push: - branches: [master, main] + branches: [ main ] tags: ["*"] jobs: publish: diff --git a/README.md b/README.md index 75962994..013916b5 100644 --- a/README.md +++ b/README.md @@ -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) @@ -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)
Release [1.4.3](https://github.com/ekrich/sconfig/releases/tag/v1.4.3) - (2021-05-12)
Release [1.4.2](https://github.com/ekrich/sconfig/releases/tag/v1.4.2) - (2021-04-01)
Release [1.4.1](https://github.com/ekrich/sconfig/releases/tag/v1.4.1) - (2021-02-24)
diff --git a/build.sbt b/build.sbt index 511e7e12..36cf7e4d 100644 --- a/build.sbt +++ b/build.sbt @@ -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 = { @@ -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