Skip to content

Add support for Scala 2.11 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@ name := "scala-collection-compat"

version := "0.1-SNAPSHOT"

unmanagedSourceDirectories in Compile ++=
(if(scalaVersion.value.startsWith("2.13.")) Seq((sourceDirectory in Compile).value / "scala-2.13") else Seq())
resolvers += "scala-pr" at "https://scala-ci.typesafe.com/artifactory/scala-integration/"

crossScalaVersions := Seq("2.12.4", "2.13.0-M4-pre-20d3c21")
unmanagedSourceDirectories in Compile += (
if(scalaVersion.value.startsWith("2.13.")) (sourceDirectory in Compile).value / "scala-2.13"
else (sourceDirectory in Compile).value / "scala-2.11_2.12"
)

crossScalaVersions := Seq("2.12.5", "2.13.0-M4-pre-20d3c21", "2.11.12")

scalaVersion := crossScalaVersions.value.head

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ object ImmutableArray {
final class ofRef[T <: AnyRef](val unsafeArray: Array[T]) extends ImmutableArray[T] with Serializable {
lazy val elemTag = ClassTag[T](unsafeArray.getClass.getComponentType)
def length: Int = unsafeArray.length
def apply(index: Int): T = unsafeArray(index).asInstanceOf[T]
def apply(index: Int): T = unsafeArray(index)
def update(index: Int, elem: T) { unsafeArray(index) = elem }
override def hashCode = MurmurHash3.wrappedArrayHash(unsafeArray)
override def hashCode = MurmurHash3.arrayHash(unsafeArray, MurmurHash3.seqSeed)
override def equals(that: Any) = that match {
case that: ofRef[_] => Arrays.equals(unsafeArray.asInstanceOf[Array[AnyRef]], that.unsafeArray.asInstanceOf[Array[AnyRef]])
case _ => super.equals(that)
Expand All @@ -108,7 +108,7 @@ object ImmutableArray {
def length: Int = unsafeArray.length
def apply(index: Int): Byte = unsafeArray(index)
def update(index: Int, elem: Byte) { unsafeArray(index) = elem }
override def hashCode = MurmurHash3.wrappedBytesHash(unsafeArray)
override def hashCode = MurmurHash3.bytesHash(unsafeArray, MurmurHash3.seqSeed)
override def equals(that: Any) = that match {
case that: ofByte => Arrays.equals(unsafeArray, that.unsafeArray)
case _ => super.equals(that)
Expand All @@ -120,7 +120,7 @@ object ImmutableArray {
def length: Int = unsafeArray.length
def apply(index: Int): Short = unsafeArray(index)
def update(index: Int, elem: Short) { unsafeArray(index) = elem }
override def hashCode = MurmurHash3.wrappedArrayHash(unsafeArray)
override def hashCode = MurmurHash3.arrayHash(unsafeArray, MurmurHash3.seqSeed)
override def equals(that: Any) = that match {
case that: ofShort => Arrays.equals(unsafeArray, that.unsafeArray)
case _ => super.equals(that)
Expand All @@ -132,7 +132,7 @@ object ImmutableArray {
def length: Int = unsafeArray.length
def apply(index: Int): Char = unsafeArray(index)
def update(index: Int, elem: Char) { unsafeArray(index) = elem }
override def hashCode = MurmurHash3.wrappedArrayHash(unsafeArray)
override def hashCode = MurmurHash3.arrayHash(unsafeArray, MurmurHash3.seqSeed)
override def equals(that: Any) = that match {
case that: ofChar => Arrays.equals(unsafeArray, that.unsafeArray)
case _ => super.equals(that)
Expand All @@ -144,7 +144,7 @@ object ImmutableArray {
def length: Int = unsafeArray.length
def apply(index: Int): Int = unsafeArray(index)
def update(index: Int, elem: Int) { unsafeArray(index) = elem }
override def hashCode = MurmurHash3.wrappedArrayHash(unsafeArray)
override def hashCode = MurmurHash3.arrayHash(unsafeArray, MurmurHash3.seqSeed)
override def equals(that: Any) = that match {
case that: ofInt => Arrays.equals(unsafeArray, that.unsafeArray)
case _ => super.equals(that)
Expand All @@ -156,7 +156,7 @@ object ImmutableArray {
def length: Int = unsafeArray.length
def apply(index: Int): Long = unsafeArray(index)
def update(index: Int, elem: Long) { unsafeArray(index) = elem }
override def hashCode = MurmurHash3.wrappedArrayHash(unsafeArray)
override def hashCode = MurmurHash3.arrayHash(unsafeArray, MurmurHash3.seqSeed)
override def equals(that: Any) = that match {
case that: ofLong => Arrays.equals(unsafeArray, that.unsafeArray)
case _ => super.equals(that)
Expand All @@ -168,7 +168,7 @@ object ImmutableArray {
def length: Int = unsafeArray.length
def apply(index: Int): Float = unsafeArray(index)
def update(index: Int, elem: Float) { unsafeArray(index) = elem }
override def hashCode = MurmurHash3.wrappedArrayHash(unsafeArray)
override def hashCode = MurmurHash3.arrayHash(unsafeArray, MurmurHash3.seqSeed)
override def equals(that: Any) = that match {
case that: ofFloat => Arrays.equals(unsafeArray, that.unsafeArray)
case _ => super.equals(that)
Expand All @@ -180,7 +180,7 @@ object ImmutableArray {
def length: Int = unsafeArray.length
def apply(index: Int): Double = unsafeArray(index)
def update(index: Int, elem: Double) { unsafeArray(index) = elem }
override def hashCode = MurmurHash3.wrappedArrayHash(unsafeArray)
override def hashCode = MurmurHash3.arrayHash(unsafeArray, MurmurHash3.seqSeed)
override def equals(that: Any) = that match {
case that: ofDouble => Arrays.equals(unsafeArray, that.unsafeArray)
case _ => super.equals(that)
Expand All @@ -192,7 +192,7 @@ object ImmutableArray {
def length: Int = unsafeArray.length
def apply(index: Int): Boolean = unsafeArray(index)
def update(index: Int, elem: Boolean) { unsafeArray(index) = elem }
override def hashCode = MurmurHash3.wrappedArrayHash(unsafeArray)
override def hashCode = MurmurHash3.arrayHash(unsafeArray, MurmurHash3.seqSeed)
override def equals(that: Any) = that match {
case that: ofBoolean => Arrays.equals(unsafeArray, that.unsafeArray)
case _ => super.equals(that)
Expand All @@ -204,7 +204,7 @@ object ImmutableArray {
def length: Int = unsafeArray.length
def apply(index: Int): Unit = unsafeArray(index)
def update(index: Int, elem: Unit) { unsafeArray(index) = elem }
override def hashCode = MurmurHash3.wrappedArrayHash(unsafeArray)
override def hashCode = MurmurHash3.arrayHash(unsafeArray, MurmurHash3.seqSeed)
override def equals(that: Any) = that match {
case that: ofUnit => unsafeArray.length == that.unsafeArray.length
case _ => super.equals(that)
Expand Down