Skip to content

Feature/metric descriptions #49

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.

Sign up for GitHub

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

Merged
merged 13 commits into from
Dec 29, 2019
Merged

Feature/metric descriptions #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
46d834b
Updated to Scala 2.13.1 including dependencies
bhermann Dec 29, 2019
52cad8c
Changed header style rule
bhermann Dec 29, 2019
58c0a68
Fixed compatibility issue
bhermann Dec 29, 2019
5212050
Bumped scala version in travis config
bhermann Dec 29, 2019
7ef23c2
Bumping scoverage version
bhermann Dec 29, 2019
cc9bbb5
Deactivated coverage for now
bhermann Dec 29, 2019
e5154a8
Removed coverage for now
bhermann Dec 29, 2019
d6b5e2a
Bugfix for default ES configuration
bhermann Dec 29, 2019
ee58619
Scala 2.13 migrations
bhermann Dec 29, 2019
ca013b3
First rough implementation of feature mapping migrations
bhermann Dec 29, 2019
64b649d
Set snapshot version
bhermann Dec 29, 2019
e057abf
Added new names for bytecode metrics
bhermann Dec 29, 2019
3f5a547
Added a few other metric names
bhermann Dec 29, 2019
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
7 changes: 4 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
language: scala
scala:
- 2.12.4
- 2.13.1
script:
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then sbt ++$TRAVIS_SCALA_VERSION test; fi'
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt ++$TRAVIS_SCALA_VERSION coverage test coverageReport coverageAggregate codacyCoverage; fi'
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt ++$TRAVIS_SCALA_VERSION test; fi'
# - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt ++$TRAVIS_SCALA_VERSION coverage test coverageReport coverageAggregate codacyCoverage; fi'
after_success:
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash <(curl -s https://codecov.io/bash); fi'
# - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash <(curl -s https://codecov.io/bash); fi'
22 changes: 11 additions & 11 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
name := "delphi-webapi"

version := "1.0.0-SNAPSHOT"
version := "0.9.5-SNAPSHOT"

scalaVersion := "2.12.4"
scalaVersion := "2.13.1"

val akkaVersion = "2.5.16"
val akkaVersion = "2.6.1"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-stream" % akkaVersion,
"com.typesafe.akka" %% "akka-slf4j" % akkaVersion
)

val akkaHttpVersion = "10.1.5"
val akkaHttpVersion = "10.1.10"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-http" % akkaHttpVersion,
"com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion,
"com.typesafe.akka" %% "akka-http-spray-json" % akkaHttpVersion
)
//Including http client for elastic4s
libraryDependencies += "org.apache.httpcomponents" % "httpclient" % "4.5.3"
libraryDependencies += "org.apache.httpcomponents" % "httpclient" % "4.5.9"

val elastic4sVersion = "6.3.8"
val elastic4sVersion = "6.7.4"
libraryDependencies ++= Seq(
"com.sksamuel.elastic4s" %% "elastic4s-core" % elastic4sVersion,
//Excluding default 4.5.2 due to https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHTTPCOMPONENTS-31517
Expand All @@ -28,12 +28,12 @@ libraryDependencies ++= Seq(
)


libraryDependencies += "com.pauldijou" %% "jwt-core" % "1.0.0"
libraryDependencies += "com.pauldijou" %% "jwt-core" % "4.2.0"

libraryDependencies += "org.parboiled" %% "parboiled" % "2.1.4"
libraryDependencies += "org.parboiled" %% "parboiled" % "2.1.8"
libraryDependencies += "io.spray" %% "spray-json" % "1.3.5"
libraryDependencies += "org.scalactic" %% "scalactic" % "3.0.4"
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.4" % "it,test"
libraryDependencies += "org.scalactic" %% "scalactic" % "3.1.0"
libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.0" % "it,test"
libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.3" % Runtime

lazy val webapi = (project in file(".")).
Expand All @@ -60,7 +60,7 @@ scalastyleConfig := baseDirectory.value / "project" / "scalastyle-config.xml"
// Pinning secure versions of insecure transitive libraryDependencies
// Please update when updating dependencies above (including Play plugin)
libraryDependencies ++= Seq(
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10.1"
"com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1"
)

trapExit := false
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.2")

// coverage
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
addSbtPlugin("com.codacy" % "sbt-codacy-coverage" % "1.3.14")
// addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")
// addSbtPlugin("com.codacy" % "sbt-codacy-coverage" % "1.3.14")

// preparation for dependency checking
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.1")
Expand Down
2 changes: 1 addition & 1 deletion project/scalastyle-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</check>
<check level="warning" class="org.scalastyle.file.HeaderMatchesChecker" enabled="true">
<parameters>
<parameter name="header"><![CDATA[// Copyright (C) 2018 The Delphi Team.
<parameter name="header"><![CDATA[// Copyright (C) (?:\d{4}-)?\d{4} The Delphi Team.
// See the LICENCE file distributed with this work for additional
// information regarding copyright ownership.
//
Expand Down
Loading