diff options
| author | Ellen Spertus <ellen.spertus@gmail.com> | 2018-07-19 15:57:12 -0700 |
|---|---|---|
| committer | Ellen Spertus <ellen.spertus@gmail.com> | 2018-07-19 15:57:12 -0700 |
| commit | 97c8bdc1973f6dd54216a6f1b0b49dad0660b874 (patch) | |
| tree | 33ab83d31c9ed6762b8e9f35f39ab330fa88342c | |
| parent | 7f667a0ed6fc0340e6eca83052a12d27c16922ae (diff) | |
| parent | 05fdfcd052e06934f8313743ba60629b3b694c2f (diff) | |
| download | sandcrawler-97c8bdc1973f6dd54216a6f1b0b49dad0660b874.tar.gz sandcrawler-97c8bdc1973f6dd54216a6f1b0b49dad0660b874.zip | |
Merge branch 'scalastyle' of git.archive.org:webgroup/sandcrawler into scalastyle
| -rw-r--r-- | scalding/build.sbt | 2 | ||||
| -rw-r--r-- | scalding/scalastyle-config.xml | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/scalding/build.sbt b/scalding/build.sbt index cc21444..980418c 100644 --- a/scalding/build.sbt +++ b/scalding/build.sbt @@ -16,7 +16,7 @@ lazy val root = (project in file(".")). (scalastyleSources in Compile) := { // all .scala files in "src/main/scala" val scalaSourceFiles = ((scalaSource in Compile).value ** "*.scala").get - val dirNameToExclude = "example" + val dirNameToExclude = "/example/" scalaSourceFiles.filterNot(_.getAbsolutePath.contains(dirNameToExclude)) }, diff --git a/scalding/scalastyle-config.xml b/scalding/scalastyle-config.xml index adf9b0f..86d8fca 100644 --- a/scalding/scalastyle-config.xml +++ b/scalding/scalastyle-config.xml @@ -62,7 +62,7 @@ <parameter name="maxParameters"><![CDATA[8]]></parameter> </parameters> </check> - <check level="warning" class="org.scalastyle.scalariform.MagicNumberChecker" enabled="true"> + <check level="warning" class="org.scalastyle.scalariform.MagicNumberChecker" enabled="false"> <parameters> <parameter name="ignore"><![CDATA[-1,0,1,2,3]]></parameter> </parameters> @@ -116,15 +116,18 @@ <check level="warning" class="org.scalastyle.scalariform.PublicMethodsHaveTypeChecker" enabled="true"></check> <check level="warning" class="org.scalastyle.file.NewLineAtEofChecker" enabled="true"></check> <check level="warning" class="org.scalastyle.file.NoNewLineAtEofChecker" enabled="false"></check> - <check class="org.scalastyle.scalariform.BlockImportChecker" level="warning" enabled="true"/> -<check class="org.scalastyle.scalariform.ImportOrderChecker" level="warning" enabled="true"> + <check enabled="true" class="org.scalastyle.scalariform.BlockImportChecker" level="warning"/> + <check enabled="true" class="org.scalastyle.scalariform.ImportOrderChecker" level="warning"> <parameters> <parameter name="groups">java,scala,others</parameter> <parameter name="group.java">javax?\..+</parameter> <parameter name="group.scala">scala\..+</parameter> <parameter name="group.others">.+</parameter> - <parameter name="maxBlankLines">1</parameter> - <parameter name="lexicographic">true</parameter> + </parameters> + </check> +<check level="warning" class="org.scalastyle.scalariform.IllegalImportsChecker" enabled="true"> + <parameters> + <parameter name="illegalImports"><![CDATA[sun._,java.awt._]]></parameter> </parameters> </check> <check level="warning" class="org.scalastyle.scalariform.IllegalImportsChecker" enabled="true"> |