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

Cross compile pmd-scala module

Browse Source
This commit is contained in:
João Ferreira
2020-05-27 15:32:11 +01:00
parent 70ac66dcb2
commit 9c632dcd83
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis/build-deploy.sh
View File

@ -26,6 +26,7 @@ elif travis_isPullRequest; then
log_info "This is a pull-request build"
./mvnw verify $MVN_BUILD_FLAGS
./mvnw clean verify $MVN_BUILD_FLAGS -pl scala -DscalaVersion=2.13
regression-tester_executeDanger
@ -42,6 +43,7 @@ elif travis_isPush; then
# Build and deploy to ossrh / maven-central
./mvnw deploy -Possrh,sign,pmd-release $MVN_BUILD_FLAGS
./mvnw clean deploy -Possrh,sign,pmd-release $MVN_BUILD_FLAGS -pl scala -DscalaVersion=2.13
echo -e "\n\n"
# Deploy to github releases
@ -57,6 +59,7 @@ elif travis_isPush; then
elif [[ "${VERSION}" == *-SNAPSHOT ]]; then
log_info "This is a snapshot build"
./mvnw deploy -Possrh,sign $MVN_BUILD_FLAGS
./mvnw clean deploy -Possrh,sign $MVN_BUILD_FLAGS -pl scala -DscalaVersion=2.13
# Deploy to sourceforge files
sourceforge_uploadFile "${VERSION}" "pmd-dist/target/pmd-bin-${VERSION}.zip"

5
pmd-scala/pom.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>pmd-scala</artifactId>
<artifactId>pmd-scala_${scalaVersion}</artifactId>
<name>PMD Scala</name>
<parent>
@ -11,6 +11,7 @@
</parent>
<properties>
<scalaVersion>2.12</scalaVersion>
<scalameta.version>4.2.0</scalameta.version>
</properties>
@ -37,7 +38,7 @@
<dependencies>
<dependency>
<groupId>org.scalameta</groupId>
<artifactId>scalameta_2.13</artifactId>
<artifactId>scalameta_${scalaVersion}</artifactId>
<version>${scalameta.version}</version>
</dependency>
<dependency>

2
pmd-scala/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenizer.java
View File

@ -96,7 +96,7 @@ public class ScalaTokenizer implements Tokenizer {
Token.LF.class, Token.FF.class, Token.LFLF.class, Token.EOF.class };
ScalaTokenFilter(Iterator<Token> iterator) {
this.tokenIter = iterator.iterator();
this.tokenIter = iterator;
}
Token getNextToken() {

1
pom.xml
View File

@ -88,6 +88,7 @@
<kotlin.version>1.3.0</kotlin.version>
<dokka.version>0.10.1</dokka.version>
<scala.version>2.12</scala.version>
<javacc.version>5.0</javacc.version>
<surefire.version>2.22.1</surefire.version>