Skip to content
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

Updated dependencies #287

Merged
merged 1 commit into from
Sep 25, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,9 @@ abstract class AbstractCompartment() extends CompartmentApi {

override def equals(o: Any): Boolean =
o match {
case other: IPlayer[_, _] => playerEquality.equalsPlayer(this, other)
case other: AnyRef => playerEquality.equalsAny(this, other)
case null => false
case other: IPlayer[W @unchecked, _] => playerEquality.equalsPlayer(this, other)
case other: AnyRef => playerEquality.equalsAny(this, other)
case null => false
}

override def hashCode(): Int = wrapped.hashCode()
Expand Down
14 changes: 7 additions & 7 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ object Dependencies extends Dependencies
trait Dependencies {

object v {
val scalaVersion = "3.2.2"
val akkaVersion = "2.7.0"
val scalatestVersion = "3.2.15"
val chocoVersion = "4.10.12"
val guavaVersion = "31.1-jre"
val emfcommonVersion = "2.28.0"
val emfecoreVersion = "2.33.0"
val scalaVersion = "3.3.1"
val akkaVersion = "2.8.5"
val scalatestVersion = "3.2.17"
val chocoVersion = "4.10.13"
val guavaVersion = "32.1.2-jre"
val emfcommonVersion = "2.29.0"
val emfecoreVersion = "2.35.0"
val umlVersion = "3.1.0.v201006071150"
val jvm = "1.8"
}
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.8.2
sbt.version=1.9.6
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.17")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.4")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.6")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,25 @@ import scroll.tests.mocks.CoreA

class RoleSortingTest extends AbstractParameterizedSCROLLTest {

private case class SomeRoleA() {
def method(): String = "A"
}

private case class SomeRoleB() {
def method(): String = "B"
}

private case class SomeRoleC() {
def method(): String = "C"
}

test("Adding roles and sorting them") {
forAll(PARAMS) { (c: Boolean, cc: Boolean) =>
val someCore = new CoreA()
new CompartmentUnderTest(c, cc) {

case class SomeRoleA() {
def method(): String = "A"
}

case class SomeRoleB() {
def method(): String = "B"
}

case class SomeRoleC() {
def method(): String = "C"
}

val roleA = SomeRoleA()
val roleB = SomeRoleB()
val roleC = SomeRoleC()
private val roleA = SomeRoleA()
private val roleB = SomeRoleB()
private val roleC = SomeRoleC()
someCore play roleA
someCore play roleB
someCore play roleC
Expand Down Expand Up @@ -65,33 +64,36 @@ class RoleSortingTest extends AbstractParameterizedSCROLLTest {
}
}

class SomeCore {
private class SomeCore {
def method(): String = "Core"
}

test("Adding roles with cyclic calls and sorting them") {
forAll(PARAMS) { (c: Boolean, cc: Boolean) =>
val someCore = new SomeCore()
new CompartmentUnderTest(c, cc) {
private case class SomeRoleD() {

case class SomeRoleA() {
def method(): String = {
given DispatchQuery = Bypassing(_.isInstanceOf[SomeRoleA])
given DispatchQuery = Bypassing(_.isInstanceOf[this.type])
(+this).method()
}

}

case class SomeRoleB() {
private case class SomeRoleE() {

def method(): String = {
given DispatchQuery = DispatchQuery().sortedWith(reverse)
(+this).method()
}

}

val roleA = SomeRoleA()
val roleB = SomeRoleB()
someCore play roleA
someCore play roleB
private val roleD = SomeRoleD()
private val roleE = SomeRoleE()
someCore play roleD
someCore play roleE
val r1: String = (+someCore).method()
r1 shouldBe "Core"
}
Expand Down