fix: IntMap class duplication issue (#177)

* Moving scala-lang to provided deps * Refactor IntMap for class duplication issues --------- Co-authored-by: Marek Wiewiórka <[email protected]>
biodatageeks · Jul 21, 2024 · b28eae1 · b28eae1
1 parent 561dc10
commit b28eae1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -45,7 +45,7 @@ libraryDependencies += "com.holdenkarau" %% "spark-testing-base" % "3.4.1_1.4.4"
 libraryDependencies += "org.bdgenomics.adam" %% "adam-core-spark3" % "1.0.1" excludeAll (ExclusionRule("org.seqdoop"))
 libraryDependencies += "org.bdgenomics.adam" %% "adam-apis-spark3" % "1.0.1" excludeAll (ExclusionRule("org.seqdoop"))
 libraryDependencies += "org.bdgenomics.adam" %% "adam-cli-spark3" % "1.0.1" excludeAll (ExclusionRule("org.seqdoop"))
-libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value
+libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value % "provided"
 libraryDependencies += "org.rogach" %% "scallop" % "3.1.2"
 libraryDependencies += "com.github.samtools" % "htsjdk" % "2.24.1"
 libraryDependencies += "ch.cern.sparkmeasure" %% "spark-measure" % "0.17" excludeAll (ExclusionRule("org.apache.hadoop"))

diff --git a/src/main/scala/org/biodatageeks/sequila/utils/IntMap.scala b/src/main/scala/org/biodatageeks/sequila/utils/IntMap.scala
@@ -470,7 +470,7 @@ object IntMap {
     *
     *  This builder can be reused to create multiple instances.
     */
-  final class IntMapBuilder[V] extends ReusableBuilder[(Int, V), IntMap[V]] {
+  final class IntMapBuilder[V] extends ReusableMapBuilder[(Int, V), IntMap[V]] {
     private[collection] var elems: IntMap[V] = new IntMap[V]
     def +=(entry: (Int, V)): this.type = {
       elems += entry
@@ -521,7 +521,7 @@ object IntMap {
   }
 }
 
-trait ReusableBuilder[-Elem, +To] extends mutable.Builder[Elem, To] {
+trait ReusableMapBuilder[-Elem, +To] extends mutable.Builder[Elem, To] {
   /** Clears the contents of this builder.
     *  After execution of this method, the builder will contain no elements.
     *