util-tunable: Scala3 support

Author: felixbr

build.sbt

@@ -98,7 +98,7 @@ val defaultScala3EnabledSettings = Seq(
 
 // Our dependencies or compiler options may differ for both Scala 2 and 3. We branch here
 // to account for there differences but should merge these artifacts as they are updated.
-val scalaDependencies = Seq("org.scala-lang.modules" %% "scala-collection-compat" % "2.4.4")
+val scalaDependencies = Seq("org.scala-lang.modules" %% "scala-collection-compat" % "2.7.0")
 val scala2cOptions = Seq(
   "-target:jvm-1.8",
   // Needs -missing-interpolator due to https://issues.scala-lang.org/browse/SI-8761
@@ -210,13 +210,15 @@ val baseSettings = Seq(
 val sharedSettings =
   baseSettings ++
     defaultScalaSettings ++
-    Seq(libraryDependencies ++= scala2Dependencies)
+    Seq(libraryDependencies ++= scala2Dependencies) ++
+    // This doesn't really do much except when trying to compile modules with Scala 3 which don't support it yet,
+    // instead of failing during "update" due to conflicting _2.13 _3 suffixes it will fail during compilation.
+    Seq(excludeDependencies ++= Seq("org.scala-lang.modules" % "scala-collection-compat_3"))
 
 val sharedScala3EnabledSettings =
   baseSettings ++
     defaultScala3EnabledSettings ++
-    Seq(libraryDependencies ++= scala3Dependencies) ++
-    Seq(excludeDependencies ++= Seq("org.scala-lang.modules" % "scala-collection-compat_3"))
+    Seq(libraryDependencies ++= scala3Dependencies)
 
 // settings for projects that are cross compiled with scala 2.10
 val settingsCrossCompiledWithTwoTen =
@@ -461,7 +463,7 @@ lazy val utilFunction = Project(
   id = "util-function",
   base = file("util-function")
 ).settings(
-    sharedSettings
+    sharedScala3EnabledSettings
   ).settings(
     name := "util-function"
   )
@@ -718,7 +720,7 @@ lazy val utilTunable = Project(
   id = "util-tunable",
   base = file("util-tunable")
 ).settings(
-    sharedSettings
+    sharedScala3EnabledSettings
   ).settings(
     name := "util-tunable",
     libraryDependencies ++= Seq(