aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvlad <vlad@drivergrp.com>2016-08-18 16:30:35 -0700
committervlad <vlad@drivergrp.com>2016-08-18 16:30:35 -0700
commit9f1b85ce3e8798d59da8bb4805ec39a0f1dffe2d (patch)
tree125ec17c3789f23d87163b10104d0ea1a65f60ea
parent7a7e176fa4eb2515ccb7931ca8504635e0f17cca (diff)
downloaddriver-core-9f1b85ce3e8798d59da8bb4805ec39a0f1dffe2d.tar.gz
driver-core-9f1b85ce3e8798d59da8bb4805ec39a0f1dffe2d.tar.bz2
driver-core-9f1b85ce3e8798d59da8bb4805ec39a0f1dffe2d.zip
Using newer stable version of the sbt plugin
-rw-r--r--.gitignore4
-rw-r--r--.scalafmt2
-rw-r--r--build.sbt3
-rw-r--r--project/plugins.sbt3
-rw-r--r--scalastyle-config.xml13
-rw-r--r--src/main/scala/com/drivergrp/core/app.scala4
6 files changed, 19 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 5047ee5..5ffc222 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,6 @@ project/plugins/project/
.scala_dependencies
.worksheet
.idea/
-.idea \ No newline at end of file
+.idea
+.scalafmt
+scalastyle-config.xml
diff --git a/.scalafmt b/.scalafmt
index ba1bf4f..5226b38 100644
--- a/.scalafmt
+++ b/.scalafmt
@@ -20,3 +20,5 @@
# --alignByOpenParenCallSite <value>
# --alignByOpenParenDefnSite <value>
+
+ \ No newline at end of file
diff --git a/build.sbt b/build.sbt
index fc70e1d..0e4b9fc 100644
--- a/build.sbt
+++ b/build.sbt
@@ -23,4 +23,5 @@ lazy val core = (project in file(".")).
"com.github.swagger-akka-http" %% "swagger-akka-http" % "0.7.1"
))
.gitPluginConfiguration
- .settings(repositoriesSettings ++ publicationSettings ++ releaseSettings)
+ .settings (lintingSettings ++ formatSettings)
+ .settings (repositoriesSettings ++ publicationSettings ++ releaseSettings)
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 90b90b9..06d6b93 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,4 @@
resolvers += "releases" at "https://drivergrp.jfrog.io/drivergrp/releases"
-resolvers += "snapshots" at "https://drivergrp.jfrog.io/drivergrp/snapshots"
credentials += Credentials("Artifactory Realm", "drivergrp.jfrog.io", "sbt-publisher", "ANC-d8X-Whm-USS")
-addSbtPlugin("com.drivergrp" % "sbt-settings" % "0.4.3-SNAPSHOT")
+addSbtPlugin("com.drivergrp" % "sbt-settings" % "0.5.0")
diff --git a/scalastyle-config.xml b/scalastyle-config.xml
index 92b23a5..bba1e69 100644
--- a/scalastyle-config.xml
+++ b/scalastyle-config.xml
@@ -57,6 +57,11 @@
<check level="error" class="org.scalastyle.scalariform.NoCloneChecker" enabled="true"/>
<check level="error" class="org.scalastyle.scalariform.NoFinalizeChecker" enabled="true"/>
<check level="error" class="org.scalastyle.scalariform.CovariantEqualsChecker" enabled="true"/>
+ <check level="error" class="org.scalastyle.file.RegexChecker" enabled="true">
+ <parameters>
+ <parameter name="regex"><![CDATA[println]]></parameter>
+ </parameters>
+ </check>
<check level="error" class="org.scalastyle.scalariform.NumberOfTypesChecker" enabled="true">
<parameters>
<parameter name="maxTypes"><![CDATA[30]]></parameter>
@@ -64,7 +69,7 @@
</check>
<check level="error" class="org.scalastyle.scalariform.CyclomaticComplexityChecker" enabled="true">
<parameters>
- <parameter name="maximum"><![CDATA[10]]></parameter>
+ <parameter name="maximum"><![CDATA[50]]></parameter>
</parameters>
</check>
<check level="error" class="org.scalastyle.scalariform.UppercaseLChecker" enabled="true"/>
@@ -85,7 +90,7 @@
<parameter name="regex"><![CDATA[^[A-Za-z\\*][A-Za-z0-9]*$]]></parameter>
</parameters>
</check>
- <check level="error" class="org.scalastyle.scalariform.ClassTypeParameterChecker" enabled="true">
+ <check level="error" class="org.scalastyle.scalariform.ClassTypeParameterChecker" enabled="false">
<parameters>
<parameter name="regex"><![CDATA[^[A-Za-z]*$]]></parameter>
</parameters>
@@ -105,5 +110,5 @@
<check level="error" class="org.scalastyle.scalariform.SpaceAfterCommentStartChecker" enabled="true"/>
<check level="error" class="org.scalastyle.scalariform.ProcedureDeclarationChecker" enabled="true"/>
<check level="error" class="org.scalastyle.scalariform.NotImplementedErrorUsage" enabled="true"/>
- <check level="error" class="org.scalastyle.scalariform.LowercasePatternMatchChecker" enabled="true"/>
-</scalastyle> \ No newline at end of file
+</scalastyle>
+ \ No newline at end of file
diff --git a/src/main/scala/com/drivergrp/core/app.scala b/src/main/scala/com/drivergrp/core/app.scala
index 4d1b775..6438ab5 100644
--- a/src/main/scala/com/drivergrp/core/app.scala
+++ b/src/main/scala/com/drivergrp/core/app.scala
@@ -127,7 +127,7 @@ object app {
log.fatal(s"Service ${service.name} failed to activate", t)
Console.print(" Failed! (check log)")
}
- Console.println(" Done")
+ Console.print(" Done\n")
}
}
@@ -146,7 +146,7 @@ object app {
log.fatal(s"Service ${service.name} failed to deactivate", t)
Console.print(" Failed! (check log)")
}
- Console.println(" Done")
+ Console.print(" Done\n")
}
}
})