gradle 8 support (#77)

xvik · Feb 15, 2023 · 648e84d · 648e84d
1 parent b78da54
commit 648e84d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* Gradle 8 support (#77)
+
 ### 4.8.0 (2022-07-02)
 * Update checkstyle 9.1 -> 10.3.1
   IMPORTANT: Checkstyle 10 requires java 11, but plugin will automatically switch to

diff --git a/src/main/groovy/ru/vyarus/gradle/plugin/quality/report/ReportUtils.groovy b/src/main/groovy/ru/vyarus/gradle/plugin/quality/report/ReportUtils.groovy
@@ -107,12 +107,18 @@ class ReportUtils {
      * @param report report instance
      * @return report destination file
      */
+    @CompileStatic(TypeCheckingMode.SKIP)
     static File getReportFile(Report report) {
         if (report == null) {
             return null
         }
-        return GradleVersion.current() < GradleVersion.version('7.0')
-                ? report.destination : report.outputLocation.get().asFile
+        if (GradleVersion.current() < GradleVersion.version('7.0')) {
+            return report.destination
+        }
+        // Provider for gradle 7 and Property for gradle 8
+        // static compilation must be disabled for method!
+        Object output = report.outputLocation
+        return output.get().asFile
     }
 
     private static String matchRoot(SourceSet set, String filePath) {

diff --git a/src/test/groovy/ru/vyarus/gradle/plugin/quality/UpstreamKitTest.groovy b/src/test/groovy/ru/vyarus/gradle/plugin/quality/UpstreamKitTest.groovy
@@ -12,7 +12,7 @@ import org.gradle.testkit.runner.TaskOutcome
 class UpstreamKitTest extends AbstractKitTest {
 
 
-    public static final String GRADLE = '7.4.2'
+    public static final String GRADLE = '8.0'
 
     def "Check java checks"() {
         setup: