Skip to content

Commit

Permalink
Merge pull request #1833 from olafurpg/no-pants
Browse files Browse the repository at this point in the history
Remove fastpass command line tool
  • Loading branch information
tgodzik authored Jun 25, 2020
2 parents 91f5d53 + 24d5858 commit cc6038b
Show file tree
Hide file tree
Showing 64 changed files with 18 additions and 4,071 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ jobs:
sbt,
maven,
gradle,
pants,
mill,
feature,
cross,
Expand All @@ -87,10 +86,6 @@ jobs:
command: bin/test.sh 'slow/testOnly -- tests.gradle.*'
name: Gradle integration
os: ubuntu-latest
- type: pants
command: bin/test.sh 'slow/testOnly -- tests.pants.*'
name: Pants integration
os: ubuntu-latest
- type: mill
command: bin/test.sh 'slow/testOnly -- tests.mill.*'
name: Mill integration
Expand Down
30 changes: 3 additions & 27 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -403,10 +403,8 @@ lazy val metals = project
"com.outr" %% "scribe-slf4j" % "2.7.12", // needed for flyway database migrations
// for debugging purposes, not strictly needed but nice for productivity
"com.lihaoyi" %% "pprint" % "0.5.9",
// For exporting Pants builds.
// for JSON formatted doctor
"com.lihaoyi" %% "ujson" % "1.1.0",
"ch.epfl.scala" %% "bloop-config" % V.bloop,
"ch.epfl.scala" %% "bloop-frontend" % V.bloop,
// For remote language server
"com.lihaoyi" %% "requests" % "0.6.2",
// for producing SemanticDB from Scala source files
Expand Down Expand Up @@ -441,32 +439,10 @@ lazy val metals = project
"scala212" -> V.scala212,
"scala213" -> V.scala213,
"scala3" -> V.scala3
),
mainClass in GraalVMNativeImage := Some(
"scala.meta.internal.pantsbuild.BloopPants"
),
graalVMNativeImageOptions ++= {
val reflectionFile =
Keys.sourceDirectory.in(Compile).value./("graal")./("reflection.json")
assert(reflectionFile.exists, "no such file: " + reflectionFile)
List(
"-H:+ReportUnsupportedElementsAtRuntime",
"--initialize-at-build-time",
"--initialize-at-run-time=scala.meta.internal.pantsbuild,metaconfig",
"--no-server",
"--enable-http",
"--enable-https",
"-H:EnableURLProtocols=http,https",
"--enable-all-security-services",
"--no-fallback",
s"-H:ReflectionConfigurationFiles=$reflectionFile",
"--allow-incomplete-classpath",
"-H:+ReportExceptionStackTraces"
)
}
)
)
.dependsOn(mtags)
.enablePlugins(BuildInfoPlugin, GraalVMNativeImagePlugin)
.enablePlugins(BuildInfoPlugin)

lazy val input = project
.in(file("tests/input"))
Expand Down
193 changes: 0 additions & 193 deletions metals/src/main/resources/pants

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ final class BuildTools(
SbtBuildTool(workspaceVersion = None, userConfig),
GradleBuildTool(userConfig),
MavenBuildTool(userConfig),
MillBuildTool(userConfig),
PantsBuildTool(userConfig)
MillBuildTool(userConfig)
)
}

Expand All @@ -95,7 +94,6 @@ final class BuildTools(
if (isGradle) buf += GradleBuildTool(userConfig)
if (isMaven) buf += MavenBuildTool(userConfig)
if (isMill) buf += MillBuildTool(userConfig)
if (isPants) buf += PantsBuildTool(userConfig)

buf.result()
}
Expand All @@ -111,7 +109,6 @@ final class BuildTools(
else if (isGradle) GradleBuildTool.isGradleRelatedPath(workspace, path)
else if (isMaven) MavenBuildTool.isMavenRelatedPath(workspace, path)
else if (isMill) MillBuildTool.isMillRelatedPath(workspace, path)
else if (isPants) PantsBuildTool.isPantsRelatedPath(workspace, path)
else false
}
}
Expand Down
Loading

0 comments on commit cc6038b

Please sign in to comment.