phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into pmd/7.0.x

Browse Source
This commit is contained in:
Andreas Dangel
2020-07-17 16:12:06 +02:00
parent d9106b0251 044d7aea2d
commit dcaa8a1167
79 changed files with 5252 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
pmd-scala-modules/pmd-scala-common/pom.xml
View File

@ -103,17 +103,20 @@
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-test</artifactId>
@ -124,5 +127,42 @@
<artifactId>pmd-lang-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.oowekyala.treeutils</groupId>
<artifactId>tree-matchers</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.oowekyala.treeutils</groupId>
<artifactId>tree-printers</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.kotlintest</groupId>
<artifactId>kotlintest-assertions</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.kotlintest</groupId>
<artifactId>kotlintest-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

4
pmd-scala-modules/pmd-scala-common/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaTreeTests.kt
View File

@ -5,12 +5,12 @@
package net.sourceforge.pmd.lang.scala.ast
import io.kotlintest.should
import io.kotlintest.specs.FunSpec
import io.kotlintest.specs.AbstractFunSpec
import net.sourceforge.pmd.lang.ast.Node
import net.sourceforge.pmd.lang.ast.test.matchNode
import net.sourceforge.pmd.lang.ast.test.shouldBe
class ScalaTreeTests : FunSpec({
class ScalaTreeTests : AbstractFunSpec({
test("Test line/column numbers") {

12
pmd-scala-modules/pmd-scala_2.12/pom.xml
View File

@ -25,9 +25,19 @@
</build>
<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scalaVersion}.10</version>
</dependency>
<dependency>
<groupId>org.scalameta</groupId>
<artifactId>scalameta_${scalaVersion}</artifactId>
<artifactId>parsers_${scalaVersion}</artifactId>
<version>${scalameta.version}</version>
</dependency>
<dependency>
<groupId>org.scalameta</groupId>
<artifactId>trees_${scalaVersion}</artifactId>
<version>${scalameta.version}</version>
</dependency>
</dependencies>

12
pmd-scala-modules/pmd-scala_2.13/pom.xml
View File

@ -25,9 +25,19 @@
</build>
<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scalaVersion}.3</version>
</dependency>
<dependency>
<groupId>org.scalameta</groupId>
<artifactId>scalameta_${scalaVersion}</artifactId>
<artifactId>parsers_${scalaVersion}</artifactId>
<version>${scalameta.version}</version>
</dependency>
<dependency>
<groupId>org.scalameta</groupId>
<artifactId>trees_${scalaVersion}</artifactId>
<version>${scalameta.version}</version>
</dependency>
</dependencies>