Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace play-json with circe #165

Closed
wants to merge 18 commits into from
Closed
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ inThisBuild(
bintrayReleaseOnPublish := dynverGitDescribeOutput.value.isVersionStable,
// faster publishLocal:
publishArtifact in packageDoc := sys.env.contains("CI"),
publishArtifact in packageSrc := sys.env.contains("CI")
publishArtifact in packageSrc := sys.env.contains("CI"),
addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)
)
)

Expand All @@ -64,6 +65,7 @@ lazy val V = new {
val scalameta = "2.1.5"
val scalafix = "0.5.7"
val enumeratum = "1.5.12"
val circe = "0.9.0"
}

lazy val noPublish = List(
Expand All @@ -84,11 +86,13 @@ lazy val semanticdbSettings = List(

lazy val languageserver = project
.settings(
resolvers += Resolver.bintrayRepo("dhpcs", "maven"),
libraryDependencies ++= Seq(
"com.dhpcs" %% "scala-json-rpc" % "2.0.1",
"io.circe" %% "circe-core" % V.circe,
"io.circe" %% "circe-generic" % V.circe,
"io.circe" %% "circe-generic-extras" % V.circe,
"io.circe" %% "circe-parser" % V.circe,
"com.beachape" %% "enumeratum" % V.enumeratum,
"com.beachape" %% "enumeratum-play-json" % "1.5.12-2.6.0-M7",
"com.beachape" %% "enumeratum-circe" % "1.5.15",
"com.typesafe.scala-logging" %% "scala-logging" % "3.7.2",
"io.monix" %% "monix" % "2.3.0",
"org.slf4j" % "slf4j-api" % "1.7.25",
Expand All @@ -105,7 +109,6 @@ lazy val metaserver = project
flatPackage = true // Don't append filename to package
) -> sourceManaged.in(Compile).value./("protobuf")
),
resolvers += Resolver.bintrayRepo("dhpcs", "maven"),
testFrameworks := new TestFramework("utest.runner.Framework") :: Nil,
fork in Test := true, // required for jni interrop with leveldb.
buildInfoKeys := Seq[BuildInfoKey](
Expand All @@ -126,7 +129,7 @@ lazy val metaserver = project
"org.scalameta" %% "semanticdb-scalac" % V.scalameta cross CrossVersion.full,
"com.beachape" %% "enumeratum" % V.enumeratum,
"com.lihaoyi" %% "utest" % "0.6.0" % Test,
"org.scalameta" %% "testkit" % V.scalameta % Test,
"org.scalameta" %% "testkit" % V.scalameta % Test
)
)
.dependsOn(
Expand Down
9 changes: 0 additions & 9 deletions languageserver/bin/logback.groovy

This file was deleted.

188 changes: 0 additions & 188 deletions languageserver/src/main/scala/langserver/core/Connection.scala

This file was deleted.

106 changes: 0 additions & 106 deletions languageserver/src/main/scala/langserver/core/LanguageServer.scala

This file was deleted.

17 changes: 0 additions & 17 deletions languageserver/src/main/scala/langserver/core/Main.scala

This file was deleted.

Loading