Exclude shimplify-generated files from scalastyle

- Simplify the scalastyle pattern since it processes all scala files under a root regardless of shim - Move Scala files previously not check-styled because under src/main/*java Signed-off-by: Gera Shegalov <[email protected]>
NVIDIA · Nov 1, 2024 · 6004e39 · 6004e39
1 parent 372ca80
commit 6004e39
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1589,14 +1589,11 @@ This will force full Scala code rebuild in downstream modules.
                             <skip>${maven.scalastyle.skip}</skip>
                             <target>
                                 <pathconvert property="scalastyle.dirs" pathsep=" ">
-                                    <dirset dir="${spark.rapids.source.basedir}" includes="**/src/main/scala"/>
-                                    <dirset dir="${spark.rapids.source.basedir}" includes="**/src/main/*/scala"/>
-                                    <dirset dir="${spark.rapids.source.basedir}" includes="**/src/test/scala"/>
-                                    <dirset dir="${spark.rapids.source.basedir}" includes="**/src/test/*/scala"/>
-                                    <dirset dir="${spark.rapids.source.basedir}" includes="**/src/main/scala-${scala.binary.version}"/>
-                                    <dirset dir="${spark.rapids.source.basedir}" includes="**/src/main/*/scala-${scala.binary.version}"/>
-                                    <dirset dir="${spark.rapids.source.basedir}" includes="**/src/test/scala-${scala.binary.version}"/>
-                                    <dirset dir="${spark.rapids.source.basedir}" includes="**/src/test/*/scala-${scala.binary.version}"/>
+                                    <dirset dir="${spark.rapids.source.basedir}">
+                                        <include name="**/src/main"/>
+                                        <include name="**/src/test"/>
+                                        <exclude name="**/target/*/generated/src/**"/>
+                                    </dirset>
                                 </pathconvert>
                                 <echo>Checking scalastyle for all modules using following paths:
                                     ${scalastyle.dirs}

diff --git a/...spark/rapids/GpuExecutedCommandExec.scala → ...spark/rapids/GpuExecutedCommandExec.scala b/...spark/rapids/GpuExecutedCommandExec.scala → ...spark/rapids/GpuExecutedCommandExec.scala
diff --git a/...ia/spark/rapids/shims/XxHash64Shims.scala → ...ia/spark/rapids/shims/XxHash64Shims.scala b/...ia/spark/rapids/shims/XxHash64Shims.scala → ...ia/spark/rapids/shims/XxHash64Shims.scala