Commit a662c99

committed

Bump Scala version to 3.3.0 LTS

1 parent 5f8de10 commit a662c99Copy full SHA for a662c99

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`name := "Advent of Code"`
`2`	`2`
`3`		`-scalaVersion := "3.2.1"`
	`3`	`+scalaVersion := "3.3.0"`
`4`	`4`
`5`	`5`	`scalacOptions ++= Seq(`
`6`	`6`	`"-deprecation",`
`@@ -10,5 +10,5 @@ scalacOptions ++= Seq(`
`10`	`10`	`"-unchecked")`
`11`	`11`
`12`	`12`	`libraryDependencies ++= Seq(`
`13`		`- "org.scalatest" %% "scalatest" % "3.2.14" % Test`
	`13`	`+ "org.scalatest" %% "scalatest" % "3.2.16" % Test`
`14`	`14`	`)`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package AdventOfCode2021`
`2`	`2`
`3`		`-import scala.util.control.NonLocalReturns.*`
	`3`	`+import scala.util.boundary`
	`4`	`+import scala.util.boundary.break`
`4`	`5`
`5`	`6`	`object Day19:`
`6`	`7`	`case class Beacon(x: Int, y: Int, z: Int):`
`@@ -24,7 +25,7 @@ object Day19:`
`24`	`25`	`Scanner(block.trim.split("\n").tail.map(_.trim.split(",").map(_.toInt)).map(a => Beacon(a(0), a(1), a(2))).toSeq)`
`25`	`26`	`}`
`26`	`27`
`27`		`- def findMatch(firstScanner: Scanner, candidate: Scanner): Option[(Scanner, Beacon)] = returning {`
	`28`	`+ def findMatch(firstScanner: Scanner, candidate: Scanner): Option[(Scanner, Beacon)] = boundary {`
`28`	`29`	`for`
`29`	`30`	`secondScanner <- candidate.permutations`
`30`	`31`	`if secondScanner.deltas.intersect(firstScanner.deltas).size > 12 * 11`
`@@ -33,7 +34,7 @@ object Day19:`
`33`	`34`	`firstBeacon <- firstScanner.beacons`
`34`	`35`	`secondBeacon <- secondScanner.beacons`
`35`	`36`	`if secondScanner.beacons.map(_ + firstBeacon - secondBeacon).toSet.intersect(firstScanner.beacons.toSet).size >= 12`
`36`		`- do throwReturn(Some((secondScanner, firstBeacon - secondBeacon)))`
	`37`	`+ do break(Some((secondScanner, firstBeacon - secondBeacon)))`
`37`	`38`	`None`
`38`	`39`	`}`
`39`	`40`

Comments

(0)