Skip to content

Release/1.0.1 #157

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

Merged
merged 14 commits into from
Dec 23, 2019
Merged
Show file tree
Hide file tree
Changes from all 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
37 changes: 23 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
language: scala
scala:
- 2.12.4
matrix:
include:
language: scala
scala:
- 2.9.3
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'
language: node_js
node_js:
- "12"
addons:
apt:
sources:
- google-chrome
packages:
- google-chrome-stable

addons:
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
before_script:
- npm install -g @angular/cli
script:
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then cd client && npm install && ng build --prod && npm run test -- --no-progress --browsers=ChromeHeadlessCI --source-map=false && cd .. ; fi'
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cd client && npm install && ng build --prod && npm run test -- --no-progress --browsers=ChromeHeadlessCI --source-map=false && cd .. ; fi'

before_install:
- npm install -g @angular/cli
script:
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then sbt ++$TRAVIS_SCALA_VERSION test; cd client && npm install && ng build --prod && npm run test -- --no-progress --browsers=ChromeHeadlessCI --source-map=false && cd .. ; fi'
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt ++$TRAVIS_SCALA_VERSION coverage test coverageReport coverageAggregate codacyCoverage; cd client && npm install && ng build --prod && npm run test -- --no-progress --browsers=ChromeHeadlessCI --source-map=false && cd .. ; fi'
after_success:
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash <(curl -s https://codecov.io/bash); fi'
5 changes: 3 additions & 2 deletions app/module/Module.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

package module

import com.google.inject.{AbstractModule}
import com.google.inject.AbstractModule
import com.typesafe.config.Config
import controllers.{MyExecutionContext, MyExecutionContextImpl}
import net.codingwell.scalaguice.ScalaModule
Expand Down Expand Up @@ -55,9 +55,10 @@ class Module extends AbstractModule with ScalaModule {

/**
* Bind types for injection
*
* @return
*/
def configure() {
override def configure() {
bind(classOf[MyExecutionContext]).to(classOf[MyExecutionContextImpl])
}
}
51 changes: 28 additions & 23 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,34 @@ name := "delphi-management"
organization := "de.upb"


version := "1.0.0"
version := "1.0.1"


scalaVersion := "2.12.4"

lazy val management = (project in file(".")).enablePlugins(SbtWeb).enablePlugins(PlayScala)
.enablePlugins(BuildInfoPlugin).
settings(
buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion),
buildInfoPackage := "de.upb.cs.swt.delphi.management",
(scalastyleSources in Compile) := {
// all .scala files in "src/main/scala"
val scalaSourceFiles = ((scalaSource in Compile).value ** "*.scala").get
val fSep = java.io.File.separator // "/" or "\"
val dirNameToExclude = "app" + fSep + "models" // "com/folder_to_exclude"
scalaSourceFiles.filterNot(_.getAbsolutePath.contains(dirNameToExclude))
}
)
.enablePlugins(BuildInfoPlugin).
settings(
buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion),
buildInfoPackage := "de.upb.cs.swt.delphi.management",
(scalastyleSources in Compile) := {
// all .scala files in "src/main/scala"
val scalaSourceFiles = ((scalaSource in Compile).value ** "*.scala").get
val fSep = java.io.File.separator // "/" or "\"
val dirNameToExclude = "app" + fSep + "models" // "com/folder_to_exclude"
scalaSourceFiles.filterNot(_.getAbsolutePath.contains(dirNameToExclude))
}
)

scalastyleConfig := baseDirectory.value / "project" / "scalastyle-config.xml"

val conf = ConfigFactory.parseFile(new File("conf/application.conf")).resolve()
val appPortManagement = conf.getString("app.portManagement")
val appPortManagement = conf.getString("app.portManagement")

PlayKeys.devSettings := Seq(
"play.server.http.port" -> appPortManagement
"play.server.http.port" -> appPortManagement
)
pipelineStages := Seq(digest,gzip)
pipelineStages := Seq(digest, gzip)

resolvers += Resolver.sonatypeRepo("snapshots")
resolvers += Resolver.jcenterRepo
Expand All @@ -41,13 +41,18 @@ libraryDependencies += guice
libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "3.1.2" % Test
libraryDependencies += "net.codingwell" %% "scala-guice" % "4.1.1"
libraryDependencies += "com.iheart" %% "ficus" % "1.4.3"
libraryDependencies += "org.webjars" % "bootstrap" % "4.1.0"
libraryDependencies += "org.webjars" %% "webjars-play" % "2.7.0"
libraryDependencies += "com.adrianhurt" %% "play-bootstrap" % "1.4-P26-B4-SNAPSHOT"
libraryDependencies += "org.webjars" % "bootstrap" % "4.3.1" exclude("org.webjars", "jquery")
//Snyk vulnerability
libraryDependencies += "org.webjars" % "jquery" % "3.4.0"
libraryDependencies += "org.webjars" %% "webjars-play" % "2.7.3" exclude("com.fasterxml.jackson.core", "jackson-databind")
//Snyk vulnerability high severity
libraryDependencies += "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10.1"
libraryDependencies += "com.adrianhurt" %% "play-bootstrap" % "1.5-P27-B3" exclude ("com.fasterxml.jackson.datatype","jackson-datatype-jsr310")
libraryDependencies += "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.8"
libraryDependencies += "eu.bitwalker" % "UserAgentUtils" % "1.20"
libraryDependencies += "com.typesafe.akka" %% "akka-http" % "10.1.5"
libraryDependencies += "com.typesafe.akka" %% "akka-stream" % "2.5.14"
libraryDependencies += "com.typesafe.akka" %% "akka-http-spray-json" % "10.1.5"
libraryDependencies += "com.typesafe.akka" %% "akka-http" % "10.1.10"
libraryDependencies += "com.typesafe.akka" %% "akka-stream" % "2.5.16"
libraryDependencies += "com.typesafe.akka" %% "akka-http-spray-json" % "10.1.6"
libraryDependencies += ws

routesGenerator := InjectedRoutesGenerator
Expand All @@ -58,7 +63,7 @@ libraryDependencies ++= Seq(
"com.nimbusds" % "nimbus-jose-jwt" % "5.14",
"org.bouncycastle" % "bcprov-jdk15on" % "1.60",
"com.google.guava" % "guava" % "25.1-jre",
"org.apache.commons" % "commons-compress" % "1.18"
"org.apache.commons" % "commons-compress" % "1.19"
)

libraryDependencies += "com.pauldijou" %% "jwt-core" % "1.0.0"
File renamed without changes.
Loading