Skip to content
This repository was archived by the owner on Jun 8, 2023. It is now read-only.

Commit 172b089

Browse files
committed
Fix build and prepare for release 0.1.3
1 parent 64727c0 commit 172b089

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,12 @@ If VSCode is running behind a proxy add the following standard VSCode proxy sett
6767
}
6868

6969
This setting is translated as Coursier's vm arguments: -Dhttp.proxyHost=host -Dhttps.proxyHost=host -Dhttp.proxyPort=port -Dhttps.proxyPort=port.
70+
71+
# Publish
72+
73+
```
74+
> publishSigned
75+
> sonatypeRelease
76+
```
77+
78+
Then `cd scala/` and run `vsce publish`

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pomIncludeRepository := { _ => false }
99

1010
lazy val commonSettings = Seq(
1111
organization := "com.github.dragos",
12-
version := "0.1.2-SNAPSHOT",
12+
version := "0.1.3",
1313
resolvers += "dhpcs at bintray" at "https://dl.bintray.com/dhpcs/maven",
1414
libraryDependencies ++= Seq(
1515
"org.scalatest" %% "scalatest" % "2.2.6" % "test"
@@ -63,7 +63,7 @@ lazy val `ensime-lsp` = project.
6363
settings(
6464
resolvers += Resolver.sonatypeRepo("snapshots"),
6565
libraryDependencies ++= Seq(
66-
"org.ensime" %% "core" % "2.0.0-SNAPSHOT"
66+
"org.ensime" %% "core" % "2.0.0-M2"
6767
),
6868
pomExtra in Global := {
6969
<url>https://github.com/dragos/dragos-vscode-scala/</url>

ensime-lsp/src/main/scala/org/github/dragos/vscode/EnsimeLanguageServer.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,9 @@ class EnsimeLanguageServer(in: InputStream, out: OutputStream) extends LanguageS
167167
override def shutdown() {
168168
logger.info("Shutdown request")
169169
// ensimeActor ! ShutdownRequest("Requested by client")
170-
system.shutdown()
170+
system.terminate()
171171
logger.info("Shutting down actor system.")
172-
system.awaitTermination()
172+
Await.result(system.whenTerminated, Duration.Inf)
173173
logger.info("Actor system down.")
174174
}
175175

scala/src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export async function activate(context: ExtensionContext) {
4646
proxyArgs = [javaProxyHttpHost,javaProxyHtppPort,javaProxyHttpsHost,javaProxyHttpsPort]
4747
} else proxyArgs = []
4848

49-
let coursierArgs = ['launch', '-r', 'https://dl.bintray.com/dhpcs/maven', '-r', 'sonatype:snapshots', '-J', toolsJar, 'com.github.dragos:ensime-lsp_2.11:0.1.2-SNAPSHOT', '-M', 'org.github.dragos.vscode.Main'];
49+
let coursierArgs = ['launch', '-r', 'https://dl.bintray.com/dhpcs/maven', '-r', 'sonatype:releases', '-J', toolsJar, 'com.github.dragos:ensime-lsp_2.11:0.1.3', '-M', 'org.github.dragos.vscode.Main'];
5050
let javaArgs = proxyArgs.concat(['-Dvscode.workspace=' + workspace.rootPath, '-jar', coursierPath]).concat(coursierArgs);
5151
// The debug options for the server
5252
let debugOptions = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000,quiet=y'];

0 commit comments

Comments
 (0)