Skip to content

Commit 5031ea5

Browse files
committed
Move editor extensions into separate repositories
Fix #145
1 parent e6d7e89 commit 5031ea5

24 files changed

+15
-2091
lines changed

.travis.yml

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,48 +3,30 @@ dist: trusty
33
jdk:
44
- openjdk8
55
- openjdk11
6-
env: NODE_VERSION=10.2.1 CXX=g++-4.8
6+
env: NODE_VERSION=10.2.1
77
before_install: nvm install $NODE_VERSION
88

9-
addons:
10-
apt:
11-
packages:
12-
- libsecret-1-dev
13-
- g++-4.8
14-
159
jobs:
1610
include:
17-
- stage: "Shared Module"
11+
- stage: "Shared module"
1812
name: "Build"
1913
script: ./gradlew :shared:build
2014
- name: "Tests"
2115
script: ./gradlew :shared:test -i
22-
- stage: "Language Server"
16+
- stage: "Language server"
2317
name: "Tests"
2418
script: ./gradlew :server:test -i
2519
- name: "Executable"
2620
script: ./gradlew :server:installDist
27-
- stage: "Editor extensions"
28-
name: "VSCode"
29-
script: ./gradlew :editors:vscode:build
30-
- name: "Atom"
31-
script: ./gradlew :editors:atom:build
3221
- stage: "Deploy"
33-
before_deploy:
34-
- npm install -g vsce atom-package-manager
35-
- ./gradlew :editors:vscode:packageExtension
36-
- ./gradlew :editors:atom:install
22+
before_deploy: ./gradlew :server:distZip
3723
deploy:
38-
- provider: script
39-
script: cd editors/vscode && vsce publish -p $VSC_TOKEN
40-
skip_cleanup: true
41-
on:
42-
repo: fwcd/kotlin-language-server
24+
provider: releases
25+
api_key:
26+
secure: "DQLsAAtr2u2X494FOR1Q3P181M+dWbT7jLkxJRxrgRQdGipeYcUp0c9/+uyEF7o4N3i4uCAWSh4yHJ0hGtOir/L9vd/EljftIU8d/qxDduuw9mmt6/7tVOzuQ3I8+Zap5XVXgDDSO0fsiwEBEShTbqCEdhzNJ2ZVbgd/C1N8dOfObmcRHtGuxox35TmbLlOoPCXEqsnirQFxxyH5e/G2DTnrUBpZ5ZeCJJsPzVxZzvTOMPwW4EeuOk9vYPPYQqfpQdJYiSwrlN+s6ELHHs7rJQhXUAzjiaJN5C/JxEPeCcFGZ9kak168tFp8ud6l+TGaT2ViuvChWIbKb3rJvHfIIKRtDGXi6vSR55Zj0p+EelIStRsUarru/Mhewocawmlwh4RPWvefD27FntHvzCW8tC2WoBo1VMYZdQ1Qcla/QN5psyLSr8XlaeFfBZgo66rctwb0opDtDROZ0oqlYq+CMcWEj0/TtRpQxWyzlNj2r4AomGKoqtaQWXfErMKbr3m24NhSq+4IWb7m8dx6WhcFOpTaWMmGyGoGDu8RNBQerigj2qd8hoIeC9U0VJNSh3DzF12jj3cYoIT4PVwAibQHIz9dhIMjdgwDgRKFGH/PFtKSPXVAtQGhfJA6gP/6qCMMEKHRYeFExhlCJtko0zBxeBToqJoEqKVojb72dclFG5o="
27+
file_glob: true
28+
file: "server/build/distributions/*.zip"
29+
skip_cleanup: true
30+
on:
4331
tags: true
44-
condition: $TRAVIS_OS_NAME = linux
45-
- provider: script
46-
script: cd editors/atom && apm publish --tag $(git describe --tags --abbrev=0)
47-
on:
4832
repo: fwcd/kotlin-language-server
49-
tags: true
50-
condition: $TRAVIS_OS_NAME = linux

.vscode/launch.json

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,6 @@
88
"hostName": "localhost",
99
"port": 8000
1010
},
11-
{
12-
"name": "Extension",
13-
"type": "extensionHost",
14-
"request": "launch",
15-
"runtimeExecutable": "${execPath}",
16-
"args": [
17-
"--extensionDevelopmentPath=${workspaceFolder}/editors/vscode"
18-
],
19-
"outFiles": [
20-
"${workspaceFolder}/editors/vscode/out/**/*.js"
21-
]
22-
},
23-
{
24-
"name": "Extension Tests",
25-
"type": "extensionHost",
26-
"request": "launch",
27-
"runtimeExecutable": "${execPath}",
28-
"args": [
29-
"--extensionDevelopmentPath=${workspaceFolder}/editors/vscode",
30-
"--extensionTestsPath=${workspaceFolder}/editors/vscode/out/test"
31-
],
32-
"outFiles": [
33-
"${workspaceFolder}/editors/vscode/out/test/**/*.js"
34-
]
35-
},
3611
{
3712
"type": "java",
3813
"name": "Debug Tests",

editors/README.md renamed to EDITORS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Editor Integration
22

33
## Visual Studio Code
4-
See [BUILDING](../BUILDING.md#vscode-extension) or install the extension from the [marketplace](https://marketplace.visualstudio.com/items?itemName=fwcd.kotlin).
4+
See [vscode-kotlin-ide](https://github.com/fwcd/vscode-kotlin-ide) or install the extension from the [marketplace](https://marketplace.visualstudio.com/items?itemName=fwcd.kotlin).
55

66
## Atom
7-
See [BUILDING](../BUILDING.md#atom-plugin).
7+
See [atom-ide-kotlin](https://github.com/fwcd/atom-ide-kotlin).
88

99
## Emacs
1010
_using [`lsp-mode`](https://github.com/emacs-lsp/lsp-mode)_

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Any editor conforming to LSP is supported, including [VSCode](https://code.visua
1212

1313
## Getting Started
1414
* See [BUILDING.md](BUILDING.md) for build instructions
15-
* See [Editor Integration](editors/README.md) for editor-specific instructions
15+
* See [Editor Integration](EDITORS.md) for editor-specific instructions
1616
* See [Roadmap](https://github.com/fwcd/kotlin-language-server/projects/1) for features, planned additions, bugfixes and changes
1717
* See [Kotlin Quick Start](https://github.com/fwcd/kotlin-quick-start) for a sample project
1818
* See [Kotlin Debug Adapter](https://github.com/fwcd/kotlin-debug-adapter) for debugging support on JVM

editors/atom/.gitignore

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

editors/atom/README.md

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

editors/atom/build.gradle

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

editors/atom/lib/main.js

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

editors/atom/package-lock.json

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

editors/atom/package.json

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

0 commit comments

Comments
 (0)