Merge pull request #2884 from alexklibisz/issue-2877-reproduction

Issue #2877: Fix "Unable to bump version" when using a val version in libraryDependencies ++= Seq(...)

Author: fthomas

modules/core/src/main/scala/org/scalasteward/core/edit/update/data/ModulePosition.scala

@@ -29,5 +29,5 @@ final case class ModulePosition(
     version: Substring.Position
 ) {
   def unwrappedVersion: String =
-    version.value.dropWhile(Set('"', '$', '{')).reverse.dropWhile(Set('"', '}')).reverse
+    version.value.dropWhile(Set('"', '$', '{')).reverse.dropWhile(Set('"', '}', ',')).reverse
 }

modules/core/src/test/scala/org/scalasteward/core/edit/RewriteTest.scala

@@ -840,6 +840,58 @@ class RewriteTest extends FunSuite {
     runApplyUpdate(update, original, expected)
   }
 
+  test("issue-2877: sbt using same version in a val and a literal using a Seq addition") {
+    val update = ("org.scalatest".g % Nel.of(
+      "scalatest".a,
+      "scalactic".a
+    ) % "3.2.13" %> "3.2.14").group
+    val original = Map(
+      "build.sbt" ->
+        """
+          |val ScalaTestVersion = "3.2.13"
+          |libraryDependencies ++= Seq(
+          |  "org.scalatest" %% "scalatest" % ScalaTestVersion,
+          |  "org.scalatest" %% "scalactic" % "3.2.13"
+          |)
+          |""".stripMargin
+    )
+    val expected = Map(
+      "build.sbt" ->
+        """
+          |val ScalaTestVersion = "3.2.14"
+          |libraryDependencies ++= Seq(
+          |  "org.scalatest" %% "scalatest" % ScalaTestVersion,
+          |  "org.scalatest" %% "scalactic" % "3.2.14"
+          |)
+          |""".stripMargin
+    )
+    runApplyUpdate(update, original, expected)
+  }
+
+  test("issue-2877: sbt using same version in a val and a literal using individual additions") {
+    val update = ("org.scalatest".g % Nel.of(
+      "scalatest".a,
+      "scalactic".a
+    ) % "3.2.13" %> "3.2.14").group
+    val original = Map(
+      "build.sbt" ->
+        """
+          |val ScalaTestVersion = "3.2.13"
+          |libraryDependencies += "org.scalatest" %% "scalatest" % ScalaTestVersion
+          |libraryDependencies += "org.scalatest" %% "scalactic" % "3.2.13"
+          |""".stripMargin
+    )
+    val expected = Map(
+      "build.sbt" ->
+        """
+          |val ScalaTestVersion = "3.2.14"
+          |libraryDependencies += "org.scalatest" %% "scalatest" % ScalaTestVersion
+          |libraryDependencies += "org.scalatest" %% "scalactic" % "3.2.14"
+          |""".stripMargin
+    )
+    runApplyUpdate(update, original, expected)
+  }
+
   private def runApplyUpdate(
       update: Update.Single,
       files: Map[String, String],