Skip to content

Commit f085f77

Browse files
committed
Build with Java 17 and enable linter
1 parent 0089c91 commit f085f77

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

pom.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,11 @@ under the License.
211211
<artifactId>maven-compiler-plugin</artifactId>
212212
<version>3.13.0</version>
213213
<configuration>
214-
<release>11</release>
214+
<release>17</release>
215+
<compilerArgs>
216+
<arg>-Xlint:all</arg>
217+
<arg>-Xlint:-processing</arg>
218+
</compilerArgs>
215219
</configuration>
216220
</plugin>
217221

@@ -272,10 +276,10 @@ under the License.
272276
<detectJavaApiLink>false</detectJavaApiLink>
273277
<subpackages>org.scoverage.plugin</subpackages>
274278
<links>
275-
<link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>
276-
<link>https://maven.apache.org/ref/${maven.version}/apidocs/</link>
279+
<link>https://docs.oracle.com/en/java/javase/17/docs/api/</link>
277280
<link>https://maven.apache.org/shared-archives/maven-reporting-api-${maven-reporting-api.version}/apidocs/</link>
278281
<link>https://maven.apache.org/doxia/components/doxia-archives/doxia-${doxia.version}/apidocs/</link>
282+
<link>https://maven.apache.org/ref/${maven.version}/apidocs/</link>
279283
</links>
280284
<notimestamp>true</notimestamp>
281285
</configuration>

src/main/java/org/scoverage/plugin/SCoverageReportMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ public void execute()
388388

389389
try
390390
{
391-
RenderingContext context = new RenderingContext( outputDirectory, getOutputName() + ".html" );
391+
RenderingContext context = new RenderingContext( outputDirectory, getOutputName() + ".html", null );
392392
SiteRendererSink sink = new SiteRendererSink( context );
393393
Locale locale = Locale.getDefault();
394394
generate( sink, locale );

src/main/java/org/scoverage/plugin/ScalaVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public ScalaVersion(String s) {
8080
// compute compatible
8181
compatible =
8282
modifier != null ? full : // non-stable versions are not compatible with anything else
83-
isScala2() ? major + "." + minor : // Scala 2.X.Y is compatible with any Scala 2.X.Z
83+
major == 2 ? major + "." + minor : // Scala 2.X.Y is compatible with any Scala 2.X.Z
8484
major + ""; // Scala 3.X is compatible with any Scala 3.Y
8585
}
8686

0 commit comments

Comments
 (0)