Skip to content

Commit b1aaf19

Browse files
committed
Merge branch 'master' into fix-gradle-resolver
2 parents 7cb75da + 3b37549 commit b1aaf19

File tree

7 files changed

+325
-306
lines changed

7 files changed

+325
-306
lines changed

BUILDING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ Contains the commands require to build this project. Note that you might need to
2828

2929
## Packaging the VSCode extension
3030
* `vsce package -o build.vsix`
31-
* The extension is located as `build.vsix` in the repository folder
31+
* The extension is located as `build.vsix` in the repository folder

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ A [language server](https://microsoft.github.io/language-server-protocol/) featu
88
## Getting Started
99
* See [BUILDING.md](BUILDING.md) for build instructions.
1010
* See [Roadmap](https://github.com/fwcd/KotlinLanguageServer/projects/1) for features, planned additions, bugfixes and changes
11+
* See [KotlinQuickStart](https://github.com/fwcd/KotlinQuickStart) for a sample project
1112

1213
## This repository needs your help!
1314
[The original author](https://github.com/georgewfraser) created this project while he was considering using Kotlin in his work. He ended up deciding not to and is not really using Kotlin these days though this is a pretty fully-functional language server that just needs someone to use it every day for a while and iron out the last few pesky bugs.

build.gradle

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,14 @@ task copyKotlinLib(type: Copy) {
8484
into "$projectDir/lib-kotlin"
8585
}
8686

87+
task fixFilePermissions(type: Exec) {
88+
if (!System.getProperty("os.name").toLowerCase().contains("windows")) {
89+
// When running on macOS or Linux the start script
90+
// needs executable permissions to run.
91+
commandLine 'chmod', '+x', 'build/install/kotlin-language-server/bin/kotlin-language-server'
92+
}
93+
}
94+
8795
compileKotlin.dependsOn copyKotlinLib
88-
build.finalizedBy(installDist)
96+
installDist.finalizedBy fixFilePermissions
97+
build.finalizedBy installDist

0 commit comments

Comments
 (0)