Merge branch 'master' into use-mdoc-in-modules

.github/workflows/ci.yml

@@ -115,7 +115,7 @@ jobs:
 
       - name: Comment on pull request
         if: steps.diff_website.outcome == 'failure'
-        uses: thollander/actions-comment-pull-request@1.0.0
+        uses: thollander/actions-comment-pull-request@1.0.1
         with:
           message: >
             Warning: the content of the PureConfig website changed with this pull request. This may

.gitignore

@@ -2,15 +2,16 @@
 *.log
 
 # sbt specific
+.bsp
 .cache
 .history
 .lib/
 dist/*
-target/
 lib_managed/
-src_managed/
 project/boot/
 project/plugins/project/
+src_managed/
+target/
 
 # Scala-IDE specific
 .scala_dependencies

README.md

@@ -2,7 +2,7 @@
 
 <img src="docs/src/main/resources/microsite/img/pureconfig-logo-1040x1200.png" width="130px" height="150px" align="right">
 
-[![Build Status](https://travis-ci.org/pureconfig/pureconfig.svg?branch=master)](https://travis-ci.org/pureconfig/pureconfig)
+[![Build Status](https://github.com/pureconfig/pureconfig/workflows/CI/badge.svg?branch=master)](https://github.com/pureconfig/pureconfig/actions?query=workflow%3ACI+branch%3Amaster)
 [![Coverage Status](https://coveralls.io/repos/github/pureconfig/pureconfig/badge.svg?branch=master)](https://coveralls.io/github/pureconfig/pureconfig?branch=master)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.pureconfig/pureconfig_2.12/badge.svg)](https://search.maven.org/artifact/com.github.pureconfig/pureconfig_2.12)
 [![Scaladoc](https://javadoc.io/badge/com.github.pureconfig/pureconfig-core_2.12.svg)](https://javadoc.io/page/com.github.pureconfig/pureconfig-core_2.12/latest/pureconfig/index.html)

build.sbt

@@ -180,3 +180,11 @@ releaseProcess := Seq[ReleaseStep](
   commitNextVersion,
   pushChanges
 )
+
+// This avoids linting warnings in sbt.
+// FIXME: It should be possible to remove this once a new sbt version with the changes from
+// https://github.com/sbt/sbt/pull/5991 is released.
+excludeLintKeys in Global ++= Set(
+  releaseCrossBuild,
+  releaseProcess
+)

bundle/docs/README.md

@@ -2,7 +2,7 @@
 
 <img src="docs/src/main/resources/microsite/img/pureconfig-logo-1040x1200.png" width="130px" height="150px" align="right">
 
-[![Build Status](https://travis-ci.org/pureconfig/pureconfig.svg?branch=master)](https://travis-ci.org/pureconfig/pureconfig)
+[![Build Status](https://github.com/pureconfig/pureconfig/workflows/CI/badge.svg?branch=master)](https://github.com/pureconfig/pureconfig/actions?query=workflow%3ACI+branch%3Amaster)
 [![Coverage Status](https://coveralls.io/repos/github/pureconfig/pureconfig/badge.svg?branch=master)](https://coveralls.io/github/pureconfig/pureconfig?branch=master)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.pureconfig/pureconfig_2.12/badge.svg)](https://search.maven.org/artifact/com.github.pureconfig/pureconfig_2.12)
 [![Scaladoc](https://javadoc.io/badge/com.github.pureconfig/pureconfig-core_2.12.svg)](https://javadoc.io/page/com.github.pureconfig/pureconfig-core_2.12/latest/pureconfig/index.html)

docs/docs/index.md

@@ -6,7 +6,7 @@ layout: home
 
 <img src="img/pureconfig-logo-1040x1200.png" width="130px" height="150px" align="right" alt="PureConfig">
 
-[![Build Status](https://travis-ci.org/pureconfig/pureconfig.svg?branch=master)](https://travis-ci.org/pureconfig/pureconfig)
+[![Build Status](https://github.com/pureconfig/pureconfig/workflows/CI/badge.svg?branch=master)](https://github.com/pureconfig/pureconfig/actions?query=workflow%3ACI+branch%3Amaster)
 [![Coverage Status](https://coveralls.io/repos/github/pureconfig/pureconfig/badge.svg?branch=master)](https://coveralls.io/github/pureconfig/pureconfig?branch=master)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.pureconfig/pureconfig_2.12/badge.svg)](https://search.maven.org/artifact/com.github.pureconfig/pureconfig_2.12)
 [![Scaladoc](https://javadoc.io/badge/com.github.pureconfig/pureconfig-core_2.12.svg)](https://javadoc.io/page/com.github.pureconfig/pureconfig-core_2.12/latest/pureconfig/index.html)

modules/joda/build.sbt

@@ -1,6 +1,6 @@
 name := "pureconfig-joda"
 
-libraryDependencies ++= Seq("joda-time" % "joda-time" % "2.10.6", "org.joda" % "joda-convert" % "2.2.1")
+libraryDependencies ++= Seq("joda-time" % "joda-time" % "2.10.8", "org.joda" % "joda-convert" % "2.2.1")
 
 developers := List(
   Developer("melrief", "Mario Pastorelli", "pastorelli.mario@gmail.com", url("https://github.com/melrief")),

project/Dependencies.scala

@@ -8,12 +8,12 @@ object Dependencies {
     val scala213 = "2.13.3"
 
     val shapeless = "2.3.3"
-    val typesafeConfig = "1.4.0"
+    val typesafeConfig = "1.4.1"
 
     val scalaTest = "3.2.2"
     val scalaTestPlusScalaCheck = "3.2.2.0"
 
-    val scalaCheck = "1.14.3"
+    val scalaCheck = "1.15.0"
     val scalaCheckShapeless = "1.2.5"
   }
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.4.0
+sbt.version=1.4.1