Skip to content

Commit 2fd566f

Browse files
committed
Updating build information
1 parent ab483ce commit 2fd566f

File tree

5 files changed

+43
-11
lines changed

5 files changed

+43
-11
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
language: scala
22
scala:
3-
- 2.12.4
3+
- 2.12.10
4+
- 2.13.1
45
script:
56
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then sbt ++$TRAVIS_SCALA_VERSION test; fi'
67
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt ++$TRAVIS_SCALA_VERSION coverage test coverageReport coverageAggregate codacyCoverage; fi'

build.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ lazy val supportedScalaVersions = List(scala212, scala213)
3838
ThisBuild / scalaVersion := scala213
3939

4040

41-
useGpg := true
42-
4341
lazy val root = (project in file("."))
4442
.settings (
4543
crossScalaVersions := Nil,

client/build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name := "delphi-client"
22

33
libraryDependencies += "joda-time" % "joda-time" % "2.10.5"
44

5-
/*
5+
66
libraryDependencies ++= Seq(
7-
"com.softwaremill.sttp" %% "core" % "1.5.4",
8-
"com.softwaremill.sttp" %% "spray-json" % "1.5.4"
9-
)*/
7+
"com.softwaremill.sttp" %% "core" % "1.7.2",
8+
"com.softwaremill.sttp" %% "spray-json" % "1.7.2"
9+
)
1010

1111
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8" % "test"

client/src/main/scala/de/upb/cs/swt/delphi/client/DelphiClient.scala

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
package de.upb.cs.swt.delphi.client
22

3+
import com.softwaremill.sttp._
4+
import com.softwaremill.sttp.sprayJson._
5+
import spray.json._
6+
37
import scala.util.Try
4-
import de.upb.cs.swt.delphi.client.QueryJson._
58
import de.upb.cs.swt.delphi.core.model.Artifact
9+
import de.upb.cs.swt.delphi.client.QueryJson._
610

711
abstract class DelphiClient(baseUri : String) {
812
def search(query : Query, prettyPrint : Boolean = false) : Try[Seq[SearchResult]]
9-
/* = {
13+
/* = {
1014
val queryParams = prettyPrint match {
1115
case true => Map("pretty" -> "")
1216
case false => Map()
@@ -17,8 +21,8 @@ abstract class DelphiClient(baseUri : String) {
1721
1822
//val (res, time) = processRequest(request)
1923
//res.foreach(processResults(_, time))
20-
}
21-
*/
24+
}*/
25+
2226
def features() : Try[Seq[FieldDefinition]]
2327

2428
def retrieve(identifier : String) : Try[Artifact]

project/plugins.sbt

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Copyright (C) 2019 The Delphi Team.
2+
// See the LICENCE file distributed with this work for additional
3+
// information regarding copyright ownership.
4+
//
5+
// Licensed under the Apache License, Version 2.0 (the "License");
6+
// you may not use this file except in compliance with the License.
7+
// You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing, software
12+
// distributed under the License is distributed on an "AS IS" BASIS,
13+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
// See the License for the specific language governing permissions and
15+
// limitations under the License.
16+
17+
// build management and packaging
18+
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
19+
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.5.1")
20+
21+
// coverage
22+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
23+
addSbtPlugin("com.codacy" % "sbt-codacy-coverage" % "3.0.3")
24+
25+
// preparation for dependency checking
26+
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.1")
27+
28+
// scalastyle
29+
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")

0 commit comments

Comments
 (0)