Skip to content

Commit

Permalink
Remove launcher modules
Browse files Browse the repository at this point in the history
  • Loading branch information
alexarchambault committed Jul 5, 2022
1 parent 59dd6aa commit c18e6e0
Show file tree
Hide file tree
Showing 12 changed files with 0 additions and 1,281 deletions.
22 changes: 0 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,28 +69,6 @@ jobs:
"jsBridge1/test" \
shell: bash

launcher:
name: Launcher tests
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
jdk: [graalvm-ce-java11@21.1.0]
steps:
- uses: actions/checkout@v2
with:
submodules: true
- uses: olafurpg/setup-scala@v13
with:
java-version: ${{ matrix.jdk }}
- name: Tests
run: |
echo $JAVA_HOME
which gu && gu install native-image
./bin/sbt-ci.sh "install" "launcherTest/test"
shell: bash

test:
runs-on: ${{ matrix.os }}
strategy:
Expand Down
77 changes: 0 additions & 77 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -482,76 +482,6 @@ lazy val bloopgunShaded213 = project
.settings(bloopgunShadedSettings)
.settings(scalaVersion := Dependencies.Scala213Version)

lazy val launcherTest = project
.in(file("launcher-test"))
.disablePlugins(ScriptedPlugin)
.dependsOn(launcher, frontend % "test->test")
.settings(scalafixSettings)
.settings(testSuiteSettings)
.settings(
name := "bloop-launcher-test",
(Test / fork) := true,
(Test / parallelExecution) := false,
libraryDependencies ++= List(
Dependencies.coursierInterface
)
)

lazy val launcher = project
.in(file("launcher-core"))
.disablePlugins(ScriptedPlugin)
.disablePlugins(ScalafixPlugin)
.dependsOn(sockets, bloopgun)
.settings(testSuiteSettings)
.settings(
name := "bloop-launcher-core",
target := (file("launcher-core") / "target" / "launcher-2.12").getAbsoluteFile
)

lazy val launcher213 = project
.in(file("launcher-core"))
.disablePlugins(ScriptedPlugin)
.disablePlugins(ScalafixPlugin)
.dependsOn(sockets, bloopgun213)
.settings(testSuiteSettings)
.settings(
name := "bloop-launcher-core",
scalaVersion := Dependencies.Scala213Version,
target := (file("launcher-core") / "target" / "launcher-2.13").getAbsoluteFile
)

lazy val launcherShadedSettings = Seq(
name := "bloop-launcher",
(run / fork) := true,
(Test / fork) := true,
(Compile / bloopGenerate) := None,
(Test / bloopGenerate) := None,
libraryDependencies ++= List(
"net.java.dev.jna" % "jna" % "4.5.0",
"net.java.dev.jna" % "jna-platform" % "4.5.0",
Dependencies.scalaCollectionCompat
)
)

lazy val launcherShaded = project
.in(file("launcher-core/target/shaded-module-2.12"))
.disablePlugins(ScriptedPlugin)
.disablePlugins(SbtJdiTools)
.enablePlugins(BloopShadingPlugin)
.settings(shadedModuleSettings)
.settings(shadeSettingsForModule("bloop-launcher-core", launcher))
.settings(launcherShadedSettings)

lazy val launcherShaded213 = project
.in(file("launcher-core/target/shaded-module-2.13"))
.disablePlugins(ScriptedPlugin)
.disablePlugins(SbtJdiTools)
.enablePlugins(BloopShadingPlugin)
.settings(shadedModuleSettings)
.settings(shadeSettingsForModule("bloop-launcher-core", launcher213))
.settings(launcherShadedSettings)
.settings(scalaVersion := Dependencies.Scala213Version)

lazy val bloop4j = project
.disablePlugins(ScriptedPlugin)
.dependsOn(jsonConfig212.jvm)
Expand Down Expand Up @@ -887,9 +817,6 @@ val allProjects = Seq(
nativeBridge04,
jsBridge06,
jsBridge1,
launcher,
launcher213,
launcherTest,
sockets,
bloopgun,
bloopgun213
Expand Down Expand Up @@ -920,10 +847,6 @@ val allProjectsToRelease = Seq[ProjectReference](
bloopgunShaded,
bloopgun213,
bloopgunShaded213,
launcher,
launcherShaded,
launcher213,
launcherShaded213,
buildpressConfig,
buildpress
)
Expand Down

This file was deleted.

181 changes: 0 additions & 181 deletions launcher-core/src/main/scala/bloop/launcher/Launcher.scala

This file was deleted.

11 changes: 0 additions & 11 deletions launcher-core/src/main/scala/bloop/launcher/LauncherStatus.scala

This file was deleted.

0 comments on commit c18e6e0

Please sign in to comment.