Close #487 - Update scala-library to 2.13.14

.circleci/config.yml

@@ -37,7 +37,7 @@ commands:
         default: "openjdk8"
       scala_version:
         type: string
-        default: "2.13.12"
+        default: "2.13.14"
       ws_version:
         type: string
         default: ""
@@ -121,7 +121,7 @@ commands:
         default: "openjdk8"
       scala_version:
         type: string
-        default: "2.13.12"
+        default: "2.13.14"
       ws_version:
         type: string
         default: ""
@@ -276,7 +276,7 @@ jobs:
       - test_suite:
           java_version: openjdk9
           modules: core vfs play
-          scala_version: 2.13.12
+          scala_version: 2.13.14
           ws_version: 2.1.2
           play_version: 2.8.0
           play_json_version: 2.8.1
@@ -377,7 +377,7 @@ jobs:
           play_version: 2.7.1
           play_json_version: 2.9.1
           ws_version: 2.0.6
-          scala_versions: 2.13.12
+          scala_versions: 2.13.14
 
       - publish_snapshots:
           release_suffix: play28
@@ -392,7 +392,7 @@ jobs:
           ws_version: 2.1.2
           play_version: 2.8.0
           play_json_version: 2.8.1
-          scala_versions: 2.13.12
+          scala_versions: 2.13.14
 
       - save_cache:
           paths:

build.sbt

@@ -5,7 +5,7 @@ ThisBuild / scalaVersion := "2.12.19"
 ThisBuild / crossScalaVersions := Seq(
   "2.11.12",
   scalaVersion.value,
-  "2.13.12",
+  "2.13.14",
   "3.2.1"
 )
 

s3/src/main/scala/WSS3BucketRef.scala

@@ -102,16 +102,15 @@ final class WSS3BucketRef private[s3] (
     )(implicit
       m: Materializer
     ): Future[Unit] = {
-    // We want to delete all versions including deleteMarkers for this bucket to be considered empty.
-    ObjectVersions()
-      .withDeleteMarkers()
-      .runFoldAsync(())((_: Unit, e) => {
-        // As we will delete all deleteMarkers we disable the auto-delete of deleteMarkers using "skipMarkersCheck"
-        obj(e.name, e.versionId)
-          .WSS3DeleteRequest()
-          .skipMarkersCheck
-          .ignoreIfNotExists()
-      })
+    // We want to delete all versions including deleteMarkers
+    // for this bucket to be considered empty.
+    ObjectVersions().withDeleteMarkers().runFoldAsync(()) { (_: Unit, e) =>
+      // As we will delete all deleteMarkers we disable
+      // the auto-delete of deleteMarkers using "skipMarkersCheck"
+      val objRef = obj(e.name, e.versionId)
+
+      objRef.WSS3DeleteRequest().skipMarkersCheck.ignoreIfNotExists()
+    }
   }
 
   def delete: DeleteRequest = WSS3DeleteRequest()

s3/src/main/scala/WSS3VersionedObjectRef.scala

@@ -121,7 +121,9 @@ final class WSS3VersionedObjectRef(
       ): Future[Seq[VersionedObject]] = {
       implicit val ec: ExecutionContext = m.executionContext
 
-      new WSS3ObjectRef(storage, bucket, name)
+      val objRef = new WSS3ObjectRef(storage, bucket, name)
+
+      objRef
         .ObjectVersions()
         .withDeleteMarkers
         .collect[List]()