Skip to content

Commit

Permalink
scala 3.5.2, upgrade deps
Browse files Browse the repository at this point in the history
  • Loading branch information
mpollmeier committed Dec 11, 2024
1 parent d991052 commit 9604705
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 88 deletions.
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name := "flatgraph"
ThisBuild / organization := "io.joern"
ThisBuild / scalaVersion := scala3

val slf4jVersion = "2.0.7"
val scala3 = "3.4.3"
val slf4jVersion = "2.0.16"
val scala3 = "3.5.2"
val scala2_12 = "2.12.20"

/** Only the below listed projects are included in things like `sbt compile`.
Expand All @@ -27,7 +27,7 @@ lazy val core = project
.settings(
name := "flatgraph-core",
libraryDependencies ++= Seq(
"com.lihaoyi" %% "ujson" % "3.3.1",
"com.lihaoyi" %% "ujson" % "4.0.2",
"com.github.luben" % "zstd-jni" % "1.5.6-8",
"org.slf4j" % "slf4j-api" % slf4jVersion,
)
Expand All @@ -50,7 +50,7 @@ lazy val formats = project
.settings(
name := "flatgraph-formats",
libraryDependencies ++= Seq(
"com.github.tototoshi" %% "scala-csv" % "1.4.1",
"com.github.tototoshi" %% "scala-csv" % "2.0.0",
"org.scala-lang.modules" %% "scala-xml" % "2.3.0",
"io.spray" %% "spray-json" % "1.3.6",
"com.github.scopt" %% "scopt" % "4.1.0",
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/flatgraph/Accessors.scala
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ object Accessors {

def getNodeProperties(node: GNode): IterableOnce[(String, IndexedSeq[Any])] = {
for {
(propertyKind, value) <- _getNodeProperties(node)
(propertyKind, value) <- _getNodeProperties(node).iterator
schema = node.graph.schema
} yield schema.getPropertyLabel(node.nodeKind, propertyKind) -> value
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/flatgraph/misc/DebugDump.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ object DebugDump {

private def unpack(s: Any): Option[Object] = {
s match {
case iter: IterableOnce[AnyRef @uncheckedVariance] =>
case iter: IterableOnce[?] =>
val res = iter.iterator.toSeq
if (res.isEmpty) None
else if (res.size == 1) Some(res.head)
else if (res.size == 1) Some(res.head.asInstanceOf[AnyRef])
else Some(res)
case obj: java.lang.Object => Some(obj)
case _ => null
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/flatgraph/misc/TestUtils.scala
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ object TestUtils {
// second pass: set node properties
val diffGraphForProperties = new DiffGraphBuilder(targetGraph.schema)
for {
(propertyKind, value) <- Accessors._getNodeProperties(node)
(propertyKind, value) <- Accessors._getNodeProperties(node).iterator
} diffGraphForProperties._setNodeProperty(nodeInTargetGraph, propertyKind, value)

DiffGraphApplier.applyDiff(targetGraph, diffGraphForProperties)
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.10.5
sbt.version=1.10.6
79 changes: 0 additions & 79 deletions updateDependencies.sh

This file was deleted.

0 comments on commit 9604705

Please sign in to comment.