Skip to content

Commit

Permalink
Dependencies resolution workaround no longer needed (#1498)
Browse files Browse the repository at this point in the history
  • Loading branch information
Michal Sitko authored Jun 15, 2022
1 parent 8b86dcb commit 496153b
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 12 deletions.
3 changes: 0 additions & 3 deletions console/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % Versions.scalatest % Test
)

// A temporary (hopefully) workaround for https://github.com/eclipse-equinox/equinox.bundles/issues/54
dependencyOverrides += "org.eclipse.platform" % "org.eclipse.equinox.preferences" % "3.9.100"

Test / packageBin / publishArtifact := true

scalacOptions ++= Seq(
Expand Down
3 changes: 0 additions & 3 deletions joern-cli/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % Versions.scalatest % Test
)

// A temporary (hopefully) workaround for https://github.com/eclipse-equinox/equinox.bundles/issues/54
dependencyOverrides += "org.eclipse.platform" % "org.eclipse.equinox.preferences" % "3.9.100"

enablePlugins(UniversalPlugin)
enablePlugins(JavaAppPackaging)
//wildcard import from staged `lib` dir, for simplicity and also to avoid `line too long` error on windows
Expand Down
3 changes: 0 additions & 3 deletions joern-cli/frontends/c2cpg/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % Versions.scalatest % Test
)

// A temporary (hopefully) workaround for https://github.com/eclipse-equinox/equinox.bundles/issues/54
dependencyOverrides += "org.eclipse.platform" % "org.eclipse.equinox.preferences" % "3.9.100"

Test / packageBin / publishArtifact := true

Compile / doc / scalacOptions ++= Seq("-doc-title", "semanticcpg apidocs", "-doc-version", version.value)
Expand Down
3 changes: 0 additions & 3 deletions querydb/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % Versions.scalatest % Test
)

// A temporary (hopefully) workaround for https://github.com/eclipse-equinox/equinox.bundles/issues/54
dependencyOverrides += "org.eclipse.platform" % "org.eclipse.equinox.preferences" % "3.9.100"

topLevelDirectory := Some(name.value)

lazy val createDistribution = taskKey[File]("Create binary distribution of extension")
Expand Down

0 comments on commit 496153b

Please sign in to comment.