Skip to content

Commit 45b40b4

Browse files
Update nailgun (use custom fork)
And: - remove nailgun sub-repo - temporarily copy ng.py stuff here
1 parent 94c61fe commit 45b40b4

File tree

14 files changed

+1238
-350
lines changed

14 files changed

+1238
-350
lines changed

.github/setup-test-projects.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44
cd frontend/src/test/resources/
55

66
for d in *; do
7-
if test -d "$d"; then
7+
if test -f "$d/build.sbt"; then
88
cd "$d"
99
sbt bloopInstall
1010
cd -

.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,3 @@
22
path = zinc
33
url = https://github.com/scalacenter/zinc.git
44
branch = loop
5-
[submodule "nailgun"]
6-
path = nailgun
7-
url = https://github.com/scalacenter/nailgun.git
8-
branch = sync-19-01-2018

.scalafmt.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ project.git = true
1313
# exclude submodules
1414
project.excludeFilters = [
1515
"zinc/"
16-
"nailgun/"
1716
"bsp/"
1817
"benchmark-bridge/"
1918
]

NOTICE.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@ Copyright 2017-2018 Martin Duhem
44
Copyright 2017-2018 Jorge Vicente Cantero
55
Copyright 2017-2018 Scala Center (EPFL)
66

7-
## Nailgun
8-
9-
[Repository website](https://github.com/scalacenter/nailgun/). Fork from
10-
[facebook/nailgun](https://github.com/facebook/nailgun).
11-
12-
Licensed under the [Apache 2.0 license](https://github.com/scalacenter/nailgun/blob/master/LICENSE.txt).
13-
14-
It includes minor modifications to the core algorithms and Nailgun protocol to suit Bloop's needs.
15-
167
## Zinc
178

189
[Repository website](https://github.com/scalacenter/zinc/). Fork from

bin/install.py

Lines changed: 0 additions & 325 deletions
This file was deleted.

docs/contributing-guide.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ Server reference](server.md) explains the available startup mechanisms.
134134

135135
#### Generic installation (most common)
136136

137+
DEFINITELY **NOT** UP TO DATE
138+
137139
If you have installed bloop via the CURL script in the website, you can use a
138140
local Python script to override your installation in `$HOME/.bloop`:
139141

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Copied from https://github.com/scalacenter/nailgun/tree/48f119d5b3d67a404f7409f9960b4a5e3db67a42/pynailgun
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from ng import NailgunConnection, NailgunException

0 commit comments

Comments
 (0)