From f074a2c58c4e48f310dcd5a7a332aab2b81acc7e Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sun, 17 Mar 2024 04:54:20 -0400
Subject: [PATCH] 2.0.0-alpha10-SNAPSHOT

---
 build.sbt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.sbt b/build.sbt
index 465f7762e..7a291e72d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -10,10 +10,10 @@ import scala.util.Try
 // ThisBuild settings take lower precedence,
 // but can be shared across the multi projects.
 ThisBuild / version := {
-  val v = "2.0.0-alpha9-SNAPSHOT"
+  val v = "2.0.0-alpha10-SNAPSHOT"
   nightlyVersion.getOrElse(v)
 }
-ThisBuild / version2_13 := "2.0.0-alpha9-SNAPSHOT"
+ThisBuild / version2_13 := "2.0.0-alpha10-SNAPSHOT"
 ThisBuild / versionScheme := Some("early-semver")
 ThisBuild / scalafmtOnCompile := !(Global / insideCI).value
 ThisBuild / Test / scalafmtOnCompile := !(Global / insideCI).value
@@ -265,6 +265,7 @@ val collectionProj = project
       case _                               => Seq(scalaPar)
     }),
     mimaSettings,
+    conflictWarning := ConflictWarning.disable,
   )
 
 // Command line-related utilities.
@@ -471,6 +472,7 @@ lazy val testingProj = (project in file("testing"))
       sjsonNewScalaJson.value,
       sjsonNewCore.value,
     ),
+    conflictWarning := ConflictWarning.disable,
     Compile / managedSourceDirectories +=
       baseDirectory.value / "src" / "main" / "contraband-scala",
     Compile / generateContrabands / sourceManaged := baseDirectory.value / "src" / "main" / "contraband-scala",