Skip to content

Commit

Permalink
Merge pull request #57 from danicheg/detouch-vscode-scala
Browse files Browse the repository at this point in the history
Detouch `vscode-scala`
  • Loading branch information
SethTisue authored Nov 26, 2023
2 parents 22ffa42 + a4e30f6 commit 4b44c11
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 48 deletions.
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
[submodule "vscode-scala"]
path = vscode-scala
url = git@github.com:scalacenter/vscode-scala-profiledb.git
branch = profiledb-integration
[submodule "FlameGraph"]
path = FlameGraph
url = git@github.com:jvican/FlameGraph.git
5 changes: 0 additions & 5 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,3 @@ align.openParenDefnSite = false
binPack.literalArgumentLists = true
project.git = true
trailingCommas = preserve

# exclude submodules
project.excludeFilters = [
"vscode-scala/"
]
35 changes: 0 additions & 35 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -115,41 +115,6 @@ lazy val plugin = project
assembly / test := {}
)

// Trick to copy profiledb with Scala 2.11.11 so that vscode can depend on it
// lazy val profiledb211 = profiledb
// .copy(id = "profiledb-211")
// .settings(
// moduleName := "profiledb",
// scalaVersion := (scalaVersion in VscodeImplementation).value,
// // Redefining target so that sbt doesn't clash at runtime
// // This makes sense, but we should get a more sensible error message.
// target := (baseDirectory in profiledb).value./("target_211")
// )

// This is the task to publish the vscode integration
// val publishExtension = taskKey[Unit]("The task to publish the vscode extension.")

// Has to be in independent project because uses different Scala version
// lazy val vscodeIntegration = project
// .in(file(".hidden"))
// .dependsOn(VscodeImplementation, profiledb211)
// .settings(
// scalaVersion := (scalaVersion in VscodeImplementation).value,
// libraryDependencies in VscodeImplementation += (projectID in profiledb211).value,
// // Sbt bug: doing this for VscodeImplementation just doesn't work.
// update := update.dependsOn(publishLocal in profiledb211).value,
// publish := (publish in VscodeImplementation).dependsOn(publish in profiledb211).value,
// publishLocal :=
// (publishLocal in VscodeImplementation).dependsOn(publishLocal in profiledb211).value,
// publishExtension := (Def
// .task {
// val scalaExtensionDir = (baseDirectory in VscodeScala).value./("scala")
// sys.process.Process(Seq("vsce", "package"), scalaExtensionDir).!!
// })
// .dependsOn(publishLocal)
// .value
// )
//
lazy val profilingSbtPlugin = project
.in(file("sbt-plugin"))
.settings(
Expand Down
3 changes: 0 additions & 3 deletions project/BuildPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ object BuildKeys {
final val AbsolutePath = file(".").getCanonicalFile.getAbsolutePath
final val HomeBuild = BuildRef(RootProject(file(AbsolutePath)).build)

// final val VscodeScala = RootProject(file(s"$AbsolutePath/vscode-scala"))
// final val VscodeImplementation = ProjectRef(VscodeScala.build, "ensime-lsp")

// Source dependencies from git are cached by sbt
val BetterFiles = RootProject(
uri(
Expand Down
1 change: 0 additions & 1 deletion vscode-scala
Submodule vscode-scala deleted from 15630a

0 comments on commit 4b44c11

Please sign in to comment.