File tree 5 files changed +14
-10
lines changed
src/main/java/org/scoverage/plugin
5 files changed +14
-10
lines changed Original file line number Diff line number Diff line change 13
13
strategy :
14
14
matrix :
15
15
maven : [ '3.8.8', '3.9.9' ]
16
- java : [ '11 ', '17 ' ]
16
+ java : [ '17 ', '21 ' ]
17
17
os : [ 'ubuntu-latest', 'windows-latest' ]
18
18
runs-on : ${{ matrix.os }}
19
19
steps :
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ under the License.
22
22
<modelVersion >4.0.0</modelVersion >
23
23
<groupId >org.scoverage</groupId >
24
24
<artifactId >scoverage-maven-plugin</artifactId >
25
- <version >2.0.7 -SNAPSHOT</version >
25
+ <version >2.1.0 -SNAPSHOT</version >
26
26
<packaging >maven-plugin</packaging >
27
27
28
28
<name >SCoverage Maven Plugin</name >
@@ -211,7 +211,11 @@ under the License.
211
211
<artifactId >maven-compiler-plugin</artifactId >
212
212
<version >3.13.0</version >
213
213
<configuration >
214
- <release >11</release >
214
+ <release >17</release >
215
+ <compilerArgs >
216
+ <arg >-Xlint:all</arg >
217
+ <arg >-Xlint:-processing</arg >
218
+ </compilerArgs >
215
219
</configuration >
216
220
</plugin >
217
221
@@ -272,10 +276,10 @@ under the License.
272
276
<detectJavaApiLink >false</detectJavaApiLink >
273
277
<subpackages >org.scoverage.plugin</subpackages >
274
278
<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 >
277
280
<link >https://maven.apache.org/shared-archives/maven-reporting-api-${maven-reporting-api.version} /apidocs/</link >
278
281
<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 >
279
283
</links >
280
284
<notimestamp >true</notimestamp >
281
285
</configuration >
Original file line number Diff line number Diff line change 24
24
import java .io .OutputStreamWriter ;
25
25
import java .util .*;
26
26
import java .util .stream .Collectors ;
27
+ import javax .inject .Inject ;
27
28
28
29
import org .apache .maven .artifact .Artifact ;
29
30
import org .apache .maven .artifact .factory .ArtifactFactory ;
37
38
import org .apache .maven .model .Dependency ;
38
39
import org .apache .maven .plugin .AbstractMojo ;
39
40
import org .apache .maven .plugin .MojoExecutionException ;
40
- import org .apache .maven .plugins .annotations .Component ;
41
41
import org .apache .maven .plugins .annotations .LifecyclePhase ;
42
42
import org .apache .maven .plugins .annotations .Mojo ;
43
43
import org .apache .maven .plugins .annotations .Parameter ;
@@ -171,13 +171,13 @@ public class SCoveragePreCompileMojo
171
171
/**
172
172
* Artifact factory used to look up artifacts in the remote repository.
173
173
*/
174
- @ Component
174
+ @ Inject
175
175
private ArtifactFactory factory ;
176
176
177
177
/**
178
178
* Artifact resolver used to resolve artifacts.
179
179
*/
180
- @ Component
180
+ @ Inject
181
181
private ArtifactResolver resolver ;
182
182
183
183
/**
Original file line number Diff line number Diff line change @@ -388,7 +388,7 @@ public void execute()
388
388
389
389
try
390
390
{
391
- RenderingContext context = new RenderingContext ( outputDirectory , getOutputName () + ".html" );
391
+ RenderingContext context = new RenderingContext ( outputDirectory , getOutputName () + ".html" , null );
392
392
SiteRendererSink sink = new SiteRendererSink ( context );
393
393
Locale locale = Locale .getDefault ();
394
394
generate ( sink , locale );
Original file line number Diff line number Diff line change @@ -80,7 +80,7 @@ public ScalaVersion(String s) {
80
80
// compute compatible
81
81
compatible =
82
82
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
84
84
major + "" ; // Scala 3.X is compatible with any Scala 3.Y
85
85
}
86
86
You can’t perform that action at this time.
0 commit comments