Reduce warnings

freefair · Apr 10, 2021 · 6217779 · 6217779
1 parent 6271ac4
commit 6217779
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 10 deletions.
diff --git a/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/AspectJCompileOptions.java b/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/AspectJCompileOptions.java
@@ -1,6 +1,7 @@
 package io.freefair.gradle.plugins.aspectj;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.gradle.api.Action;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.RegularFileProperty;
@@ -21,7 +22,8 @@
  * @see org.gradle.api.tasks.compile.GroovyCompileOptions
  * @see org.gradle.api.tasks.scala.ScalaCompileOptions
  */
-@Data
+@Getter
+@Setter
 public class AspectJCompileOptions extends AbstractOptions {
 
     /**

diff --git a/...-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/internal/AspectJCompileSpec.java b/...-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/internal/AspectJCompileSpec.java
@@ -1,12 +1,14 @@
 package io.freefair.gradle.plugins.aspectj.internal;
 
 import io.freefair.gradle.plugins.aspectj.AspectJCompileOptions;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.internal.tasks.compile.DefaultJvmLanguageCompileSpec;
 
 
-@Data
+@Getter
+@Setter
 public class AspectJCompileSpec extends DefaultJvmLanguageCompileSpec {
 
     private FileCollection aspectJClasspath;

diff --git a/...o-plugin/src/main/java/io/freefair/gradle/plugins/jacoco/AggregateJacocoReportPlugin.java b/...o-plugin/src/main/java/io/freefair/gradle/plugins/jacoco/AggregateJacocoReportPlugin.java
@@ -2,8 +2,11 @@
 
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
+import org.gradle.api.file.Directory;
+import org.gradle.api.file.RegularFile;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.provider.Provider;
 import org.gradle.api.reporting.Report;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.SourceSetContainer;
@@ -44,12 +47,20 @@ public void apply(Project project) {
             JacocoPluginExtension reportingExtension = project.getExtensions().getByType(JacocoPluginExtension.class);
             reportTask.getReports().getHtml().setEnabled(true);
             reportTask.getReports().all(report -> {
+                Provider<File> destination;
                 if (report.getOutputType().equals(Report.OutputType.DIRECTORY)) {
-                    report.setDestination(project.provider(() -> new File(reportingExtension.getReportsDir(), reportTask.getName() + "/" + report.getName())));
+                    destination = reportingExtension
+                            .getReportsDirectory()
+                            .dir(reportTask.getName() + "/" + report.getName())
+                            .map(Directory::getAsFile);
                 }
                 else {
-                    report.setDestination(project.provider(() -> new File(reportingExtension.getReportsDir(), reportTask.getName() + "/" + reportTask.getName() + "." + report.getName())));
+                    destination = reportingExtension
+                            .getReportsDirectory()
+                            .file(reportTask.getName() + "/" + reportTask.getName() + "." + report.getName())
+                            .map(RegularFile::getAsFile);
                 }
+                report.setDestination(destination);
             });
         });
 

diff --git a/jsass-plugin/src/test/java/io/freefair/gradle/plugins/JSassJavaPluginTest.java b/jsass-plugin/src/test/java/io/freefair/gradle/plugins/JSassJavaPluginTest.java
@@ -3,7 +3,6 @@
 import io.freefair.gradle.plugins.jsass.JSassJavaPlugin;
 import io.freefair.gradle.plugins.jsass.SassCompile;
 import org.gradle.api.Project;
-import org.gradle.internal.impldep.com.google.common.io.Files;
 import org.gradle.testfixtures.ProjectBuilder;
 import org.junit.Before;
 import org.junit.Rule;
@@ -13,6 +12,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -42,7 +43,7 @@ public void testSources() throws IOException {
         boolean newFile = mainCss.createNewFile();
         assertThat(newFile).isTrue();
 
-        Files.write("body { color: red; }", mainCss, Charset.defaultCharset());
+        Files.write(mainCss.toPath(), "body { color: red; }".getBytes(StandardCharsets.UTF_8));
 
         project.getPlugins().apply(JSassJavaPlugin.class);
 

diff --git a/maven-plugin/src/main/java/io/freefair/gradle/plugins/maven/package-info.java b/maven-plugin/src/main/java/io/freefair/gradle/plugins/maven/package-info.java
@@ -1,6 +1,6 @@
 /**
- * This package contains {@link org.gradle.api.plugins.MavenPlugin maven} publishing related {@link org.gradle.api.Plugin plugins}.
+ * This package contains {@link org.gradle.api.publish.maven.plugins.MavenPublishPlugin maven} publishing related {@link org.gradle.api.Plugin plugins}.
  *
  * @author Lars Grefer
  */
-package io.freefair.gradle.plugins.maven;
+package io.freefair.gradle.plugins.maven;