Merge branch 'develop' into Feature/4/scalastyle

Author: bhermann

.travis.yml

@@ -1,3 +1,8 @@
 language: scala
 scala:
-  -  2.12.4
+  -  2.12.4
+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'
+after_success:
+  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash <(curl -s https://codecov.io/bash); fi'

LICENSE

@@ -175,18 +175,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2018 The Delphi Team (represented by Ben Hermann)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

build.sbt

@@ -1,18 +1,17 @@
-name := "delphi-cli"
+scalaVersion := "2.12.4"
 
+name := "delphi-cli"
 version := "1.0.0-SNAPSHOT"
-
 maintainer := "Ben Hermann <[email protected]>"
 
-packageSummary := "Windows Package for Delphi-cli"
-
-packageDescription := """Windows Package for Delphi-cli"""
+licenses := Seq("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.html"))
 
+packageSummary := "Windows Package for the Delphi CLI"
+packageDescription := """Windows Package for the Delphi CLI"""
 wixProductId := "ce07be71-510d-414a-92d4-dff47631848a"
-
 wixProductUpgradeId := "4552fb0e-e257-4dbd-9ecb-dba9dbacf424"
 
-scalaVersion := "2.12.4"
+scalastyleConfig := baseDirectory.value / "project" / "scalastyle_config.xml"
 
 libraryDependencies += "com.github.scopt" %% "scopt" % "3.7.0"
 libraryDependencies ++= Seq(

project/build.properties

@@ -1 +1 @@
-sbt.version = 0.13.17
+sbt.version = 1.1.1

project/plugins.sbt

@@ -1,3 +1,13 @@
+// build management and packaging
 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.12")
+
+// preparation for dependency checking
+addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.1")
+
+// scalastyle
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")

src/main/scala/de/upb/cs/swt/delphi/cli/Config.scala

@@ -7,6 +7,4 @@ package de.upb.cs.swt.delphi.cli
   * @param mode The command to be run
   */
 case class Config (server : String = sys.env.getOrElse("DELPHI_SERVER", "https://delphi.cs.uni-paderborn.de/api/"),
-                   verbose: Boolean = false, mode : String = "", args : List[String] = List(), opts : List[String] = List()) {
-
-}
+                   verbose: Boolean = false, mode : String = "", args : List[String] = List(), opts : List[String] = List()) 

src/main/scala/de/upb/cs/swt/delphi/cli/commands/RetrieveCommand.scala

@@ -1,7 +1,7 @@
 package de.upb.cs.swt.delphi.cli.commands
 
 import de.upb.cs.swt.delphi.cli.Config
-import io.Source
+import scala.io.Source
 
 /**
   * The implementation of the retrieve command.